diff options
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 | 
4 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c index c8c64b3e1ac..d05fc7b5456 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c @@ -512,6 +512,7 @@ struct omap_hwmod omap2xxx_uart1_hwmod = {  	.mpu_irqs	= omap2_uart1_mpu_irqs,  	.sdma_reqs	= omap2_uart1_sdma_reqs,  	.main_clk	= "uart1_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = CORE_MOD, @@ -531,6 +532,7 @@ struct omap_hwmod omap2xxx_uart2_hwmod = {  	.mpu_irqs	= omap2_uart2_mpu_irqs,  	.sdma_reqs	= omap2_uart2_sdma_reqs,  	.main_clk	= "uart2_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = CORE_MOD, @@ -550,6 +552,7 @@ struct omap_hwmod omap2xxx_uart3_hwmod = {  	.mpu_irqs	= omap2_uart3_mpu_irqs,  	.sdma_reqs	= omap2_uart3_sdma_reqs,  	.main_clk	= "uart3_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = CORE_MOD, diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 01d8f324450..075f7cc5102 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -1995,6 +1995,7 @@ static struct omap_hwmod am33xx_uart1_hwmod = {  	.name		= "uart1",  	.class		= &uart_class,  	.clkdm_name	= "l4_wkup_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= am33xx_uart1_irqs,  	.sdma_reqs	= uart1_edma_reqs,  	.main_clk	= "dpll_per_m2_div4_wkupdm_ck", @@ -2015,6 +2016,7 @@ static struct omap_hwmod am33xx_uart2_hwmod = {  	.name		= "uart2",  	.class		= &uart_class,  	.clkdm_name	= "l4ls_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= am33xx_uart2_irqs,  	.sdma_reqs	= uart1_edma_reqs,  	.main_clk	= "dpll_per_m2_div4_ck", @@ -2042,6 +2044,7 @@ static struct omap_hwmod am33xx_uart3_hwmod = {  	.name		= "uart3",  	.class		= &uart_class,  	.clkdm_name	= "l4ls_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= am33xx_uart3_irqs,  	.sdma_reqs	= uart3_edma_reqs,  	.main_clk	= "dpll_per_m2_div4_ck", @@ -2062,6 +2065,7 @@ static struct omap_hwmod am33xx_uart4_hwmod = {  	.name		= "uart4",  	.class		= &uart_class,  	.clkdm_name	= "l4ls_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= am33xx_uart4_irqs,  	.sdma_reqs	= uart1_edma_reqs,  	.main_clk	= "dpll_per_m2_div4_ck", @@ -2082,6 +2086,7 @@ static struct omap_hwmod am33xx_uart5_hwmod = {  	.name		= "uart5",  	.class		= &uart_class,  	.clkdm_name	= "l4ls_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= am33xx_uart5_irqs,  	.sdma_reqs	= uart1_edma_reqs,  	.main_clk	= "dpll_per_m2_div4_ck", @@ -2102,6 +2107,7 @@ static struct omap_hwmod am33xx_uart6_hwmod = {  	.name		= "uart6",  	.class		= &uart_class,  	.clkdm_name	= "l4ls_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= am33xx_uart6_irqs,  	.sdma_reqs	= uart1_edma_reqs,  	.main_clk	= "dpll_per_m2_div4_ck", diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 4083606ea1d..31c7126eb3b 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -490,6 +490,7 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = {  	.mpu_irqs	= omap2_uart1_mpu_irqs,  	.sdma_reqs	= omap2_uart1_sdma_reqs,  	.main_clk	= "uart1_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = CORE_MOD, @@ -508,6 +509,7 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = {  	.mpu_irqs	= omap2_uart2_mpu_irqs,  	.sdma_reqs	= omap2_uart2_sdma_reqs,  	.main_clk	= "uart2_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = CORE_MOD, @@ -526,6 +528,7 @@ static struct omap_hwmod omap3xxx_uart3_hwmod = {  	.mpu_irqs	= omap2_uart3_mpu_irqs,  	.sdma_reqs	= omap2_uart3_sdma_reqs,  	.main_clk	= "uart3_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = OMAP3430_PER_MOD, @@ -555,6 +558,7 @@ static struct omap_hwmod omap36xx_uart4_hwmod = {  	.mpu_irqs	= uart4_mpu_irqs,  	.sdma_reqs	= uart4_sdma_reqs,  	.main_clk	= "uart4_fck", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.prcm		= {  		.omap2 = {  			.module_offs = OMAP3430_PER_MOD, diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index eaba9dc91a0..848b6dc6759 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -3434,6 +3434,7 @@ static struct omap_hwmod omap44xx_uart1_hwmod = {  	.name		= "uart1",  	.class		= &omap44xx_uart_hwmod_class,  	.clkdm_name	= "l4_per_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= omap44xx_uart1_irqs,  	.sdma_reqs	= omap44xx_uart1_sdma_reqs,  	.main_clk	= "func_48m_fclk", @@ -3462,6 +3463,7 @@ static struct omap_hwmod omap44xx_uart2_hwmod = {  	.name		= "uart2",  	.class		= &omap44xx_uart_hwmod_class,  	.clkdm_name	= "l4_per_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= omap44xx_uart2_irqs,  	.sdma_reqs	= omap44xx_uart2_sdma_reqs,  	.main_clk	= "func_48m_fclk", @@ -3490,7 +3492,8 @@ static struct omap_hwmod omap44xx_uart3_hwmod = {  	.name		= "uart3",  	.class		= &omap44xx_uart_hwmod_class,  	.clkdm_name	= "l4_per_clkdm", -	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET, +	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET | +				HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= omap44xx_uart3_irqs,  	.sdma_reqs	= omap44xx_uart3_sdma_reqs,  	.main_clk	= "func_48m_fclk", @@ -3519,6 +3522,7 @@ static struct omap_hwmod omap44xx_uart4_hwmod = {  	.name		= "uart4",  	.class		= &omap44xx_uart_hwmod_class,  	.clkdm_name	= "l4_per_clkdm", +	.flags		= HWMOD_SWSUP_SIDLE_ACT,  	.mpu_irqs	= omap44xx_uart4_irqs,  	.sdma_reqs	= omap44xx_uart4_sdma_reqs,  	.main_clk	= "func_48m_fclk",  |