ARM: OMAP2+: Drop legacy platform data for am3 instr

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.

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

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 1d1cc85..c540ba4 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -146,17 +146,25 @@
 
        target-module@4b000000 {
                compatible = "ti,sysc-omap4-simple", "ti,sysc";
-               clocks = <&l3_aon_clkctrl AM3_L3_AON_DEBUGSS_CLKCTRL 0>;
+               clocks = <&l3_clkctrl AM3_L3_L3_INSTR_CLKCTRL 0>;
                clock-names = "fck";
+               ti,no-idle;
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0 0x4b000000 0x1000000>;
 
-               pmu@0 {
-                       compatible = "arm,cortex-a8-pmu";
-                       interrupts = <3>;
-                       reg = <0 0x1000000>;
-                       ti,hwmods = "debugss";
+               target-module@140000 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
+                       clocks = <&l3_aon_clkctrl AM3_L3_AON_DEBUGSS_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x140000 0xec0000>;
+
+                       pmu@0 {
+                               compatible = "arm,cortex-a8-pmu";
+                               interrupts = <3>;
+                       };
                };
        };
 

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
index 3efcba4..f0abdcc 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
@@ -246,7 +246,6 @@ static void omap_hwmod_am43xx_clkctrl(void)
        CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_l3_main_hwmod, AM43XX_CM_PER_L3_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_mpu_hwmod , AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET);
-       CLKCTRL(am33xx_l3_instr_hwmod , AM43XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);
        CLKCTRL(am33xx_ocmcram_hwmod , AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);
 }
 

diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index 6c4b7d3..5fd9b25 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -149,7 +149,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l3_s__l4_wkup,
        &am33xx_l3_main__l4_hs,
        &am33xx_l3_main__l3_s,
-       &am33xx_l3_main__l3_instr,
        &am33xx_l3_s__l3_main,
        &am33xx_l4_wkup__smartreflex0,
        &am33xx_l4_wkup__smartreflex1,