diff options
| author | Andy Green <andy@warmcat.com> | 2011-07-10 05:27:14 -0600 | 
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-07-10 05:27:14 -0600 | 
| commit | 3e6005221138bcfc08f1a35b6f9e43b53330e851 (patch) | |
| tree | 276a76ad11a879d5df020a8eceb1839ae6449a3d /arch/arm/mach-omap2/omap_hwmod_2430_data.c | |
| parent | da7cdfac1b0c58d6863532dd3b432c3fbc034978 (diff) | |
| download | olio-linux-3.10-3e6005221138bcfc08f1a35b6f9e43b53330e851.tar.xz olio-linux-3.10-3e6005221138bcfc08f1a35b6f9e43b53330e851.zip  | |
I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
Peter Maydell noticed when running under QEMU he was getting
errors reporting 32-bit access to I2C peripheral unit registers
that are documented to be 8 or 16-bit only[1][2]
The I2C driver is blameless as it wraps its accesses in a
function using __raw_writew and __raw_readw, it turned out it
is the hwmod stuff.
However the hwmod code already has a flag to force a
perhipheral unit to only be accessed using 16-bit operations.
This patch applies the 16-bit only flag to the 2430,
OMAP3xxx and OMAP44xx hwmod structs.  2420 was already
correctly marked up as 16-bit.
The 2430 change will need testing by TI as arranged
in the comments to the previous patch version.
When the 16-bit flag is or-ed with other flags, it is placed
first as requested in comments.
[1] OMAP4430 Technical reference manual section 23.1.6.2
[2] OMAP3530 Techincal reference manual section 18.6
Cc: patches@linaro.org
Cc: Ben Dooks <ben-linux@fluff.org>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andy Green <andy.green@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_2430_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 2a52f025bd0..19ddf082144 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -1092,6 +1092,7 @@ static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {  static struct omap_hwmod omap2430_i2c1_hwmod = {  	.name		= "i2c1", +	.flags		= HWMOD_16BIT_REG,  	.mpu_irqs	= omap2_i2c1_mpu_irqs,  	.sdma_reqs	= omap2_i2c1_sdma_reqs,  	.main_clk	= "i2chs1_fck", @@ -1127,6 +1128,7 @@ static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {  static struct omap_hwmod omap2430_i2c2_hwmod = {  	.name		= "i2c2", +	.flags		= HWMOD_16BIT_REG,  	.mpu_irqs	= omap2_i2c2_mpu_irqs,  	.sdma_reqs	= omap2_i2c2_sdma_reqs,  	.main_clk	= "i2chs2_fck",  |