i2c: meson: Fix wrong speed use from probe

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit cb13aa16f34f794a9cee2626862af8a95f0f0ee9 ]

Having meson_i2c_set_clk_div after i2c_add_adapter
causes issues for client drivers that try to use
the bus before the requested speed is applied.

The bus can be used just after i2c_add_adapter, so
move i2c_add_adapter to the final step as
meson_i2c_set_clk_div needs to be called before
the bus is used.

Fixes: 09af1c2fa490 ("i2c: meson: set clock divider in probe instead of setting it for each transfer")
Signed-off-by: Lucas Tanure <tanure@linux.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 9b2bbf36b9cff18c4469c0f016b023adc27904d8)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index ef73a42577cc7b3cedff721df31b6c94f707f31c..07eb819072c4fdf44a2a570b08aded0ae83c02e4 100644 (file)
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -465,18 +465,18 @@ static int meson_i2c_probe(struct platform_device *pdev)
         */
        meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, 0);
 
-       ret = i2c_add_adapter(&i2c->adap);
-       if (ret < 0) {
-               clk_disable_unprepare(i2c->clk);
-               return ret;
-       }
-
        /* Disable filtering */
        meson_i2c_set_mask(i2c, REG_SLAVE_ADDR,
                           REG_SLV_SDA_FILTER | REG_SLV_SCL_FILTER, 0);
 
        meson_i2c_set_clk_div(i2c, timings.bus_freq_hz);
 
+       ret = i2c_add_adapter(&i2c->adap);
+       if (ret < 0) {
+               clk_disable_unprepare(i2c->clk);
+               return ret;
+       }
+
        return 0;
 }