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

We can now probe interconnects with simple-pm-bus and genpd.

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

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index af09a3ef36d064f40f5c4c5249a715330bcb959a..bac6fa83879368b447d9e0146d2c998ba6d81fe3 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -151,7 +151,6 @@
                #size-cells = <1>;
                ranges = <0 0 0 0xc0000000>;
                dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;
-               ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
 
                l3-noc@44000000 {
                        compatible = "ti,omap5-l3-noc";

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 8bea508d43d186d0fc1382ff987f6b3ca875fb0d..90aad362b6578343fe91b37b550aae81fb8f4d5f 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -26,121 +26,7 @@
 /* Base offset for all OMAP5 interrupts external to MPUSS */
 #define OMAP54XX_IRQ_GIC_START 32
 
-/*
- * IP blocks
- */
-
-/*
- * 'l3' class
- * instance(s): l3_instr, l3_main_1, l3_main_2, l3_main_3
- */
-static struct omap_hwmod_class omap54xx_l3_hwmod_class = {
-       .name   = "l3",
-};
-
-/* l3_instr */
-static struct omap_hwmod omap54xx_l3_instr_hwmod = {
-       .name           = "l3_instr",
-       .class          = &omap54xx_l3_hwmod_class,
-       .clkdm_name     = "l3instr_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_L3INSTR_L3_INSTR_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_L3INSTR_L3_INSTR_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-};
-
-/* l3_main_1 */
-static struct omap_hwmod omap54xx_l3_main_1_hwmod = {
-       .name           = "l3_main_1",
-       .class          = &omap54xx_l3_hwmod_class,
-       .clkdm_name     = "l3main1_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_L3MAIN1_L3_MAIN_1_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_L3MAIN1_L3_MAIN_1_CONTEXT_OFFSET,
-               },
-       },
-};
-
-/* l3_main_2 */
-static struct omap_hwmod omap54xx_l3_main_2_hwmod = {
-       .name           = "l3_main_2",
-       .class          = &omap54xx_l3_hwmod_class,
-       .clkdm_name     = "l3main2_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_L3MAIN2_L3_MAIN_2_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_L3MAIN2_L3_MAIN_2_CONTEXT_OFFSET,
-               },
-       },
-};
-
-/* l3_main_3 */
-static struct omap_hwmod omap54xx_l3_main_3_hwmod = {
-       .name           = "l3_main_3",
-       .class          = &omap54xx_l3_hwmod_class,
-       .clkdm_name     = "l3instr_clkdm",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_L3INSTR_L3_MAIN_3_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_L3INSTR_L3_MAIN_3_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-};
-
-/*
- * Interfaces
- */
-
-/* l3_main_3 -> l3_instr */
-static struct omap_hwmod_ocp_if omap54xx_l3_main_3__l3_instr = {
-       .master         = &omap54xx_l3_main_3_hwmod,
-       .slave          = &omap54xx_l3_instr_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l3_main_2 -> l3_main_1 */
-static struct omap_hwmod_ocp_if omap54xx_l3_main_2__l3_main_1 = {
-       .master         = &omap54xx_l3_main_2_hwmod,
-       .slave          = &omap54xx_l3_main_1_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l3_main_1 -> l3_main_2 */
-static struct omap_hwmod_ocp_if omap54xx_l3_main_1__l3_main_2 = {
-       .master         = &omap54xx_l3_main_1_hwmod,
-       .slave          = &omap54xx_l3_main_2_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU,
-};
-
-static struct omap_hwmod_ocp_if omap54xx_l3_main_1__l3_main_3 = {
-       .master         = &omap54xx_l3_main_1_hwmod,
-       .slave          = &omap54xx_l3_main_3_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU,
-};
-
-/* l3_main_2 -> l3_main_3 */
-static struct omap_hwmod_ocp_if omap54xx_l3_main_2__l3_main_3 = {
-       .master         = &omap54xx_l3_main_2_hwmod,
-       .slave          = &omap54xx_l3_main_3_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
 static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
-       &omap54xx_l3_main_3__l3_instr,
-       &omap54xx_l3_main_2__l3_main_1,
-       &omap54xx_l3_main_1__l3_main_2,
-       &omap54xx_l3_main_1__l3_main_3,
-       &omap54xx_l3_main_2__l3_main_3,
        NULL,
 };