Commit cb13aa16 authored by Lucas Tanure's avatar Lucas Tanure Committed by Wolfram Sang
Browse files

i2c: meson: Fix wrong speed use from probe 



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: 09af1c2f ("i2c: meson: set clock divider in probe instead of setting it for each transfer")
Signed-off-by: default avatarLucas Tanure <tanure@linux.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent d714fb25

drivers/i2c/busses/i2c-meson.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

}