[2/3] ARM: dts: allwinner: convert gpio.h to sunxi-gpio.h
diff mbox series

Message ID 20200715115507.2690-1-frank@allwinnertech.com
State New
Headers show
Series
  • [1/3] dt-bindings: gpio: sunxi:create a DT header for Allwinner pin controller
Related show

Commit Message

Frank Lee July 15, 2020, 11:55 a.m. UTC
From: Yangtao Li <frank@allwinnertech.com>

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.

Signed-off-by: Yangtao Li <frank@allwinnertech.com>

---
 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(-)

Comments

Maxime Ripard July 17, 2020, 4:08 p.m. UTC | #1
On Wed, Jul 15, 2020 at 07:55:07PM +0800, Frank Lee wrote:
> From: Yangtao Li <frank@allwinnertech.com>
> 
> 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.
> 
> Signed-off-by: Yangtao Li <frank@allwinnertech.com>
> 
> ---
>  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(-)
> 
> diff --git a/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi b/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi
> index fc67e30fe212..93f9653b43f4 100644
> --- a/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi
> +++ b/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi
> @@ -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

Patch
diff mbox series

diff --git a/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi b/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi
index fc67e30fe212..93f9653b43f4 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi
@@ -7,7 +7,7 @@ 
 
 #include "sunxi-common-regulators.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/sunxi-gpio.h>
 
 / {
 	aliases {
diff --git a/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi b/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi
index 19b3b23cfaa8..f6f14b5175e3 100644
--- a/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi
+++ b/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi
@@ -3,7 +3,7 @@ 
  * Copyright (C) 2017 Chen-Yu Tsai <wens@csie.org>
  */
 
-#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/sunxi-gpio.h>
 #include <dt-bindings/input/input.h>
 
 / {