mfd: Push byte swap out of WM8994 bulk I/O
For bulk I/O it is both convenient and more sensible to pre-swap the data rather than doing the swap as part of the I/O operation so move the byte swaps we're currently doing into the core write function into the register based functions, giving the bulk write function a straight pass through to the chip. This leaves reads inconsistent, this will be addressed as a followup patch. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
334e9ab8f9
commit
4277163c2a
|
@ -107,9 +107,7 @@ static int wm8994_write(struct wm8994 *wm8994, unsigned short reg,
|
|||
|
||||
for (i = 0; i < bytes / 2; i++) {
|
||||
dev_vdbg(wm8994->dev, "Write %04x to R%d(0x%x)\n",
|
||||
buf[i], reg + i, reg + i);
|
||||
|
||||
buf[i] = cpu_to_be16(buf[i]);
|
||||
be16_to_cpu(buf[i]), reg + i, reg + i);
|
||||
}
|
||||
|
||||
return wm8994->write_dev(wm8994, reg, bytes, src);
|
||||
|
@ -127,6 +125,8 @@ int wm8994_reg_write(struct wm8994 *wm8994, unsigned short reg,
|
|||
{
|
||||
int ret;
|
||||
|
||||
val = cpu_to_be16(val);
|
||||
|
||||
mutex_lock(&wm8994->io_lock);
|
||||
|
||||
ret = wm8994_write(wm8994, reg, 2, &val);
|
||||
|
@ -143,7 +143,7 @@ EXPORT_SYMBOL_GPL(wm8994_reg_write);
|
|||
* @wm8994: Device to write to
|
||||
* @reg: First register
|
||||
* @count: Number of registers
|
||||
* @buf: Buffer to write from.
|
||||
* @buf: Buffer to write from. Data must be big-endian formatted.
|
||||
*/
|
||||
int wm8994_bulk_write(struct wm8994 *wm8994, unsigned short reg,
|
||||
int count, u16 *buf)
|
||||
|
@ -183,6 +183,8 @@ int wm8994_set_bits(struct wm8994 *wm8994, unsigned short reg,
|
|||
r &= ~mask;
|
||||
r |= val;
|
||||
|
||||
r = cpu_to_be16(r);
|
||||
|
||||
ret = wm8994_write(wm8994, reg, 2, &r);
|
||||
|
||||
out:
|
||||
|
|
Loading…
Reference in New Issue