Commit 860e2464 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop legacy platform data for dra7 dmm 



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 66b2f7fe

arch/arm/boot/dts/dra7.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ edma_tptc1: dma@0 { 


		target-module@4e000000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "dmm";

			reg = <0x4e000000 0x4>,

			      <0x4e000010 0x4>;

			reg-names = "rev", "sysc";

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

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

 */



/*

 * 'dmm' class

 * instance(s): dmm

 */

static struct omap_hwmod_class dra7xx_dmm_hwmod_class = {

	.name	= "dmm",

};



/* dmm */

static struct omap_hwmod dra7xx_dmm_hwmod = {

	.name		= "dmm",

	.class		= &dra7xx_dmm_hwmod_class,

	.clkdm_name	= "emif_clkdm",

	.prcm = {

		.omap4 = {

			.clkctrl_offs = DRA7XX_CM_EMIF_DMM_CLKCTRL_OFFSET,

			.context_offs = DRA7XX_RM_EMIF_DMM_CONTEXT_OFFSET,

		},

	},

};



/*

 * 'l3' class

 * instance(s): l3_instr, l3_main_1, l3_main_2
@@ -285,14 +264,6 @@ static struct omap_hwmod dra7xx_vcp2_hwmod = { 
 * Interfaces

 */



/* l3_main_1 -> dmm */

static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dmm = {

	.master		= &dra7xx_l3_main_1_hwmod,

	.slave		= &dra7xx_dmm_hwmod,

	.clk		= "l3_iclk_div",

	.user		= OCP_USER_SDMA,

};



/* l3_main_2 -> l3_instr */

static struct omap_hwmod_ocp_if dra7xx_l3_main_2__l3_instr = {

	.master		= &dra7xx_l3_main_2_hwmod,
@@ -422,7 +393,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per2__vcp2 = { 
};



static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {

	&dra7xx_l3_main_1__dmm,

	&dra7xx_l3_main_2__l3_instr,

	&dra7xx_l4_cfg__l3_main_1,

	&dra7xx_l3_main_1__l3_main_2,