diff options
| -rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/cm-regbits-44xx.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 7e000d0..3e3922d 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -1595,7 +1595,7 @@ static struct clk dmic_sync_mux_ck = { .clksel = dmic_sync_mux_sel, .init = &omap2_init_clksel_parent, .clksel_reg = OMAP4430_CM1_ABE_DMIC_CLKCTRL, - .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_MASK, + .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_MASK, .ops = &clkops_null, .recalc = &omap2_clksel_recalc, .speculate = &omap2_clksel_speculate, @@ -2112,7 +2112,7 @@ static struct clk mcasp_sync_mux_ck = { .clksel = dmic_sync_mux_sel, .init = &omap2_init_clksel_parent, .clksel_reg = OMAP4430_CM1_ABE_MCASP_CLKCTRL, - .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_MASK, + .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_MASK, .ops = &clkops_null, .recalc = &omap2_clksel_recalc, .speculate = &omap2_clksel_speculate, @@ -2147,7 +2147,7 @@ static struct clk mcbsp1_sync_mux_ck = { .clksel = dmic_sync_mux_sel, .init = &omap2_init_clksel_parent, .clksel_reg = OMAP4430_CM1_ABE_MCBSP1_CLKCTRL, - .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_MASK, + .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_MASK, .ops = &clkops_null, .recalc = &omap2_clksel_recalc, .speculate = &omap2_clksel_speculate, @@ -2182,7 +2182,7 @@ static struct clk mcbsp2_sync_mux_ck = { .clksel = dmic_sync_mux_sel, .init = &omap2_init_clksel_parent, .clksel_reg = OMAP4430_CM1_ABE_MCBSP2_CLKCTRL, - .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_MASK, + .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_MASK, .ops = &clkops_null, .recalc = &omap2_clksel_recalc, .speculate = &omap2_clksel_speculate, @@ -2217,7 +2217,7 @@ static struct clk mcbsp3_sync_mux_ck = { .clksel = dmic_sync_mux_sel, .init = &omap2_init_clksel_parent, .clksel_reg = OMAP4430_CM1_ABE_MCBSP3_CLKCTRL, - .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_MASK, + .clksel_mask = OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_MASK, .ops = &clkops_null, .recalc = &omap2_clksel_recalc, .speculate = &omap2_clksel_speculate, diff --git a/arch/arm/mach-omap2/cm-regbits-44xx.h b/arch/arm/mach-omap2/cm-regbits-44xx.h index 65a72eb..b20f47e 100644 --- a/arch/arm/mach-omap2/cm-regbits-44xx.h +++ b/arch/arm/mach-omap2/cm-regbits-44xx.h @@ -501,8 +501,8 @@ * CM1_ABE_MCASP_CLKCTRL, CM1_ABE_MCBSP1_CLKCTRL, CM1_ABE_MCBSP2_CLKCTRL, * CM1_ABE_MCBSP3_CLKCTRL */ -#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_DMIC_SHIFT 26 -#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_DMIC_MASK (0x3 << 26) +#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_SHIFT 26 +#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_MASK (0x3 << 26) /* Used by CM_CLKSEL_CORE, CM_CLKSEL_CORE_RESTORE */ #define OMAP4430_CLKSEL_L3_SHIFT 4 |