ARM: OMAP2+: Drop legacy platform data for am3 wkup_m3
authorTony Lindgren <tony@atomide.com>
Mon, 16 Nov 2020 10:57:13 +0000 (12:57 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Nov 2020 10:57:55 +0000 (12:57 +0200)
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.

Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am33xx-l4.dtsi
arch/arm/mach-omap2/omap_hwmod_33xx_data.c

index 7fa2312b13e841a9deac18e0e28798751b1a7988..3d8d260eb4f7e5a99593d13057b6cb7d1535bf39 100644 (file)
@@ -32,7 +32,6 @@
 
                target-module@0 {                       /* 0x44d00000, ap 4 28.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "wkup_m3";
                        reg = <0x0 0x4>;
                        reg-names = "rev";
                        clocks = <&l4_wkup_aon_clkctrl AM3_L4_WKUP_AON_WKUP_M3_CLKCTRL 0>;
index 8d890df54f7cec2db9209a6391f064f429573d4f..0961275230d125c38c94341b6965a07274f119c2 100644 (file)
@@ -57,31 +57,6 @@ static struct omap_hwmod am33xx_l4_hs_hwmod = {
        },
 };
 
-static struct omap_hwmod_rst_info am33xx_wkup_m3_resets[] = {
-       { .name = "wkup_m3", .rst_shift = 3, .st_shift = 5 },
-};
-
-/* wkup_m3  */
-static struct omap_hwmod am33xx_wkup_m3_hwmod = {
-       .name           = "wkup_m3",
-       .class          = &am33xx_wkup_m3_hwmod_class,
-       .clkdm_name     = "l4_wkup_aon_clkdm",
-       /* Keep hardreset asserted */
-       .flags          = HWMOD_INIT_NO_RESET | HWMOD_NO_IDLEST,
-       .main_clk       = "dpll_core_m4_div2_ck",
-       .prcm           = {
-               .omap4  = {
-                       .clkctrl_offs   = AM33XX_CM_WKUP_WKUP_M3_CLKCTRL_OFFSET,
-                       .rstctrl_offs   = AM33XX_RM_WKUP_RSTCTRL_OFFSET,
-                       .rstst_offs     = AM33XX_RM_WKUP_RSTST_OFFSET,
-                       .modulemode     = MODULEMODE_SWCTRL,
-               },
-       },
-       .rst_lines      = am33xx_wkup_m3_resets,
-       .rst_lines_cnt  = ARRAY_SIZE(am33xx_wkup_m3_resets),
-};
-
-
 /*
  * Modules omap_hwmod structures
  *
@@ -202,22 +177,6 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__l4_hs = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* wkup m3 -> l4 wkup */
-static struct omap_hwmod_ocp_if am33xx_wkup_m3__l4_wkup = {
-       .master         = &am33xx_wkup_m3_hwmod,
-       .slave          = &am33xx_l4_wkup_hwmod,
-       .clk            = "dpll_core_m4_div2_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4 wkup -> wkup m3 */
-static struct omap_hwmod_ocp_if am33xx_l4_wkup__wkup_m3 = {
-       .master         = &am33xx_l4_wkup_hwmod,
-       .slave          = &am33xx_wkup_m3_hwmod,
-       .clk            = "dpll_core_m4_div2_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
 /* l3_main -> debugss */
 static struct omap_hwmod_ocp_if am33xx_l3_main__debugss = {
        .master         = &am33xx_l3_main_hwmod,
@@ -252,9 +211,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l3_main__l3_s,
        &am33xx_l3_main__l3_instr,
        &am33xx_l3_s__l3_main,
-       &am33xx_wkup_m3__l4_wkup,
        &am33xx_l3_main__debugss,
-       &am33xx_l4_wkup__wkup_m3,
        &am33xx_l4_wkup__smartreflex0,
        &am33xx_l4_wkup__smartreflex1,
        &am33xx_l3_s__gpmc,