Commit 3f95f51b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop legacy platform data for cpsw on dra7 



We can now probe cpsw with ti-sysc interconnect driver and dts
data. Let's drop the related platform data and custom ti,hwmods
dts property for am3 and am4.

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: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Cc: Keerthy <j-keerthy@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7abe7461

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

+0 −2
Original line number Diff line number Diff line
@@ -3045,7 +3045,6 @@ 


		target-module@84000 {			/* 0x48484000, ap 3 10.0 */

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

			ti,hwmods = "gmac";

			reg = <0x85200 0x4>,

			      <0x85208 0x4>,

			      <0x85204 0x4>;
@@ -3107,7 +3106,6 @@ 
					clock-names = "fck";

					#address-cells = <1>;

					#size-cells = <0>;

					ti,hwmods = "davinci_mdio";

					bus_freq = <1000000>;

					reg = <0x1000 0x100>;

				};

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+0 −65
Original line number Diff line number Diff line
@@ -284,56 +284,6 @@ static struct omap_hwmod dra7xx_ctrl_module_wkup_hwmod = { 
	},

};



/*

 * 'gmac' class

 * cpsw/gmac sub system

 */

static struct omap_hwmod_class_sysconfig dra7xx_gmac_sysc = {

	.rev_offs	= 0x0,

	.sysc_offs	= 0x8,

	.syss_offs	= 0x4,

	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |

			   SYSS_HAS_RESET_STATUS),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | MSTANDBY_FORCE |

			   MSTANDBY_NO),

	.sysc_fields	= &omap_hwmod_sysc_type3,

};



static struct omap_hwmod_class dra7xx_gmac_hwmod_class = {

	.name		= "gmac",

	.sysc		= &dra7xx_gmac_sysc,

};



static struct omap_hwmod dra7xx_gmac_hwmod = {

	.name		= "gmac",

	.class		= &dra7xx_gmac_hwmod_class,

	.clkdm_name	= "gmac_clkdm",

	.flags		= (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),

	.main_clk	= "dpll_gmac_ck",

	.mpu_rt_idx	= 1,

	.prcm		= {

		.omap4	= {

			.clkctrl_offs	= DRA7XX_CM_GMAC_GMAC_CLKCTRL_OFFSET,

			.context_offs	= DRA7XX_RM_GMAC_GMAC_CONTEXT_OFFSET,

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/*

 * 'mdio' class

 */

static struct omap_hwmod_class dra7xx_mdio_hwmod_class = {

	.name		= "davinci_mdio",

};



static struct omap_hwmod dra7xx_mdio_hwmod = {

	.name		= "davinci_mdio",

	.class		= &dra7xx_mdio_hwmod_class,

	.clkdm_name	= "gmac_clkdm",

	.main_clk	= "dpll_gmac_ck",

};



/*

 * 'dcan' class

 *
@@ -2303,19 +2253,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__ctrl_module_wkup = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



static struct omap_hwmod_ocp_if dra7xx_l4_per2__cpgmac0 = {

	.master		= &dra7xx_l4_per2_hwmod,

	.slave		= &dra7xx_gmac_hwmod,

	.clk		= "dpll_gmac_ck",

	.user		= OCP_USER_MPU,

};



static struct omap_hwmod_ocp_if dra7xx_gmac__mdio = {

	.master		= &dra7xx_gmac_hwmod,

	.slave		= &dra7xx_mdio_hwmod,

	.user		= OCP_USER_MPU,

};



/* l4_wkup -> dcan1 */

static struct omap_hwmod_ocp_if dra7xx_l4_wkup__dcan1 = {

	.master		= &dra7xx_l4_wkup_hwmod,
@@ -3021,7 +2958,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { 
	&dra7xx_l4_wkup__ctrl_module_wkup,

	&dra7xx_l4_wkup__dcan1,

	&dra7xx_l4_per2__dcan2,

	&dra7xx_l4_per2__cpgmac0,

	&dra7xx_l4_per2__mcasp1,

	&dra7xx_l3_main_1__mcasp1,

	&dra7xx_l4_per2__mcasp2,
@@ -3033,7 +2969,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { 
	&dra7xx_l4_per2__mcasp6,

	&dra7xx_l4_per2__mcasp7,

	&dra7xx_l4_per2__mcasp8,

	&dra7xx_gmac__mdio,

	&dra7xx_l4_cfg__dma_system,

	&dra7xx_l3_main_1__tpcc,

	&dra7xx_l3_main_1__tptc0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE