Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6504acd authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2+: hwmod: remove OMAP_CHIP* 



At Tony's request, remove the OMAP_CHIP* flags from the hwmod data, and
replace it instead with chip family, variant, and ES level-specific lists
of hwmods to register.

Thanks to Gražvydas Ignotas <notasas@gmail.com> for finding a bug in the
AM3517/3505 support, and for other review comments.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Gražvydas Ignotas <notasas@gmail.com>
parent 8179488a

arch/arm/mach-omap2/omap_hwmod.c

+0 −3
Original line number Diff line number Diff line
@@ -1954,9 +1954,6 @@ int __init omap_hwmod_register(struct omap_hwmod **ohs) 


	i = 0;

	do {

		if (!omap_chip_is(ohs[i]->omap_chip))

			continue;



		r = _register(ohs[i]);

		WARN(r, "omap_hwmod: %s: _register returned %d\n", ohs[i]->name,

		     r);

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −37
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ static struct omap_hwmod omap2420_l3_main_hwmod = { 
	.masters_cnt	= ARRAY_SIZE(omap2420_l3_main_masters),

	.slaves		= omap2420_l3_main_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_l3_main_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -206,7 +205,6 @@ static struct omap_hwmod omap2420_l4_core_hwmod = { 
	.masters_cnt	= ARRAY_SIZE(omap2420_l4_core_masters),

	.slaves		= omap2420_l4_core_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_l4_core_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -227,7 +225,6 @@ static struct omap_hwmod omap2420_l4_wkup_hwmod = { 
	.masters_cnt	= ARRAY_SIZE(omap2420_l4_wkup_masters),

	.slaves		= omap2420_l4_wkup_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_l4_wkup_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -243,7 +240,6 @@ static struct omap_hwmod omap2420_mpu_hwmod = { 
	.main_clk	= "mpu_ck",

	.masters	= omap2420_mpu_masters,

	.masters_cnt	= ARRAY_SIZE(omap2420_mpu_masters),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/*
@@ -271,7 +267,6 @@ static struct omap_hwmod omap2420_iva_hwmod = { 
	.class		= &iva_hwmod_class,

	.masters	= omap2420_iva_masters,

	.masters_cnt	= ARRAY_SIZE(omap2420_iva_masters),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer1 */
@@ -317,7 +312,6 @@ static struct omap_hwmod omap2420_timer1_hwmod = { 
	.slaves		= omap2420_timer1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer1_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer2 */
@@ -354,7 +348,6 @@ static struct omap_hwmod omap2420_timer2_hwmod = { 
	.slaves		= omap2420_timer2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer2_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer3 */
@@ -391,7 +384,6 @@ static struct omap_hwmod omap2420_timer3_hwmod = { 
	.slaves		= omap2420_timer3_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer3_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer4 */
@@ -428,7 +420,6 @@ static struct omap_hwmod omap2420_timer4_hwmod = { 
	.slaves		= omap2420_timer4_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer4_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer5 */
@@ -465,7 +456,6 @@ static struct omap_hwmod omap2420_timer5_hwmod = { 
	.slaves		= omap2420_timer5_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer5_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};
@@ -503,7 +493,6 @@ static struct omap_hwmod omap2420_timer6_hwmod = { 
	.slaves		= omap2420_timer6_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer6_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer7 */
@@ -540,7 +529,6 @@ static struct omap_hwmod omap2420_timer7_hwmod = { 
	.slaves		= omap2420_timer7_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer7_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer8 */
@@ -577,7 +565,6 @@ static struct omap_hwmod omap2420_timer8_hwmod = { 
	.slaves		= omap2420_timer8_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer8_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer9 */
@@ -614,7 +601,6 @@ static struct omap_hwmod omap2420_timer9_hwmod = { 
	.slaves		= omap2420_timer9_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer9_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer10 */
@@ -651,7 +637,6 @@ static struct omap_hwmod omap2420_timer10_hwmod = { 
	.slaves		= omap2420_timer10_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer10_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer11 */
@@ -688,7 +673,6 @@ static struct omap_hwmod omap2420_timer11_hwmod = { 
	.slaves		= omap2420_timer11_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer11_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* timer12 */
@@ -725,7 +709,6 @@ static struct omap_hwmod omap2420_timer12_hwmod = { 
	.slaves		= omap2420_timer12_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_timer12_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420)

};



/* l4_wkup -> wd_timer2 */
@@ -766,7 +749,6 @@ static struct omap_hwmod omap2420_wd_timer2_hwmod = { 
	},

	.slaves		= omap2420_wd_timer2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_wd_timer2_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* UART1 */
@@ -792,7 +774,6 @@ static struct omap_hwmod omap2420_uart1_hwmod = { 
	.slaves		= omap2420_uart1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_uart1_slaves),

	.class		= &omap2_uart_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* UART2 */
@@ -818,7 +799,6 @@ static struct omap_hwmod omap2420_uart2_hwmod = { 
	.slaves		= omap2420_uart2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_uart2_slaves),

	.class		= &omap2_uart_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* UART3 */
@@ -844,7 +824,6 @@ static struct omap_hwmod omap2420_uart3_hwmod = { 
	.slaves		= omap2420_uart3_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_uart3_slaves),

	.class		= &omap2_uart_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* dss */
@@ -898,7 +877,6 @@ static struct omap_hwmod omap2420_dss_core_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_dss_slaves),

	.masters	= omap2420_dss_masters,

	.masters_cnt	= ARRAY_SIZE(omap2420_dss_masters),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -938,7 +916,6 @@ static struct omap_hwmod omap2420_dss_dispc_hwmod = { 
	},

	.slaves		= omap2420_dss_dispc_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_dss_dispc_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -975,7 +952,6 @@ static struct omap_hwmod omap2420_dss_rfbi_hwmod = { 
	},

	.slaves		= omap2420_dss_rfbi_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_dss_rfbi_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1013,7 +989,6 @@ static struct omap_hwmod omap2420_dss_venc_hwmod = { 
	},

	.slaves		= omap2420_dss_venc_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_dss_venc_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1064,7 +1039,6 @@ static struct omap_hwmod omap2420_i2c1_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_i2c1_slaves),

	.class		= &i2c_class,

	.dev_attr	= &i2c_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_16BIT_REG,

};
@@ -1092,7 +1066,6 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_i2c2_slaves),

	.class		= &i2c_class,

	.dev_attr	= &i2c_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_16BIT_REG,

};
@@ -1197,7 +1170,6 @@ static struct omap_hwmod omap2420_gpio1_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_gpio1_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* gpio2 */
@@ -1223,7 +1195,6 @@ static struct omap_hwmod omap2420_gpio2_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_gpio2_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* gpio3 */
@@ -1249,7 +1220,6 @@ static struct omap_hwmod omap2420_gpio3_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_gpio3_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* gpio4 */
@@ -1275,7 +1245,6 @@ static struct omap_hwmod omap2420_gpio4_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_gpio4_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* dma attributes */
@@ -1322,7 +1291,6 @@ static struct omap_hwmod omap2420_dma_system_hwmod = { 
	.masters	= omap2420_dma_system_masters,

	.masters_cnt	= ARRAY_SIZE(omap2420_dma_system_masters),

	.dev_attr	= &dma_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1363,7 +1331,6 @@ static struct omap_hwmod omap2420_mailbox_hwmod = { 
	},

	.slaves		= omap2420_mailbox_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_mailbox_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* mcspi1 */
@@ -1393,7 +1360,6 @@ static struct omap_hwmod omap2420_mcspi1_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_mcspi1_slaves),

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi1_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* mcspi2 */
@@ -1423,7 +1389,6 @@ static struct omap_hwmod omap2420_mcspi2_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2420_mcspi2_slaves),

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi2_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/*
@@ -1473,7 +1438,6 @@ static struct omap_hwmod omap2420_mcbsp1_hwmod = { 
	},

	.slaves		= omap2420_mcbsp1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_mcbsp1_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



/* mcbsp2 */
@@ -1514,7 +1478,6 @@ static struct omap_hwmod omap2420_mcbsp2_hwmod = { 
	},

	.slaves		= omap2420_mcbsp2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2420_mcbsp2_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2420),

};



static __initdata struct omap_hwmod *omap2420_hwmods[] = {

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −45
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static struct omap_hwmod omap2430_l3_main_hwmod = { 
	.masters_cnt	= ARRAY_SIZE(omap2430_l3_main_masters),

	.slaves		= omap2430_l3_main_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_l3_main_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -250,7 +249,6 @@ static struct omap_hwmod omap2430_l4_core_hwmod = { 
	.masters_cnt	= ARRAY_SIZE(omap2430_l4_core_masters),

	.slaves		= omap2430_l4_core_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_l4_core_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -301,7 +299,6 @@ static struct omap_hwmod omap2430_l4_wkup_hwmod = { 
	.masters_cnt	= ARRAY_SIZE(omap2430_l4_wkup_masters),

	.slaves		= omap2430_l4_wkup_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_l4_wkup_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -317,7 +314,6 @@ static struct omap_hwmod omap2430_mpu_hwmod = { 
	.main_clk	= "mpu_ck",

	.masters	= omap2430_mpu_masters,

	.masters_cnt	= ARRAY_SIZE(omap2430_mpu_masters),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/*
@@ -345,7 +341,6 @@ static struct omap_hwmod omap2430_iva_hwmod = { 
	.class		= &iva_hwmod_class,

	.masters	= omap2430_iva_masters,

	.masters_cnt	= ARRAY_SIZE(omap2430_iva_masters),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer1 */
@@ -391,7 +386,6 @@ static struct omap_hwmod omap2430_timer1_hwmod = { 
	.slaves		= omap2430_timer1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer1_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer2 */
@@ -428,7 +422,6 @@ static struct omap_hwmod omap2430_timer2_hwmod = { 
	.slaves		= omap2430_timer2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer2_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer3 */
@@ -465,7 +458,6 @@ static struct omap_hwmod omap2430_timer3_hwmod = { 
	.slaves		= omap2430_timer3_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer3_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer4 */
@@ -502,7 +494,6 @@ static struct omap_hwmod omap2430_timer4_hwmod = { 
	.slaves		= omap2430_timer4_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer4_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer5 */
@@ -539,7 +530,6 @@ static struct omap_hwmod omap2430_timer5_hwmod = { 
	.slaves		= omap2430_timer5_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer5_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer6 */
@@ -576,7 +566,6 @@ static struct omap_hwmod omap2430_timer6_hwmod = { 
	.slaves		= omap2430_timer6_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer6_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer7 */
@@ -613,7 +602,6 @@ static struct omap_hwmod omap2430_timer7_hwmod = { 
	.slaves		= omap2430_timer7_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer7_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer8 */
@@ -650,7 +638,6 @@ static struct omap_hwmod omap2430_timer8_hwmod = { 
	.slaves		= omap2430_timer8_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer8_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer9 */
@@ -687,7 +674,6 @@ static struct omap_hwmod omap2430_timer9_hwmod = { 
	.slaves		= omap2430_timer9_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer9_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer10 */
@@ -724,7 +710,6 @@ static struct omap_hwmod omap2430_timer10_hwmod = { 
	.slaves		= omap2430_timer10_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer10_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer11 */
@@ -761,7 +746,6 @@ static struct omap_hwmod omap2430_timer11_hwmod = { 
	.slaves		= omap2430_timer11_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer11_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* timer12 */
@@ -798,7 +782,6 @@ static struct omap_hwmod omap2430_timer12_hwmod = { 
	.slaves		= omap2430_timer12_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_timer12_slaves),

	.class		= &omap2xxx_timer_hwmod_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/* l4_wkup -> wd_timer2 */
@@ -839,7 +822,6 @@ static struct omap_hwmod omap2430_wd_timer2_hwmod = { 
	},

	.slaves		= omap2430_wd_timer2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_wd_timer2_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* UART1 */
@@ -865,7 +847,6 @@ static struct omap_hwmod omap2430_uart1_hwmod = { 
	.slaves		= omap2430_uart1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_uart1_slaves),

	.class		= &omap2_uart_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* UART2 */
@@ -891,7 +872,6 @@ static struct omap_hwmod omap2430_uart2_hwmod = { 
	.slaves		= omap2430_uart2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_uart2_slaves),

	.class		= &omap2_uart_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* UART3 */
@@ -917,7 +897,6 @@ static struct omap_hwmod omap2430_uart3_hwmod = { 
	.slaves		= omap2430_uart3_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_uart3_slaves),

	.class		= &omap2_uart_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* dss */
@@ -965,7 +944,6 @@ static struct omap_hwmod omap2430_dss_core_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_dss_slaves),

	.masters	= omap2430_dss_masters,

	.masters_cnt	= ARRAY_SIZE(omap2430_dss_masters),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -999,7 +977,6 @@ static struct omap_hwmod omap2430_dss_dispc_hwmod = { 
	},

	.slaves		= omap2430_dss_dispc_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_dss_dispc_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1030,7 +1007,6 @@ static struct omap_hwmod omap2430_dss_rfbi_hwmod = { 
	},

	.slaves		= omap2430_dss_rfbi_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_dss_rfbi_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1062,7 +1038,6 @@ static struct omap_hwmod omap2430_dss_venc_hwmod = { 
	},

	.slaves		= omap2430_dss_venc_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_dss_venc_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1123,7 +1098,6 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_i2c1_slaves),

	.class		= &i2c_class,

	.dev_attr	= &i2c_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* I2C2 */
@@ -1151,7 +1125,6 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_i2c2_slaves),

	.class		= &i2c_class,

	.dev_attr	= &i2c_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* l4_wkup -> gpio1 */
@@ -1273,7 +1246,6 @@ static struct omap_hwmod omap2430_gpio1_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_gpio1_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* gpio2 */
@@ -1299,7 +1271,6 @@ static struct omap_hwmod omap2430_gpio2_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_gpio2_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* gpio3 */
@@ -1325,7 +1296,6 @@ static struct omap_hwmod omap2430_gpio3_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_gpio3_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* gpio4 */
@@ -1351,7 +1321,6 @@ static struct omap_hwmod omap2430_gpio4_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_gpio4_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* gpio5 */
@@ -1382,7 +1351,6 @@ static struct omap_hwmod omap2430_gpio5_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_gpio5_slaves),

	.class		= &omap2xxx_gpio_hwmod_class,

	.dev_attr	= &gpio_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* dma attributes */
@@ -1429,7 +1397,6 @@ static struct omap_hwmod omap2430_dma_system_hwmod = { 
	.masters	= omap2430_dma_system_masters,

	.masters_cnt	= ARRAY_SIZE(omap2430_dma_system_masters),

	.dev_attr	= &dma_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

	.flags		= HWMOD_NO_IDLEST,

};
@@ -1469,7 +1436,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = { 
	},

	.slaves		= omap2430_mailbox_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mailbox_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcspi1 */
@@ -1499,7 +1465,6 @@ static struct omap_hwmod omap2430_mcspi1_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_mcspi1_slaves),

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi1_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcspi2 */
@@ -1529,7 +1494,6 @@ static struct omap_hwmod omap2430_mcspi2_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_mcspi2_slaves),

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi2_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcspi3 */
@@ -1572,7 +1536,6 @@ static struct omap_hwmod omap2430_mcspi3_hwmod = { 
	.slaves_cnt	= ARRAY_SIZE(omap2430_mcspi3_slaves),

	.class		= &omap2xxx_mcspi_class,

	.dev_attr	= &omap_mcspi3_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/*
@@ -1628,7 +1591,6 @@ static struct omap_hwmod omap2430_usbhsotg_hwmod = { 
	 */

	.flags		= HWMOD_NO_OCP_AUTOIDLE | HWMOD_SWSUP_SIDLE

				| HWMOD_SWSUP_MSTANDBY,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430)

};



/*
@@ -1689,7 +1651,6 @@ static struct omap_hwmod omap2430_mcbsp1_hwmod = { 
	},

	.slaves		= omap2430_mcbsp1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mcbsp1_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcbsp2 */
@@ -1731,7 +1692,6 @@ static struct omap_hwmod omap2430_mcbsp2_hwmod = { 
	},

	.slaves		= omap2430_mcbsp2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mcbsp2_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcbsp3 */
@@ -1783,7 +1743,6 @@ static struct omap_hwmod omap2430_mcbsp3_hwmod = { 
	},

	.slaves		= omap2430_mcbsp3_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mcbsp3_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcbsp4 */
@@ -1841,7 +1800,6 @@ static struct omap_hwmod omap2430_mcbsp4_hwmod = { 
	},

	.slaves		= omap2430_mcbsp4_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mcbsp4_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* mcbsp5 */
@@ -1899,7 +1857,6 @@ static struct omap_hwmod omap2430_mcbsp5_hwmod = { 
	},

	.slaves		= omap2430_mcbsp5_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mcbsp5_slaves),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* MMC/SD/SDIO common */
@@ -1966,7 +1923,6 @@ static struct omap_hwmod omap2430_mmc1_hwmod = { 
	.slaves		= omap2430_mmc1_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mmc1_slaves),

	.class		= &omap2430_mmc_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



/* MMC/SD/SDIO2 */
@@ -2010,7 +1966,6 @@ static struct omap_hwmod omap2430_mmc2_hwmod = { 
	.slaves		= omap2430_mmc2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap2430_mmc2_slaves),

	.class		= &omap2430_mmc_class,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP2430),

};



static __initdata struct omap_hwmod *omap2430_hwmods[] = {

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+85 −84

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+0 −82

File changed.

Preview size limit exceeded, changes collapsed.