From nobody Tue Aug 08 13:59:12 2023 X-Original-To: dev-commits-src-all@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 4RKvtn0LL0z4mNVL; Tue, 8 Aug 2023 13:59:13 +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 4RKvtm6R22z3Mj6; Tue, 8 Aug 2023 13:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691503152; 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=B0sJ6++7b92ttyOSIXCVhn0+o6ZD3aIoiconx4bbxeg=; b=n26gsR0PivjOyMPd0qXt+AuXRwbMP8xAAtH20xKd6U3VDwC/MHc7TJTKnik2jfHEikeuhY Fehbg8i126qKDcA5l3/+c34UEoughqJecWD0DdshejuDKHWY3djObbEqz4Q9VsGZSQEm1W v3FfYWejQ/gfg7lUHQ5a+Iab0+sWv7sd3Bss9vFGdxFp4FHz3p81EhmELeZvOt5K9QuJWW QSwFaglZAoodJ4a0YM0lr+4ZrAyEtN7WSNanXCdFCGdDQplP36IOrUwMvA/V+vu5kxifvk UdsmXvyg7YpUkmOAOe6142cgsMocLa/Qnr0f8aRd0LwCRxU9hn3pQh6LwO2DQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691503152; 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=B0sJ6++7b92ttyOSIXCVhn0+o6ZD3aIoiconx4bbxeg=; b=suOagOQYe4YQxR9JYQVbTaOPfvB7dNjrZOs9gQPvXlHiY+2E7BAlmfC9dzruBQgV/6ew5I ryBbJATikcg/SaZpXY1x3vS3rzamgoZCLkK3ogSfGQMP4FAbDOaLULb3nXws7+j1Bx0h1x Ehw6EGAok9m/WbjKs4yvayHsxODNkvkkQCcfFj6Ls7SY4KCXtZZjDDG1PXpx2TdmTOnVbq pTcNdvUi6sCQkxBBR4rJA0xqN1t7WCpW6crlOXtt1y39e23VpK708Nih8fUscv5j6ADTRS w3RET7co7iDihUJLSMBRXdC3URPgjFIkKHgUoJ5NyfHtp1l4PGVsu38eQJt68g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691503152; a=rsa-sha256; cv=none; b=ea2X5ygP1XV4FQtA0H4iM4aTfgjiNxlG6SXpzMtjx0dP/p+6aEbK0PwFYz1Sp8oov9oZH6 6tLSF0o60NfgQkZuKSWdXTar8eZ2VyHzRCN97b/QtDO/GrIeuo6x5Pn5elGF2ryCV830M8 GQEbkRhCrm3Ba8yaj6NWiGBxFc/6DCs6HnPbsdF4Dd/BV6ddEpSg//s9KqtFHZ5RdaZFna S34ejLDy1LcxyL/kCExn8Ep9KCWIhhsbv0yk3IVg4IVtAu4aET35EhWm9NTACHmxsirU7U pofqxMTH6ylu3plJ16UDa4M8jVJ0UzjEjJiD2rkRcpC9/O5aVvOQZWwMznlpLQ== 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 4RKvtm5M0Lzcdl; Tue, 8 Aug 2023 13:59:12 +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 378DxCDj074268; Tue, 8 Aug 2023 13:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378DxCEu074267; Tue, 8 Aug 2023 13:59:12 GMT (envelope-from git) Date: Tue, 8 Aug 2023 13:59:12 GMT Message-Id: <202308081359.378DxCEu074267@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: ddefad7c4f48 - main - arm64: rockchip: Tweak i2c, pmic and iodomain order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ddefad7c4f48e5107aec1e92db620196c0d04101 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ddefad7c4f48e5107aec1e92db620196c0d04101 commit ddefad7c4f48e5107aec1e92db620196c0d04101 Author: Emmanuel Vadot AuthorDate: 2023-08-08 13:24:33 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-08 13:58:26 +0000 arm64: rockchip: Tweak i2c, pmic and iodomain order We need i2c first to set it to MIDDLE, then we need one of the pmics so set them to LATE, only then we can attach iodomain which needs some regulators exposed by the pmic so set it to LAST. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/arm64/rockchip/rk_i2c.c | 4 ++-- sys/arm64/rockchip/rk_iodomain.c | 2 +- sys/dev/iicbus/pmic/rockchip/rk805.c | 4 ++-- sys/dev/iicbus/pmic/rockchip/rk808.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index e3824ba843fe..b9f0fd592122 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_LATE); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(rk_i2c, iicbus, 1, 1, 1); MODULE_VERSION(rk_i2c, 1); diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c index 2bbd1e49586b..3b85192eb333 100644 --- a/sys/arm64/rockchip/rk_iodomain.c +++ b/sys/arm64/rockchip/rk_iodomain.c @@ -301,4 +301,4 @@ static driver_t rk_iodomain_driver = { }; EARLY_DRIVER_MODULE(rk_iodomain, simplebus, rk_iodomain_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); diff --git a/sys/dev/iicbus/pmic/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c index 4ba4ca666103..9910515412a3 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk805.c +++ b/sys/dev/iicbus/pmic/rockchip/rk805.c @@ -193,8 +193,8 @@ DEFINE_CLASS_1(rk805_pmu, rk805_driver, rk805_methods, sizeof(struct rk8xx_softc), rk8xx_driver); EARLY_DRIVER_MODULE(rk805_pmu, iicbus, rk805_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(iicbus, rk805_pmu, iicbus_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk805_pmu, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(rk805_pmu, 1); diff --git a/sys/dev/iicbus/pmic/rockchip/rk808.c b/sys/dev/iicbus/pmic/rockchip/rk808.c index 13ba44158447..f6797fe4bf57 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk808.c +++ b/sys/dev/iicbus/pmic/rockchip/rk808.c @@ -268,8 +268,8 @@ DEFINE_CLASS_1(rk808_pmu, rk808_driver, rk808_methods, sizeof(struct rk8xx_softc), rk8xx_driver); EARLY_DRIVER_MODULE(rk808_pmu, iicbus, rk808_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(iicbus, rk808_pmu, iicbus_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk808_pmu, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(rk808_pmu, 1);