Commit 966c5e9f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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



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.

Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e990ebae

arch/arm/boot/dts/am33xx.dtsi

+17 −7
Original line number Diff line number Diff line
@@ -479,14 +479,24 @@ 
			};

		};



		emif: emif@4c000000 {

		target-module@4c000000 {

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

			reg = <0x4c000000 0x4>;

			reg-names = "rev";

			clocks = <&l3_clkctrl AM3_L3_EMIF_CLKCTRL 0>;

			clock-names = "fck";

			ti,no-idle;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x4c000000 0x1000000>;



			emif: emif@0 {

				compatible = "ti,emif-am3352";

			reg = <0x4c000000 0x1000000>;

			ti,hwmods = "emif";

				reg = <0 0x1000000>;

				interrupts = <101>;

				sram = <&pm_sram_code

					&pm_sram_data>;

			ti,no-idle;

			};

		};



		target-module@50000000 {

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+0 −24
Original line number Diff line number Diff line
@@ -27,21 +27,6 @@ 
 * IP blocks

 */



/* emif */

static struct omap_hwmod am33xx_emif_hwmod = {

	.name		= "emif",

	.class		= &am33xx_emif_hwmod_class,

	.clkdm_name	= "l3_clkdm",

	.flags		= HWMOD_INIT_NO_IDLE,

	.main_clk	= "dpll_ddr_m2_div2_ck",

	.prcm		= {

		.omap4	= {

			.clkctrl_offs	= AM33XX_CM_PER_EMIF_CLKCTRL_OFFSET,

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* l4_hs */

static struct omap_hwmod am33xx_l4_hs_hwmod = {

	.name		= "l4_hs",
@@ -133,14 +118,6 @@ static struct omap_hwmod am33xx_ocpwp_hwmod = { 
 * Interfaces

 */



/* l3 main -> emif */

static struct omap_hwmod_ocp_if am33xx_l3_main__emif = {

	.master		= &am33xx_l3_main_hwmod,

	.slave		= &am33xx_emif_hwmod,

	.clk		= "dpll_core_m4_ck",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3 main -> l4 hs */

static struct omap_hwmod_ocp_if am33xx_l3_main__l4_hs = {

	.master		= &am33xx_l3_main_hwmod,
@@ -166,7 +143,6 @@ static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex1 = { 
};



static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {

	&am33xx_l3_main__emif,

	&am33xx_mpu__l3_main,

	&am33xx_mpu__prcm,

	&am33xx_l3_s__l4_ls,

CRA Git | Maintained and supported by SUSTech CRA and CCSE