Commit 67575570 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
parent 2e539568

arch/arm/boot/dts/am33xx.dtsi

+14 −6
Original line number Diff line number Diff line
@@ -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>;



		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>;

			reg = <0 0x1000000>;

			ti,hwmods = "debugss";

			};

		};

	};

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE