From nobody Wed Aug 09 08:50:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLNzx3MCKz4mQrJ; Wed, 9 Aug 2023 08:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLNzx0YXhz4dqg; Wed, 9 Aug 2023 08:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691571021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/apLPGkdFGIgXOYTMNO8d83WWvFjppI36ywHJfSg9I=; b=mlwcbsn8eIrxV5qNTSAjhyQoPyhv9b6G0b+QbJe2CmVLy31XL7rqVF0c/H+eY3X0Q+/nAc TVT7TKlZwTDT4X0KKVKR0kXNgBTp1yWxg9MwlAYRItOPzn6GGDchHb2FwKfcvKns+8bbmn gwzFYwYgBeZoHtDhet9m7FF8VO8icnq3V1R+Gf7PHorOZmaLshYu5XLRVh8nC/A0dVv5w5 kgCI6yPT928mQwu9KawZI/eqMy7NFxyd3xbaAvrKYlN7kYgUR8vBhOifXFavvId/Y3BpAh pB+iGo9Qiiw16WnwkXuicIHR6OSM/jh753/lyq0dF0YStpkSpyiSDJJNmgOdBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691571021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/apLPGkdFGIgXOYTMNO8d83WWvFjppI36ywHJfSg9I=; b=s/1WvGuOQVg3NddwUKHAob9xCAX+eg+YqLUfu8LtKe2HB4q1mIhUI4JlNuFn5zQWZ8H6qf ooFUr1DkVMFLlGVi03rpMR3hS8qnHmzKPStJ3VJ8E15qEFRVVALep2BwijSmfO6djrglsq hoVw3G6GM/RcYYj0xwu53ixK5EWXAo4HQkewvi2vDPwkhczMVT8zug/ULobwrlALzrNADO hrghxOL+QSEEzQCVIrdXgC592WuYHYxAVXL/0GJ7YGxdg+TUmhfBtSdtsQZyXFVHeSJTIn u5plGvMQwt+4F1Druczfdyblmy/iLM12QnJqKwfzADlokIRB27T6VIY8KLH4WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691571021; a=rsa-sha256; cv=none; b=IS/ZO7ue/9ogmBw5XriYaMUiGlg3xaHnEkfQVBJfD2t9rrMKPtVqrCKO/OYkmC6KXsSnlt NHPhC9occdNvz1CqVpFfA29A3EoZb/k1ZjHUKenB9oIW6n5J/9IGScxU5WysKroTovF0EB NWMqfiJl/fGQiuiDDpeTfNHExe9NvefMsMhRqAsdBokkeeZ6Tcr9TWUbkB3nfHt9J42NYa 4rlgv68agajqbenCbxU1QNRkMfpncvREACtakAb/MPiWhv68mpupmaowc3rA4uL1alWUE1 GgpW51EHuc3HYRRXFlnTOlrQ8mny9QGVDWsOzSGY/uJySLFlV/BrVu5Syj545A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLNzw6kcgz188k; Wed, 9 Aug 2023 08:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3798oKOc065096; Wed, 9 Aug 2023 08:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3798oKD9065093; Wed, 9 Aug 2023 08:50:20 GMT (envelope-from git) Date: Wed, 9 Aug 2023 08:50:20 GMT Message-Id: <202308090850.3798oKD9065093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 393387820bae - main - arm64: rockchip: rk_i2c: Probe again at ORDER_LATE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 393387820bae03c86420dbc33c6984cf7732c561 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=393387820bae03c86420dbc33c6984cf7732c561 commit 393387820bae03c86420dbc33c6984cf7732c561 Author: Emmanuel Vadot AuthorDate: 2023-08-09 08:45:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 08:50:04 +0000 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 --- sys/arm64/rockchip/rk_i2c.c | 4 ++-- 1 file 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);