2023-12-13 16:06:38

by Trevor Woerner

Subject: [PATCH v2] arm64: rockchip: dts: rk3328-rock-pi-e: add gpio-line-names

Add names to the pins of the general-purpose expansion header as given
in the Radxa GPIO page[1] following the conventions in the kernel
documentation[2] to make it easier for users to correlate the pins with
functions when using utilities such as 'gpioinfo'.

Signed-off-by: Trevor Woerner <[email protected]>
---
changes in v2:
- fix subject from "amd64..." to "arm64..."
---
.../boot/dts/rockchip/rk3328-rock-pi-e.dts | 53 +++++++++++++++++++
1 file changed, 53 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
index 018a3a5075c7..3169c0854061 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
@@ -388,3 +388,56 @@ &usbdrd3 {
&usb_host0_ehci {
status = "okay";
};
+
+&gpio0 {
+ gpio-line-names =
+ /* GPIO0_A0 - A7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO0_B0 - B7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO0_C0 - C7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO0_D0 - D7 */
+ "", "", "", "pin-15 [GPIO0_D3]", "", "", "", "";
+};
+
+&gpio1 {
+ gpio-line-names =
+ /* GPIO1_A0 - A7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO1_B0 - B7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO1_C0 - C7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO1_D0 - D7 */
+ "", "", "", "", "pin-07 [GPIO1_D4]", "", "", "";
+};
+
+&gpio2 {
+ gpio-line-names =
+ /* GPIO2_A0 - A7 */
+ "pin-08 [GPIO2_A0]", "pin-10 [GPIO2_A1]", "pin-11 [GPIO2_A2]",
+ "pin-13 [GPIO2-A3]", "pin-27 [GPIO2_A4]", "pin-28 [GPIO2_A5]",
+ "pin-33 [GPIO2_A6]", "",
+ /* GPIO2_B0 - B7 */
+ "", "", "", "", "pin-26 [GPIO2_B4]", "", "", "pin-36 [GPIO2_B7]",
+ /* GPIO2_C0 - C7 */
+ "pin-32 [GPIO2_C0]", "pin-35 [GPIO2_C1]", "pin-12 [GPIO2_C2]",
+ "pin-38 [GPIO2_C3]", "pin-29 [GPIO2_C4]", "pin-31 [GPIO2_C5]",
+ "pin-37 [GPIO2_C6]", "pin-40 [GPIO2_C7]",
+ /* GPIO2_D0 - D7 */
+ "", "", "", "", "", "", "", "";
+};
+
+&gpio3 {
+ gpio-line-names =
+ /* GPIO3_A0 - A7 */
+ "pin-23 [GPIO3_A0]", "pin-19 [GPIO3_A1]", "pin-21 [GPIO3_A2]",
+ "", "pin-03 [GPIO3_A4]", "", "pin-05 [GPIO3_A6]", "",
+ /* GPIO3_B0 - B7 */
+ "pin-24 [GPIO3_B0]", "", "", "", "", "", "", "",
+ /* GPIO3_C0 - C7 */
+ "", "", "", "", "", "", "", "",
+ /* GPIO3_D0 - D7 */
+ "", "", "", "", "", "", "", "";
+};
--
2.41.0.327.gaa9166bcc0ba

2023-12-14 07:08:08

by Dragan Simic

Subject: Re: [PATCH v2] arm64: rockchip: dts: rk3328-rock-pi-e: add gpio-line-names

On 2023-12-13 17:05, Trevor Woerner wrote:
> Add names to the pins of the general-purpose expansion header as given
> in the Radxa GPIO page[1] following the conventions in the kernel
> documentation[2] to make it easier for users to correlate the pins with
> functions when using utilities such as 'gpioinfo'.
>
> Signed-off-by: Trevor Woerner <[email protected]>
> ---
> changes in v2:
> - fix subject from "amd64..." to "arm64..."
> ---
> .../boot/dts/rockchip/rk3328-rock-pi-e.dts | 53 +++++++++++++++++++
> 1 file changed, 53 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> index 018a3a5075c7..3169c0854061 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> @@ -388,3 +388,56 @@ &usbdrd3 {
> &usb_host0_ehci {
> status = "okay";
> };
> +
> +&gpio0 {
> + gpio-line-names =
> + /* GPIO0_A0 - A7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO0_B0 - B7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO0_C0 - C7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO0_D0 - D7 */
> + "", "", "", "pin-15 [GPIO0_D3]", "", "", "", "";
> +};
> +
> +&gpio1 {
> + gpio-line-names =
> + /* GPIO1_A0 - A7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO1_B0 - B7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO1_C0 - C7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO1_D0 - D7 */
> + "", "", "", "", "pin-07 [GPIO1_D4]", "", "", "";
> +};
> +
> +&gpio2 {
> + gpio-line-names =
> + /* GPIO2_A0 - A7 */
> + "pin-08 [GPIO2_A0]", "pin-10 [GPIO2_A1]", "pin-11 [GPIO2_A2]",
> + "pin-13 [GPIO2-A3]", "pin-27 [GPIO2_A4]", "pin-28 [GPIO2_A5]",
> + "pin-33 [GPIO2_A6]", "",
> + /* GPIO2_B0 - B7 */
> + "", "", "", "", "pin-26 [GPIO2_B4]", "", "", "pin-36 [GPIO2_B7]",
> + /* GPIO2_C0 - C7 */
> + "pin-32 [GPIO2_C0]", "pin-35 [GPIO2_C1]", "pin-12 [GPIO2_C2]",
> + "pin-38 [GPIO2_C3]", "pin-29 [GPIO2_C4]", "pin-31 [GPIO2_C5]",
> + "pin-37 [GPIO2_C6]", "pin-40 [GPIO2_C7]",
> + /* GPIO2_D0 - D7 */
> + "", "", "", "", "", "", "", "";
> +};
> +
> +&gpio3 {
> + gpio-line-names =
> + /* GPIO3_A0 - A7 */
> + "pin-23 [GPIO3_A0]", "pin-19 [GPIO3_A1]", "pin-21 [GPIO3_A2]",
> + "", "pin-03 [GPIO3_A4]", "", "pin-05 [GPIO3_A6]", "",
> + /* GPIO3_B0 - B7 */
> + "pin-24 [GPIO3_B0]", "", "", "", "", "", "", "",
> + /* GPIO3_C0 - C7 */
> + "", "", "", "", "", "", "", "",
> + /* GPIO3_D0 - D7 */
> + "", "", "", "", "", "", "", "";
> +};

The formatting should be a bit different, i.e. all lines following
"gpio-line-names =" and providing the value should be indented one tab
position further.

2023-12-15 21:10:57

by Heiko Stuebner

Subject: Re: [PATCH v2] arm64: rockchip: dts: rk3328-rock-pi-e: add gpio-line-names

On Wed, 13 Dec 2023 11:05:55 -0500, Trevor Woerner wrote:
> Add names to the pins of the general-purpose expansion header as given
> in the Radxa GPIO page[1] following the conventions in the kernel
> documentation[2] to make it easier for users to correlate the pins with
> functions when using utilities such as 'gpioinfo'.
>
>

Applied, thanks!

[1/1] arm64: rockchip: dts: rk3328-rock-pi-e: add gpio-line-names
commit: 799637dfadb092d1732afacea42f67a6f1621fb4

I've indented the gpio lines by one tab as suggested by Dragan.
And also moved the &gpio {} references to their correct position
in the file.

Please sort phandle-references alphabetically and not just add them
to the bottom of the file.


Best regards,
--
Heiko Stuebner <[email protected]>