The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c200441872e7e85e21d5d953bbfac87108edba88
commit c200441872e7e85e21d5d953bbfac87108edba88 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2021-11-14 12:48:10 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2021-11-14 12:48:10 +0000 pmic: rockchip: Name the driver rk80{5,8} And add the needed relationship with iicbus. --- sys/dev/iicbus/pmic/rockchip/rk805.c | 4 +++- sys/dev/iicbus/pmic/rockchip/rk808.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c index 9c072293d0f7..97559e2029c6 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk805.c +++ b/sys/dev/iicbus/pmic/rockchip/rk805.c @@ -187,12 +187,14 @@ static device_method_t rk805_methods[] = { DEVMETHOD_END }; -DEFINE_CLASS_1(iichb, rk805_driver, rk805_methods, +DEFINE_CLASS_1(rk805, rk805_driver, rk805_methods, sizeof(struct rk8xx_softc), rk8xx_driver); static devclass_t rk805_devclass; EARLY_DRIVER_MODULE(rk805, iicbus, rk805_driver, rk805_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); +EARLY_DRIVER_MODULE(iicbus, rk805, iicbus_driver, iicbus_devclass, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); MODULE_DEPEND(rk805, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(rk805, 1); diff --git a/sys/dev/iicbus/pmic/rockchip/rk808.c b/sys/dev/iicbus/pmic/rockchip/rk808.c index d82da20fa672..76aebd33b300 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk808.c +++ b/sys/dev/iicbus/pmic/rockchip/rk808.c @@ -262,12 +262,14 @@ static device_method_t rk808_methods[] = { DEVMETHOD_END }; -DEFINE_CLASS_1(iichb, rk808_driver, rk808_methods, +DEFINE_CLASS_1(rk808, rk808_driver, rk808_methods, sizeof(struct rk8xx_softc), rk8xx_driver); static devclass_t rk808_devclass; EARLY_DRIVER_MODULE(rk808, iicbus, rk808_driver, rk808_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); +EARLY_DRIVER_MODULE(iicbus, rk808, iicbus_driver, iicbus_devclass, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); MODULE_DEPEND(rk808, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(rk808, 1);
