From owner-dev-commits-src-all@freebsd.org Thu Jul 22 17:17:48 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D8AA66204E; Thu, 22 Jul 2021 17:17:48 +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 4GVzfh18Cjz4WQx; Thu, 22 Jul 2021 17:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0A31B15C2C; Thu, 22 Jul 2021 17:17:48 +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 16MHHlIR091769; Thu, 22 Jul 2021 17:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MHHlq5091768; Thu, 22 Jul 2021 17:17:47 GMT (envelope-from git) Date: Thu, 22 Jul 2021 17:17:47 GMT Message-Id: <202107221717.16MHHlq5091768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 07df8f4f9cba - stable/13 - arm64: rockchip: gpio: Give friendlier name to gpio 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 07df8f4f9cbaef43334423d9712740ea2073bb3b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 17:17:48 -0000 The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=07df8f4f9cbaef43334423d9712740ea2073bb3b commit 07df8f4f9cbaef43334423d9712740ea2073bb3b Author: Emmanuel Vadot AuthorDate: 2021-05-16 12:47:16 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-22 17:17:39 +0000 arm64: rockchip: gpio: Give friendlier name to gpio By default name the gpio P This make it easier to find the gpio when reading schematics or DTS. Sponsored by: Diablotin Systems Differential Revision: https://reviews.freebsd.org/D30287 (cherry picked from commit bc1bb80564eef66cef1a7b9791af87ae019aa71d) --- sys/arm64/rockchip/rk_gpio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index aa44a6bc9e09..d3623b2302ec 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -209,14 +209,17 @@ static int rk_gpio_pin_getname(device_t dev, uint32_t pin, char *name) { struct rk_gpio_softc *sc; + uint32_t bank; sc = device_get_softc(dev); if (pin >= 32) return (EINVAL); + bank = pin / 8; + pin = pin - (bank * 8); RK_GPIO_LOCK(sc); - snprintf(name, GPIOMAXNAME, "gpio%d", pin); + snprintf(name, GPIOMAXNAME, "P%c%d", bank + 'A', pin); RK_GPIO_UNLOCK(sc); return (0);