From: Kever Yang <kever.yang@rock-chips.com>
To: Jonas Karlman <jonas@kwiboo.se>, Simon Glass <sjg@chromium.org>,
Philipp Tomsich <philipp.tomsich@vrull.eu>,
Tom Rini <trini@konsulko.com>
Cc: u-boot@lists.denx.de, Johan Jonker <jbx6244@gmail.com>
Subject: Re: [PATCH v2 09/10] rockchip: gpio: Add gpio-ranges props
Date: Fri, 9 Aug 2024 17:38:23 +0800 [thread overview]
Message-ID: <1cd6b2e5-e63c-40bd-b165-cf43c7d443c1@rock-chips.com> (raw)
In-Reply-To: <20240802225705.2640999-10-jonas@kwiboo.se>
On 2024/8/3 06:56, Jonas Karlman wrote:
> Add gpio-ranges props to supported SoCs based on the following Linux
> patches:
>
> ARM: dts: rockchip: add gpio-ranges property to gpio nodes
> https://lore.kernel.org/all/26007385-81dc-9961-05d5-8b9a0969d0b6@gmail.com/
>
> arm64: dts: rockchip: add gpio-ranges property to gpio nodes
> https://lore.kernel.org/all/18c8c89a-9962-40f0-814f-81e2c420c957@gmail.com/
>
> For RK3066 and RK3288 the gpio-ranges props is adjusted to match
> https://lore.kernel.org/all/541b7633-af3b-4392-ac29-7ee1f2c6f943@kwiboo.se/
>
> Re-enable gpio6 on RK3066 now that the pinctrl pin offset is used with
> get_gpio_mux().
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> v2: Collect r-b tag
>
> Cc: Johan Jonker <jbx6244@gmail.com>
> ---
> arch/arm/dts/rk3036-u-boot.dtsi | 12 ++++++++++++
> arch/arm/dts/rk3066a-u-boot.dtsi | 3 +--
> arch/arm/dts/rk3128-u-boot.dtsi | 16 ++++++++++++++++
> arch/arm/dts/rk322x-u-boot.dtsi | 16 ++++++++++++++++
> arch/arm/dts/rk3288-u-boot.dtsi | 33 ++++++++++++++++++++++++++++++++
> arch/arm/dts/rk3308-u-boot.dtsi | 20 +++++++++++++++++++
> arch/arm/dts/rk3328-u-boot.dtsi | 13 +++++++++++++
> arch/arm/dts/rk3368-u-boot.dtsi | 16 ++++++++++++++++
> arch/arm/dts/rk3399-u-boot.dtsi | 20 +++++++++++++++++++
> arch/arm/dts/rv1108-u-boot.dtsi | 16 ++++++++++++++++
> arch/arm/dts/rv1126-u-boot.dtsi | 14 ++++++++++++++
> 11 files changed, 177 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3036-u-boot.dtsi b/arch/arm/dts/rk3036-u-boot.dtsi
> index 41ac054b81e8..3e788187f630 100644
> --- a/arch/arm/dts/rk3036-u-boot.dtsi
> +++ b/arch/arm/dts/rk3036-u-boot.dtsi
> @@ -4,3 +4,15 @@
> */
>
> #include "rockchip-u-boot.dtsi"
> +
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> diff --git a/arch/arm/dts/rk3066a-u-boot.dtsi b/arch/arm/dts/rk3066a-u-boot.dtsi
> index 06f405ca2c5e..35b52d6fb7f3 100644
> --- a/arch/arm/dts/rk3066a-u-boot.dtsi
> +++ b/arch/arm/dts/rk3066a-u-boot.dtsi
> @@ -24,6 +24,5 @@
> };
>
> &gpio6 {
> - status = "disabled";
> + gpio-ranges = <&pinctrl 0 160 16>;
> };
> -
> diff --git a/arch/arm/dts/rk3128-u-boot.dtsi b/arch/arm/dts/rk3128-u-boot.dtsi
> index 6d1965e6b520..dd1208e7cf40 100644
> --- a/arch/arm/dts/rk3128-u-boot.dtsi
> +++ b/arch/arm/dts/rk3128-u-boot.dtsi
> @@ -14,6 +14,22 @@
> bootph-all;
> };
>
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> +
> &grf {
> bootph-all;
> };
> diff --git a/arch/arm/dts/rk322x-u-boot.dtsi b/arch/arm/dts/rk322x-u-boot.dtsi
> index aea917544b1c..f0e2a1f95aa0 100644
> --- a/arch/arm/dts/rk322x-u-boot.dtsi
> +++ b/arch/arm/dts/rk322x-u-boot.dtsi
> @@ -47,6 +47,22 @@
> max-frequency = <150000000>;
> };
>
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> +
> &grf {
> bootph-all;
> };
> diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
> index a43d320ade7b..0f8053a8b690 100644
> --- a/arch/arm/dts/rk3288-u-boot.dtsi
> +++ b/arch/arm/dts/rk3288-u-boot.dtsi
> @@ -95,8 +95,41 @@
> clock-names = "clk_edp", "clk_edp_24m", "pclk_edp";
> };
>
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 24>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 24 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 56 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 88 32>;
> +};
> +
> +&gpio4 {
> + gpio-ranges = <&pinctrl 0 120 32>;
> +};
> +
> +&gpio5 {
> + gpio-ranges = <&pinctrl 0 152 32>;
> +};
> +
> +&gpio6 {
> + gpio-ranges = <&pinctrl 0 184 32>;
> +};
> +
> &gpio7 {
> bootph-all;
> + gpio-ranges = <&pinctrl 0 216 32>;
> +};
> +
> +&gpio8 {
> + gpio-ranges = <&pinctrl 0 248 16>;
> };
>
> &grf {
> diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi
> index b7964e2756f3..c2d56b532f80 100644
> --- a/arch/arm/dts/rk3308-u-boot.dtsi
> +++ b/arch/arm/dts/rk3308-u-boot.dtsi
> @@ -54,6 +54,26 @@
> bootph-some-ram;
> };
>
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> +
> +&gpio4 {
> + gpio-ranges = <&pinctrl 0 128 32>;
> +};
> +
> &grf {
> bootph-all;
> };
> diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
> index 0135bc08d491..3bc776146a82 100644
> --- a/arch/arm/dts/rk3328-u-boot.dtsi
> +++ b/arch/arm/dts/rk3328-u-boot.dtsi
> @@ -57,6 +57,19 @@
>
> &gpio0 {
> bootph-pre-ram;
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> };
>
> &grf {
> diff --git a/arch/arm/dts/rk3368-u-boot.dtsi b/arch/arm/dts/rk3368-u-boot.dtsi
> index 811d59ac346e..be2ebda83529 100644
> --- a/arch/arm/dts/rk3368-u-boot.dtsi
> +++ b/arch/arm/dts/rk3368-u-boot.dtsi
> @@ -26,3 +26,19 @@
> reg = <0x0 0xff740000 0x0 0x1000>;
> };
> };
> +
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index c4c8bb1401ea..cead23ea7c20 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -91,6 +91,26 @@
> bootph-some-ram;
> };
>
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> +
> +&gpio4 {
> + gpio-ranges = <&pinctrl 0 128 32>;
> +};
> +
> &grf {
> bootph-all;
> };
> diff --git a/arch/arm/dts/rv1108-u-boot.dtsi b/arch/arm/dts/rv1108-u-boot.dtsi
> index ccf2d8bd83ec..f772d618bd1d 100644
> --- a/arch/arm/dts/rv1108-u-boot.dtsi
> +++ b/arch/arm/dts/rv1108-u-boot.dtsi
> @@ -5,6 +5,22 @@
>
> #include "rockchip-u-boot.dtsi"
>
> +&gpio0 {
> + gpio-ranges = <&pinctrl 0 0 32>;
> +};
> +
> +&gpio1 {
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> +
> &grf {
> bootph-all;
> };
> diff --git a/arch/arm/dts/rv1126-u-boot.dtsi b/arch/arm/dts/rv1126-u-boot.dtsi
> index 448598013578..3e6df1e433db 100644
> --- a/arch/arm/dts/rv1126-u-boot.dtsi
> +++ b/arch/arm/dts/rv1126-u-boot.dtsi
> @@ -31,10 +31,24 @@
>
> &gpio0 {
> bootph-pre-ram;
> + gpio-ranges = <&pinctrl 0 0 32>;
> };
>
> &gpio1 {
> bootph-pre-ram;
> + gpio-ranges = <&pinctrl 0 32 32>;
> +};
> +
> +&gpio2 {
> + gpio-ranges = <&pinctrl 0 64 32>;
> +};
> +
> +&gpio3 {
> + gpio-ranges = <&pinctrl 0 96 32>;
> +};
> +
> +&gpio4 {
> + gpio-ranges = <&pinctrl 0 128 2>;
> };
>
> &grf {
next prev parent reply other threads:[~2024-08-09 9:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-02 22:56 [PATCH v2 00/10] rockchip: pinctrl: Add support for pinmux status cmd Jonas Karlman
2024-08-02 22:56 ` [PATCH v2 01/10] pinctrl: rockchip: Use syscon_regmap_lookup_by_phandle() Jonas Karlman
2024-08-06 15:12 ` Quentin Schulz
2024-08-02 22:56 ` [PATCH v2 02/10] pinctrl: rockchip: Add a pin_to_bank() helper Jonas Karlman
2024-08-06 15:36 ` Quentin Schulz
2024-08-09 9:35 ` Kever Yang
2024-08-02 22:56 ` [PATCH v2 03/10] pinctrl: rockchip: Update get_gpio_mux() ops Jonas Karlman
2024-08-02 22:56 ` [PATCH v2 04/10] pinctrl: rockchip: Add pinmux status related ops Jonas Karlman
2024-08-07 9:20 ` Quentin Schulz
2024-08-02 22:56 ` [PATCH v2 05/10] pinctrl: rockchip: Add gpio_request_enable() ops Jonas Karlman
2024-08-07 9:25 ` Quentin Schulz
2024-08-09 9:37 ` Kever Yang
2024-08-02 22:56 ` [PATCH v2 06/10] gpio: rockchip: Get pinctrl device from gpio-ranges prop Jonas Karlman
2024-08-07 9:49 ` Quentin Schulz
2024-08-02 22:56 ` [PATCH v2 07/10] gpio: rockchip: Use pinctrl pin offset to get_gpio_mux() Jonas Karlman
2024-08-07 10:02 ` Quentin Schulz
2024-08-02 22:56 ` [PATCH v2 08/10] gpio: rockchip: Add request() ops Jonas Karlman
2024-08-07 10:12 ` Quentin Schulz
2024-08-09 9:38 ` Kever Yang
2024-08-02 22:56 ` [PATCH v2 09/10] rockchip: gpio: Add gpio-ranges props Jonas Karlman
2024-08-07 10:28 ` Quentin Schulz
2024-08-09 9:38 ` Kever Yang [this message]
2024-08-02 22:56 ` [PATCH v2 10/10] rockchip: gpio: Add missing gpio aliases Jonas Karlman
2024-08-07 10:47 ` Quentin Schulz
2024-08-09 9:39 ` Kever Yang
2024-08-12 6:30 ` [PATCH v2 00/10] rockchip: pinctrl: Add support for pinmux status cmd Kever Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1cd6b2e5-e63c-40bd-b165-cf43c7d443c1@rock-chips.com \
--to=kever.yang@rock-chips.com \
--cc=jbx6244@gmail.com \
--cc=jonas@kwiboo.se \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox