diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2023-08-09 08:45:19 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2023-08-09 08:50:04 +0000 |
| commit | 393387820bae03c86420dbc33c6984cf7732c561 (patch) | |
| tree | a464bbf5a88ac2350b1acc3fea2296be20151e19 | |
| parent | 85e5480df95e6bca38910f44f6e9b4d7773904ed (diff) | |
| download | src-393387820bae03c86420dbc33c6984cf7732c561.tar.gz src-393387820bae03c86420dbc33c6984cf7732c561.zip | |
arm64: rockchip: rk_i2c: Probe again at ORDER_LATE
The gic driver is also probed at this pass and depending on the order of
the nodes in the dts rk_i2c can be probed first and will fail, this is the
case for the rk3328 SoC.
The PMIC drivers are also probed at this pass but on the iicbus which is created
in rk_i2c so there is no order conflict here.
Fixes: ddefad7c4f48 ("arm64: rockchip: Tweak i2c, pmic and iodomain order")
Sponsored by: Beckhoff Automation GmbH & Co. KG
| -rw-r--r-- | sys/arm64/rockchip/rk_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index b9f0fd592122..e3824ba843fe 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -727,8 +727,8 @@ static driver_t rk_i2c_driver = { }; EARLY_DRIVER_MODULE(rk_i2c, simplebus, rk_i2c_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk_i2c, iicbus, 1, 1, 1); MODULE_VERSION(rk_i2c, 1); |