From nobody Wed Dec 28 03:01:17 2022 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 4NhbrY6P0cz2kcPG; Wed, 28 Dec 2022 03:01:17 +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 4NhbrY4yZhz3hjR; Wed, 28 Dec 2022 03:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672196477; 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=QRFoKZAA9/ag80bJdt6+m1a5/fjsltWOUBXMg3zINfc=; b=gRWAcqeH0FIgPbhIELXQ77BOAb8J5c4N/oo6Yvy8WlU80qH9Mf/2SGWVP3Ax7IBzqtzUEk tXu2c8dn4LfxnkGtgXzpEwEK9hLk2WP94AzpoifuNnkt3LWsMYvb+w5cbqTzrHjAZ7yRz/ SO735OoUfNbrH1zLlmhz+ZHHASh31tIXsk3pEEXsfmaYttv94kykIjJWQ7/W3L1douwhDV 7AK4rYBvVlBzhg4qF53gqGFtGeNJY2wIMmfffnHhlfM2L+tNZT5vMMd24gfpndw1B01uAv mG5RrzANI4/bxsO4Lals+35HHVbZSAz96g0wPdd7DMgqpiEjstU1X1jeDgY2lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672196477; 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=QRFoKZAA9/ag80bJdt6+m1a5/fjsltWOUBXMg3zINfc=; b=pfuchwc4Tn4acaTIraeZrjvWE0rl93fBgCG4vpzyMJekoPZutuz1lp5hshm1kg9mvi7OgA nDti/LRrFlxyimUKyenIx2d+oXbGW3Wz3bqYrzd/MuLgDRN5b4gi2obQpk+2BYVXeL30rL PlecnA8GVBub6RPX3d/qdU4uoBhyCBlDUgevMwO2rmMCip+PQZ4x7xOK4SosLUvdueMU5Q SO+MIeuaCnVoCmftSKPvZRTPZHe3niSu5uTGVj+wyiX6zT69fZSDcOKFin/jm5xi1EFFm2 nQdxHjt7OuLutEwclIalDlo2JmsgPRiSeIZeazmq0c8n4VjNODkglXgEcpIGhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672196477; a=rsa-sha256; cv=none; b=CKaWgYMkx5jfBh5o3M2g6YOXhKHWy1zYINgxIb+v0n3uuwtwa/RphYRo7/RjPWKOZaaot1 +oOZCrpeZW1LgkYDAkPgcquTqgb7NaD+b/gNprTrY4nl42pVqhmLBZyQ8U4ecKT0t2U5z/ LkHSyZA0ZQ8QuAgBzVdJqy+5x6OVugM9kOK6/AEOu7oAwEMOK3Iwtyw02maBYHo4A6eIq+ hiXT92cJjy9sOUHVd6j65DMoVSKr+DAgDvXwwPTWG4mMgM7DIr+kIhTzKOKOfs9nODsNMN muslqVg7PSe2Yr6K1NkYP0oxcO4NCJc7veRCvpCgiqh4KGSjrflTlyjTOsv1MA== 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 4NhbrY44FgzZM0; Wed, 28 Dec 2022 03:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BS31HM8039690; Wed, 28 Dec 2022 03:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BS31HQa039689; Wed, 28 Dec 2022 03:01:17 GMT (envelope-from git) Date: Wed, 28 Dec 2022 03:01:17 GMT Message-Id: <202212280301.2BS31HQa039689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ganbold Tsagaankhuu Subject: git: 355cb40c3a87 - main - Set RK3568 specific pin mux for GMAC1. 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: ganbold X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 355cb40c3a87e80b04b0cce15f4bad9337995ad1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ganbold: URL: https://cgit.FreeBSD.org/src/commit/?id=355cb40c3a87e80b04b0cce15f4bad9337995ad1 commit 355cb40c3a87e80b04b0cce15f4bad9337995ad1 Author: Søren Schmidt AuthorDate: 2022-12-28 03:00:19 +0000 Commit: Ganbold Tsagaankhuu CommitDate: 2022-12-28 03:00:19 +0000 Set RK3568 specific pin mux for GMAC1. --- sys/arm64/rockchip/rk_pinctrl.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index db002927fc9c..2e1fe5f41bb4 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -767,6 +767,10 @@ struct rk_pinctrl_conf rk3399_conf = { .get_bias_value = rk3399_get_bias_value, }; +#define GRF_IOFUNC_SEL0 0x0300 +#define GMAC1_IOMUX_SEL_M0 0x01000000 +#define GMAC1_IOMUX_SEL_M1 0x01000100 + static struct rk_pinctrl_gpio rk3568_gpio_bank[] = { RK_GPIO(0, "gpio0"), RK_GPIO(1, "gpio1"), @@ -1239,6 +1243,17 @@ rk_pinctrl_configure_pin(struct rk_pinctrl_softc *sc, uint32_t *pindata) * without hi-word write mask. */ SYSCON_MODIFY_4(syscon, reg, mask, function << bit | (mask << 16)); + + /* RK3568 specific pin mux for various functionalities */ + if (ofw_bus_node_is_compatible(ofw_bus_get_node(sc->dev), + "rockchip,rk3568-pinctrl")) { + if (bank == 3 && pin == 9 && function == 3) + SYSCON_WRITE_4(sc->grf, + GRF_IOFUNC_SEL0, GMAC1_IOMUX_SEL_M0); + if (bank == 4 && pin == 7 && function == 3) + SYSCON_WRITE_4(sc->grf, + GRF_IOFUNC_SEL0, GMAC1_IOMUX_SEL_M1); + } } static int