Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: OMAP2+: Drop legacy platform data for omap5 dwc3

We can now probe devices with ti-sysc interconnect driver and dts
data. Let's drop the related platform data and custom ti,hwmods
dts property.

As we're just dropping data, and the early platform data init
is based on the custom ti,hwmods property, we want to drop both
the platform data and ti,hwmods property in a single patch.

Signed-off-by: Tony Lindgren <tony@atomide.com>

-53
-1
arch/arm/boot/dts/omap5-l4.dtsi
··· 167 167 168 168 target-module@20000 { /* 0x4a020000, ap 109 08.0 */ 169 169 compatible = "ti,sysc-omap4", "ti,sysc"; 170 - ti,hwmods = "usb_otg_ss"; 171 170 reg = <0x20000 0x4>, 172 171 <0x20010 0x4>; 173 172 reg-names = "rev", "sysc";
-52
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
··· 376 376 }; 377 377 378 378 /* 379 - * 'usb_otg_ss' class 380 - * 2.0 super speed (usb_otg_ss) controller 381 - */ 382 - 383 - static struct omap_hwmod_class_sysconfig omap54xx_usb_otg_ss_sysc = { 384 - .rev_offs = 0x0000, 385 - .sysc_offs = 0x0010, 386 - .sysc_flags = (SYSC_HAS_DMADISABLE | SYSC_HAS_MIDLEMODE | 387 - SYSC_HAS_SIDLEMODE), 388 - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | 389 - SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | 390 - MSTANDBY_SMART | MSTANDBY_SMART_WKUP), 391 - .sysc_fields = &omap_hwmod_sysc_type2, 392 - }; 393 - 394 - static struct omap_hwmod_class omap54xx_usb_otg_ss_hwmod_class = { 395 - .name = "usb_otg_ss", 396 - .sysc = &omap54xx_usb_otg_ss_sysc, 397 - }; 398 - 399 - /* usb_otg_ss */ 400 - static struct omap_hwmod_opt_clk usb_otg_ss_opt_clks[] = { 401 - { .role = "refclk960m", .clk = "usb_otg_ss_refclk960m" }, 402 - }; 403 - 404 - static struct omap_hwmod omap54xx_usb_otg_ss_hwmod = { 405 - .name = "usb_otg_ss", 406 - .class = &omap54xx_usb_otg_ss_hwmod_class, 407 - .clkdm_name = "l3init_clkdm", 408 - .flags = HWMOD_SWSUP_SIDLE, 409 - .main_clk = "dpll_core_h13x2_ck", 410 - .prcm = { 411 - .omap4 = { 412 - .clkctrl_offs = OMAP54XX_CM_L3INIT_USB_OTG_SS_CLKCTRL_OFFSET, 413 - .context_offs = OMAP54XX_RM_L3INIT_USB_OTG_SS_CONTEXT_OFFSET, 414 - .modulemode = MODULEMODE_HWCTRL, 415 - }, 416 - }, 417 - .opt_clks = usb_otg_ss_opt_clks, 418 - .opt_clks_cnt = ARRAY_SIZE(usb_otg_ss_opt_clks), 419 - }; 420 - 421 - /* 422 379 * 'sata' class 423 380 * sata: serial ata interface gen2 compliant ( 1 rx/ 1 tx) 424 381 */ ··· 592 635 .user = OCP_USER_MPU | OCP_USER_SDMA, 593 636 }; 594 637 595 - /* l4_cfg -> usb_otg_ss */ 596 - static struct omap_hwmod_ocp_if omap54xx_l4_cfg__usb_otg_ss = { 597 - .master = &omap54xx_l4_cfg_hwmod, 598 - .slave = &omap54xx_usb_otg_ss_hwmod, 599 - .clk = "dpll_core_h13x2_ck", 600 - .user = OCP_USER_MPU | OCP_USER_SDMA, 601 - }; 602 - 603 638 static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = { 604 639 &omap54xx_l3_main_1__dmm, 605 640 &omap54xx_l3_main_3__l3_instr, ··· 614 665 &omap54xx_l4_cfg__mpu, 615 666 &omap54xx_l4_cfg__usb_host_hs, 616 667 &omap54xx_l4_cfg__usb_tll_hs, 617 - &omap54xx_l4_cfg__usb_otg_ss, 618 668 &omap54xx_l4_cfg__sata, 619 669 NULL, 620 670 };