From 5a73882fd2c3a86b502d54da532d373a1f2db15e Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 2 Sep 2015 11:40:46 -0500 Subject: i2c: mux: reg Change ioread endianness for readback Reading the register (if allowed) after writing is to ensure writing is completed on a posted bus. The endianness of reading doesn't matter. Signed-off-by: York Sun Signed-off-by: Wolfram Sang --- drivers/i2c/muxes/i2c-mux-reg.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'drivers/i2c/muxes') diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c index 7913d80..5fbd5bd 100644 --- a/drivers/i2c/muxes/i2c-mux-reg.c +++ b/drivers/i2c/muxes/i2c-mux-reg.c @@ -31,28 +31,28 @@ static int i2c_mux_reg_set(const struct regmux *mux, unsigned int chan_id) if (!mux->data.reg) return -EINVAL; + /* + * Write to the register, followed by a read to ensure the write is + * completed on a "posted" bus, for example PCI or write buffers. + * The endianness of reading doesn't matter and the return data + * is not used. + */ switch (mux->data.reg_size) { case 4: - if (mux->data.little_endian) { + if (mux->data.little_endian) iowrite32(chan_id, mux->data.reg); - if (!mux->data.write_only) - ioread32(mux->data.reg); - } else { + else iowrite32be(chan_id, mux->data.reg); - if (!mux->data.write_only) - ioread32(mux->data.reg); - } + if (!mux->data.write_only) + ioread32(mux->data.reg); break; case 2: - if (mux->data.little_endian) { + if (mux->data.little_endian) iowrite16(chan_id, mux->data.reg); - if (!mux->data.write_only) - ioread16(mux->data.reg); - } else { + else iowrite16be(chan_id, mux->data.reg); - if (!mux->data.write_only) - ioread16be(mux->data.reg); - } + if (!mux->data.write_only) + ioread16(mux->data.reg); break; case 1: iowrite8(chan_id, mux->data.reg); -- cgit v1.1