From patchwork Thu Jun 23 16:08:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 584414 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 712C7C433EF for ; Thu, 23 Jun 2022 16:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232185AbiFWQI3 (ORCPT ); Thu, 23 Jun 2022 12:08:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232195AbiFWQIU (ORCPT ); Thu, 23 Jun 2022 12:08:20 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6897024BCC; Thu, 23 Jun 2022 09:08:07 -0700 (PDT) Received: from jupiter.universe (unknown [95.33.159.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id E8ADA66017E7; Thu, 23 Jun 2022 17:08:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1656000486; bh=q9J33uYPMktafJTb3YVjGjiU6bVVAfRG+db8e8nmGWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBy7YqTN+y0phIUnivdmJNn1dKIayjp5GUlSvaXQASq8DDB1kyBW5YCTft3DcLwzC +xo4ilHmK6cNPoQOqG5GwE4BG7bAHITJt0/o/tQLuVsMEiv+1h/EvQ9Xsu+Xv6ET/i pbQxIA/RnzbRZe6UPc6RO88D5WGc1xmlF5Sfrom05ZrAGs3/OUrLMYZgNupIFlLaDV A+FjJmhrTS/ZiivTiqnB+zeJl0qdeOEklmm5LOwecGxcGFDDU2odlBQ8ijb7gLzweJ EUV9Sa3CBKdNXgREil09hpfUDOEgNX6Q1RRytOY4B908EyP0hueJMr37AxtthxhUrP zGKO3n4oDG0sg== Received: by jupiter.universe (Postfix, from userid 1000) id 9E59A480125; Thu, 23 Jun 2022 18:08:03 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, Sebastian Reichel , kernel@collabora.com, Rob Herring Subject: [PATCH 1/2] dt-bindings: gpio: rockchip: add gpio-ranges Date: Thu, 23 Jun 2022 18:08:00 +0200 Message-Id: <20220623160801.240779-2-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220623160801.240779-1-sebastian.reichel@collabora.com> References: <20220623160801.240779-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Allow usage of gpio-ranges with the rockchip gpio controller. The driver already had support for this since it has been added to the mainline kernel in the first place. Acked-by: Rob Herring Signed-off-by: Sebastian Reichel Reviewed-by: Heiko Stuebner --- Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml b/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml index d4e42c2b995b..affd823c881d 100644 --- a/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml +++ b/Documentation/devicetree/bindings/gpio/rockchip,gpio-bank.yaml @@ -27,6 +27,8 @@ properties: - description: APB interface clock source - description: GPIO debounce reference clock source + gpio-ranges: true + gpio-controller: true gpio-line-names: true From patchwork Thu Jun 23 16:08:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 584413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AA91CCA482 for ; Thu, 23 Jun 2022 16:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232224AbiFWQIb (ORCPT ); Thu, 23 Jun 2022 12:08:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232149AbiFWQIV (ORCPT ); Thu, 23 Jun 2022 12:08:21 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6870F240A8; Thu, 23 Jun 2022 09:08:07 -0700 (PDT) Received: from jupiter.universe (unknown [95.33.159.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id F3DC166017E5; Thu, 23 Jun 2022 17:08:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1656000486; bh=w0CRHYNz9iSBQk/+ZmhinMEi7N+ofG9zMh6LCsa2h/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GgZqJNr0RkGxv+a+WG1xxHLCKnWgSRZb+NUCkJnJqjl1fE2TOZxa4wGdug6BqOtIS 6XRyVMG6SbA3FBygJeWidqqEXerGsrSRQpZBLh9udZXwtcj4G0Xn10KwUNWyNtph3P f8z1uxkhdRYtc57J+CsbQu6EYQSaZkdyAiSyqAk0EFZ5szb3YjySKc9ybHvQSwprq9 hWAmRhk0gb3P8EFxnjv9CQK0zMIBuHkD4j55l5+nI2HVbjLiGDaZUWkUF1l+O60Vh2 JaqEONWHzX8ea2UR2XM4i1LZ3e9mHg5RMB2DSPGA9X4GRGxhlJEzOen3LaMYDgVKVq ZxYJVjcpt2wEA== Received: by jupiter.universe (Postfix, from userid 1000) id A1499480126; Thu, 23 Jun 2022 18:08:03 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Linus Walleij , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, Jianqun Xu , kernel@collabora.com, Sebastian Reichel Subject: [PATCH 2/2] gpio: rockchip: add support for rk3588 Date: Thu, 23 Jun 2022 18:08:01 +0200 Message-Id: <20220623160801.240779-3-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220623160801.240779-1-sebastian.reichel@collabora.com> References: <20220623160801.240779-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Jianqun Xu Add V2.1 rockchip gpio controller type, which is part of the RK3588 SoC. Signed-off-by: Jianqun Xu Reviewed-by: Linus Walleij Signed-off-by: Sebastian Reichel --- drivers/gpio/gpio-rockchip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c index e342a6dc4c6c..f91e876fd969 100644 --- a/drivers/gpio/gpio-rockchip.c +++ b/drivers/gpio/gpio-rockchip.c @@ -27,6 +27,7 @@ #define GPIO_TYPE_V1 (0) /* GPIO Version ID reserved */ #define GPIO_TYPE_V2 (0x01000C2B) /* GPIO Version ID 0x01000C2B */ +#define GPIO_TYPE_V2_1 (0x0101157C) /* GPIO Version ID 0x0101157C */ static const struct rockchip_gpio_regs gpio_regs_v1 = { .port_dr = 0x00, @@ -664,7 +665,7 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank) id = readl(bank->reg_base + gpio_regs_v2.version_id); /* If not gpio v2, that is default to v1. */ - if (id == GPIO_TYPE_V2) { + if (id == GPIO_TYPE_V2 || id == GPIO_TYPE_V2_1) { bank->gpio_regs = &gpio_regs_v2; bank->gpio_type = GPIO_TYPE_V2; bank->db_clk = of_clk_get(bank->of_node, 1);