spmi: msm: fix version 5 support

Properly use ch_offset in msm_spmi_write() reg access.

Fixes: f5a2d6b4b03 ("spmi: msm: add arbiter version 5 support")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Caleb Connolly <caleb.connolly@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c
index 5fe8a70abca7891d089ab212f05c1ffdea1c4ba5..97383d8c7b8e43273a7546af5094f4770653c051 100644 (file)
--- a/drivers/spmi/spmi-msm.c
+++ b/drivers/spmi/spmi-msm.c
@@ -93,12 +93,16 @@ static int msm_spmi_write(struct udevice *dev, int usid, int pid, int off,
 
        channel = priv->channel_map[usid][pid];
 
+       if (priv->arb_ver == V5)
+               ch_offset = SPMI_V5_RW_CH_OFFSET(channel);
+       else
+               ch_offset = SPMI_CH_OFFSET(channel);
+
        /* Disable IRQ mode for the current channel*/
-       writel(0x0,
-              priv->spmi_chnls + SPMI_CH_OFFSET(channel) + SPMI_REG_CONFIG);
+       writel(0x0, priv->spmi_chnls + ch_offset + SPMI_REG_CONFIG);
 
        /* Write single byte */
-       writel(val, priv->spmi_chnls + SPMI_CH_OFFSET(channel) + SPMI_REG_WDATA);
+       writel(val, priv->spmi_chnls + ch_offset + SPMI_REG_WDATA);
 
        /* Prepare write command */
        reg |= SPMI_CMD_EXT_REG_WRITE_LONG << SPMI_CMD_OPCODE_SHIFT;
@@ -107,18 +111,13 @@ static int msm_spmi_write(struct udevice *dev, int usid, int pid, int off,
        reg |= (off << SPMI_CMD_ADDR_OFFSET_SHIFT);
        reg |= 1; /* byte count */
 
-       if (priv->arb_ver == V5)
-               ch_offset = SPMI_V5_RW_CH_OFFSET(channel);
-       else
-               ch_offset = SPMI_CH_OFFSET(channel);
-
        /* Send write command */
-       writel(reg, priv->spmi_chnls + SPMI_CH_OFFSET(channel) + SPMI_REG_CMD0);
+       writel(reg, priv->spmi_chnls + ch_offset + SPMI_REG_CMD0);
 
        /* Wait till CMD DONE status */
        reg = 0;
        while (!reg) {
-               reg = readl(priv->spmi_chnls + SPMI_CH_OFFSET(channel) +
+               reg = readl(priv->spmi_chnls + ch_offset +
                            SPMI_REG_STATUS);
        }