ARM: OMAP2+: Drop legacy platform data for dra7 edma

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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 878c79c1283c2cf194af87135cc1f3161c59d49d..00a286426f16d9bf8014a75af3710b40a5b45416 100644 (file)
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -333,7 +333,6 @@
 
                target-module@43300000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tpcc";
                        reg = <0x43300000 0x4>;
                        reg-names = "rev";
                        clocks = <&l3main1_clkctrl DRA7_L3MAIN1_TPCC_CLKCTRL 0>;
@@ -367,7 +366,6 @@
 
                target-module@43400000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc0";
                        reg = <0x43400000 0x4>;
                        reg-names = "rev";
                        clocks = <&l3main1_clkctrl DRA7_L3MAIN1_TPTC0_CLKCTRL 0>;
@@ -386,7 +384,6 @@
 
                target-module@43500000 {
                        compatible = "ti,sysc-omap4", "ti,sysc";
-                       ti,hwmods = "tptc1";
                        reg = <0x43500000 0x4>;
                        reg-names = "rev";
                        clocks = <&l3main1_clkctrl DRA7_L3MAIN1_TPTC1_CLKCTRL 0>;

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 2f60333caaf11bdb386039036828393f0297bc3f..e95668bdbc3f3592bd8383116a2755ca8547ab87 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -276,67 +276,6 @@ static struct omap_hwmod dra7xx_ctrl_module_wkup_hwmod = {
        },
 };
 
-/*
- * 'tpcc' class
- *
- */
-static struct omap_hwmod_class dra7xx_tpcc_hwmod_class = {
-       .name           = "tpcc",
-};
-
-static struct omap_hwmod dra7xx_tpcc_hwmod = {
-       .name           = "tpcc",
-       .class          = &dra7xx_tpcc_hwmod_class,
-       .clkdm_name     = "l3main1_clkdm",
-       .main_clk       = "l3_iclk_div",
-       .prcm           = {
-               .omap4  = {
-                       .clkctrl_offs = DRA7XX_CM_L3MAIN1_TPCC_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L3MAIN1_TPCC_CONTEXT_OFFSET,
-               },
-       },
-};
-
-/*
- * 'tptc' class
- *
- */
-static struct omap_hwmod_class dra7xx_tptc_hwmod_class = {
-       .name           = "tptc",
-};
-
-/* tptc0 */
-static struct omap_hwmod dra7xx_tptc0_hwmod = {
-       .name           = "tptc0",
-       .class          = &dra7xx_tptc_hwmod_class,
-       .clkdm_name     = "l3main1_clkdm",
-       .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
-       .main_clk       = "l3_iclk_div",
-       .prcm           = {
-               .omap4  = {
-                       .clkctrl_offs = DRA7XX_CM_L3MAIN1_TPTC1_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L3MAIN1_TPTC1_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-};
-
-/* tptc1 */
-static struct omap_hwmod dra7xx_tptc1_hwmod = {
-       .name           = "tptc1",
-       .class          = &dra7xx_tptc_hwmod_class,
-       .clkdm_name     = "l3main1_clkdm",
-       .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
-       .main_clk       = "l3_iclk_div",
-       .prcm           = {
-               .omap4  = {
-                       .clkctrl_offs = DRA7XX_CM_L3MAIN1_TPTC2_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_L3MAIN1_TPTC2_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
-               },
-       },
-};
-
 /*
  * 'gpmc' class
  *
@@ -941,30 +880,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__ctrl_module_wkup = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l3_main_1 -> tpcc */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__tpcc = {
-       .master         = &dra7xx_l3_main_1_hwmod,
-       .slave          = &dra7xx_tpcc_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU,
-};
-
-/* l3_main_1 -> tptc0 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__tptc0 = {
-       .master         = &dra7xx_l3_main_1_hwmod,
-       .slave          = &dra7xx_tptc0_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU,
-};
-
-/* l3_main_1 -> tptc1 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__tptc1 = {
-       .master         = &dra7xx_l3_main_1_hwmod,
-       .slave          = &dra7xx_tptc1_hwmod,
-       .clk            = "l3_iclk_div",
-       .user           = OCP_USER_MPU,
-};
-
 /* l3_main_1 -> gpmc */
 static struct omap_hwmod_ocp_if dra7xx_l3_main_1__gpmc = {
        .master         = &dra7xx_l3_main_1_hwmod,
@@ -1149,9 +1064,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
        &dra7xx_l3_main_1__bb2d,
        &dra7xx_l4_wkup__counter_32k,
        &dra7xx_l4_wkup__ctrl_module_wkup,
-       &dra7xx_l3_main_1__tpcc,
-       &dra7xx_l3_main_1__tptc0,
-       &dra7xx_l3_main_1__tptc1,
        &dra7xx_l3_main_1__gpmc,
        &dra7xx_l4_cfg__mpu,
        &dra7xx_l3_main_1__pciess1,