diff options
author | Jarkko Nikula <jarkko.nikula@bitmer.com> | 2011-09-26 03:45:41 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-26 20:48:01 -0400 |
commit | 88408230d2fe752ffca0f292b092642cc5c153f1 (patch) | |
tree | e9c2dfed56b19a12e981d8884b950bf253cc1c46 /arch/arm/mach-omap2/mcbsp.c | |
parent | 1a6458847dd25e7ade3d633e5a374b836e38b9ae (diff) |
ARM: OMAP: mcbsp: Make tranceiver configuration control register access generic
McBSP transmit and receive configuration control registers must be set up
for OMAP2430 and later. Replace is_omap tests in generic code with a new
feature flag has_ccr in platform data so that there is no need to change
code for any upcoming OMAP version.
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/mcbsp.c')
-rw-r--r-- | arch/arm/mach-omap2/mcbsp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index de3457d750ff..d6cce00a730b 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
@@ -127,10 +127,12 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) | |||
127 | } | 127 | } |
128 | 128 | ||
129 | pdata->reg_step = 4; | 129 | pdata->reg_step = 4; |
130 | if (oh->class->rev < MCBSP_CONFIG_TYPE2) | 130 | if (oh->class->rev < MCBSP_CONFIG_TYPE2) { |
131 | pdata->reg_size = 2; | 131 | pdata->reg_size = 2; |
132 | else | 132 | } else { |
133 | pdata->reg_size = 4; | 133 | pdata->reg_size = 4; |
134 | pdata->has_ccr = true; | ||
135 | } | ||
134 | 136 | ||
135 | if (oh->class->rev == MCBSP_CONFIG_TYPE3) { | 137 | if (oh->class->rev == MCBSP_CONFIG_TYPE3) { |
136 | if (id == 2) | 138 | if (id == 2) |