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

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



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.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 67575570

arch/arm/boot/dts/am33xx-l4.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,24 @@ 
		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x00000000 0x00200000 0x010000>;



		target-module@0 {

			compatible = "ti,sysc-omap4-simple", "ti,sysc";

			power-domains = <&prm_mpu>;

			clocks = <&mpu_clkctrl AM3_MPU_MPU_CLKCTRL 0>;

			clock-names = "fck";

			ti,no-idle;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 0 0x10000>;



			mpu@0 {

				compatible = "ti,omap3-mpu";

				pm-sram = <&pm_sram_code

					   &pm_sram_data>;

			};

		};

	};



	segment@300000 {					/* 0x48300000 */

arch/arm/boot/dts/am33xx.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -174,12 +174,6 @@ 
	 */

	soc {

		compatible = "ti,omap-infra";

		mpu {

			compatible = "ti,omap3-mpu";

			ti,hwmods = "mpu";

			pm-sram = <&pm_sram_code

				   &pm_sram_data>;

		};

	};



	/*

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static void omap_hwmod_am33xx_clkctrl(void) 
	CLKCTRL(am33xx_l4_ls_hwmod, AM33XX_CM_PER_L4LS_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l4_wkup_hwmod, AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l3_main_hwmod, AM33XX_CM_PER_L3_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mpu_hwmod , AM33XX_CM_MPU_MPU_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l3_instr_hwmod , AM33XX_CM_PER_L3_INSTR_CLKCTRL_OFFSET);

}

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex1 = { 
};



static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {

	&am33xx_mpu__l3_main,

	&am33xx_mpu__prcm,

	&am33xx_l3_s__l4_ls,

	&am33xx_l3_s__l4_wkup,

	&am33xx_l3_main__l4_hs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE