Skip to contentSkip to conversation

ARM: dts: allwinner: convert gpio.h to sunxi-gpio.h

PATCH In review Frank Lee 2 participants 2 messages Jul 15, 2020 – Jul 17, 2020

Subsystems (2)
lore
Share & tools
lore

Frank Lee

author
#0 lore raw

PATCH 2/3 ARM: dts: allwinner: convert gpio.h to sunxi-gpio.h

From: Yangtao Li <[email protected]>

Use names instead of numbers to describe GPIO. We clean arm64 first. Since H5 uses the DTS file in arm directory, we need to modify the header file in advance.

---
 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi  | 2 +-
 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi +1 -1
index fc67e30fe212..93f9653b43f4 100644
@@ -7,7 +7,7 @@
 
 #include "sunxi-common-regulators.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/sunxi-gpio.h>
 
 / {
 	aliases {
arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi +1 -1
index 19b3b23cfaa8..f6f14b5175e3 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Chen-Yu Tsai <[email protected]>
  */
 
-#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/sunxi-gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {
Signature · 1 line
2.24.0
#1 lore raw
Quoted 18 lines · Frank Lee

From: Yangtao Li <[email protected]>

Use names instead of numbers to describe GPIO. We clean arm64 first. Since H5 uses the DTS file in arm directory, we need to modify the header file in advance.

---
 arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi  | 2 +-
 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi +0 -0
index fc67e30fe212..93f9653b43f4 100644

arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi line 10

Quoted 5 lines
arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi +1 -1
@@ -7,7 +7,7 @@
 
 #include "sunxi-common-regulators.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/sunxi-gpio.h>

I think we should have both. The gpio.h header is supposed to be for the generic defines, while ours would be for the one specific to the allwinner SoCs (just like it's being done for the GIC vs generic interrupt flags)

Maxime