From nobody Fri Nov 11 08:50:40 2022 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 4N7sqN5SWqz4ftcZ; Fri, 11 Nov 2022 08:50:40 +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 4N7sqN4qSdz4Ps1; Fri, 11 Nov 2022 08:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668156640; 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=X1i3cVU7BHd4KswAZURdesO6+907H4FFDexfrIr48gI=; b=Do3KV6X5+wh+XqcG0SQNXl+CHKJ5OfDSNF6FpedCmokpPuuDFQUos+Zl/mRS84MiKVjP9M UWC2jsCLdclAitQsqw1bvSddkUIMg0IDP0eFtxiGR6lRZmMpnUuaSAq8VNAfj7LvbpYe+O iGXO017pM/H1+dHqK3Hq6wYR3ahODyLMtV18DCLZ2DNHjPCijLJMH9OsJCD9Da5zjz04KN 7RMFquc4s2m63Ki7XJitjlCokzKrL+KkbLiKXLxtPzn+4EjW9cPpUV3BJzl326UGOiCNAN Kb9hGXXc4W6iEMifT1jlWVbTYkw3SOA8VXqoiLnOLVYfJyKYSOIx3S6k6A6y7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668156640; 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=X1i3cVU7BHd4KswAZURdesO6+907H4FFDexfrIr48gI=; b=NeX3eoQSuzCPu7KWQY26BfuClPMMZk007KLjkiNrL0Iy6qPlG5P4PQ1K5I2KrWZCmUhPNP PDS/DBVgslXaN3K+IPRy1BpxewOk8udPHtZ+SOFn3q1sEvUB9W+2te5sFEt/glMFo61yb2 dbFAOu+uFNJo/8eXO3hb232arKQIU+VYKF15eY9CI0xD+3HU/EIHuNm/+UcVgaLTBEDZyn WCKOJBCLDkmoUzmv5mDQxM7KT8Pd1jUxo5ywUzkoDsurm1qmOSyKYwr6TEhrLIIQbkmwMU 7+zEO887EkONmYQPtTo3h6FeyJ8iiZ1zFqEJYHqIpqH0vQ/03riez+9Ue2/alg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668156640; a=rsa-sha256; cv=none; b=pwUTqQGJTcTDwdHvUHWKJO6Cxzpwe9EGM4tkdCdSbg/SCDymQzohlU03WFZRrA2p6qAqxV zWu49oL/Zmp6tYJRRA8IvRWqlr28nkVmjOrpFDgvX92GwC/J6+C2/Ofz5xcg3pU4h11rtf hj7DSyfVfmUBA+Q2wfcwfYtZoGexgRp/uPH7wPQoFBWvr3T+/gI4esZbwD/wKlUTDQz/+1 DyTA6MV+J2aEy+Nw/bnb6xwCvi32HEJGAR1iPJwxd+ABcnuTjQ1v/oiAJlpRrDJp3ACW2c Zs/RSXxvQBSvV5u6wDij1numdOcOSfWr1tH23uJu+QvIIiTtO6njrYJAfxeKVA== 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 4N7sqN3vNxzZyP; Fri, 11 Nov 2022 08:50:40 +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 2AB8oe4A061876; Fri, 11 Nov 2022 08:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AB8oeWc061875; Fri, 11 Nov 2022 08:50:40 GMT (envelope-from git) Date: Fri, 11 Nov 2022 08:50:40 GMT Message-Id: <202211110850.2AB8oeWc061875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9142f3a8852c - main - Fix a rk356x pinctrl register offset 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9142f3a8852c2e75ebf8cf227c85a005a017eaae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9142f3a8852c2e75ebf8cf227c85a005a017eaae commit 9142f3a8852c2e75ebf8cf227c85a005a017eaae Author: Andrew Turner AuthorDate: 2022-11-11 08:25:57 +0000 Commit: Andrew Turner CommitDate: 2022-11-11 08:34:48 +0000 Fix a rk356x pinctrl register offset The pull-up/pull-down register offset was wrong on the Rockchip rk356x. It was set such that the driver would modify the IOMUX control registers. This seems to work with the current device tree files, but fails with upstream files. Fix the offset so the later calculation has the correct offset for the pull-up/pull-down control register. Sponsored by: The FreeBSD Foundation --- sys/arm64/rockchip/rk_pinctrl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index c158de40dca5..db002927fc9c 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -929,7 +929,14 @@ static uint32_t rk3568_get_pd_offset(struct rk_pinctrl_softc *sc, uint32_t bank) { - return (0); + if (bank == 0) + return (0x20); + + /* + * Registers start at 0x80, but bank index starts at 1. Return 0x70 + * so later calculations get the correct offset. + */ + return (0x70); } static struct syscon *