i2c: omap: raw read and write endian fix

Victor Kamensky · Wolfram Sang · commit 40b13ca8dcac · 2013-11-27T19:26:05.000+01:00
All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
Need to use endian neutral functions to read/write h/w registers.
I.e instead of __raw_read[lw] and __raw_write[lw] functions code
need to use read[lw]_relaxed and write[lw]_relaxed functions.
If the first simply reads/writes register, the second will byteswap
it if host operates in BE mode.

Changes are trivial sed like replacement of __raw_xxx functions
with xxx_relaxed variant.

Signed-off-by: Victor Kamensky &lt;victor.kamensky@linaro.org&gt;
Signed-off-by: Taras Kondratiuk &lt;taras.kondratiuk@linaro.org&gt;
Signed-off-by: Wolfram Sang &lt;wsa@the-dreams.de&gt;
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
@@ -266,13 +266,13 @@ static const u8 reg_map_ip_v2[] = {
 static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
 				      int reg, u16 val)
 {
-	__raw_writew(val, i2c_dev->base +
+	writew_relaxed(val, i2c_dev->base +
 			(i2c_dev->regs[reg] << i2c_dev->reg_shift));
 }
 
 static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
 {
-	return __raw_readw(i2c_dev->base +
+	return readw_relaxed(i2c_dev->base +
 				(i2c_dev->regs[reg] << i2c_dev->reg_shift));
 }
 
@@ -1140,9 +1140,9 @@ omap_i2c_probe(struct platform_device *pdev)
 	 * Read the Rev hi bit-[15:14] ie scheme this is 1 indicates ver2.
 	 * On omap1/3/2 Offset 4 is IE Reg the bit [15:14] is 0 at reset.
 	 * Also since the omap_i2c_read_reg uses reg_map_ip_* a
-	 * raw_readw is done.
+	 * readw_relaxed is done.
 	 */
-	rev = __raw_readw(dev->base + 0x04);
+	rev = readw_relaxed(dev->base + 0x04);
 
 	dev->scheme = OMAP_I2C_SCHEME(rev);
 	switch (dev->scheme) {

Original file line number	Diff line number	Diff line change
`@@ -266,13 +266,13 @@ static const u8 reg_map_ip_v2[] = {`
`266`	`266`	`static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,`
`267`	`267`	`int reg, u16 val)`
`268`	`268`	`{`
`269`		`- __raw_writew(val, i2c_dev->base +`
	`269`	`+ writew_relaxed(val, i2c_dev->base +`
`270`	`270`	`(i2c_dev->regs[reg] << i2c_dev->reg_shift));`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)`
`274`	`274`	`{`
`275`		`- return __raw_readw(i2c_dev->base +`
	`275`	`+ return readw_relaxed(i2c_dev->base +`
`276`	`276`	`(i2c_dev->regs[reg] << i2c_dev->reg_shift));`
`277`	`277`	`}`
`278`	`278`
`@@ -1140,9 +1140,9 @@ omap_i2c_probe(struct platform_device *pdev)`
`1140`	`1140`	`* Read the Rev hi bit-[15:14] ie scheme this is 1 indicates ver2.`
`1141`	`1141`	`* On omap1/3/2 Offset 4 is IE Reg the bit [15:14] is 0 at reset.`
`1142`	`1142`	`* Also since the omap_i2c_read_reg uses reg_map_ip_* a`
`1143`		`- * raw_readw is done.`
	`1143`	`+ * readw_relaxed is done.`
`1144`	`1144`	`*/`
`1145`		`- rev = __raw_readw(dev->base + 0x04);`
	`1145`	`+ rev = readw_relaxed(dev->base + 0x04);`
`1146`	`1146`
`1147`	`1147`	`dev->scheme = OMAP_I2C_SCHEME(rev);`
`1148`	`1148`	`switch (dev->scheme) {`