On Wed, Jul 15, 2020 at 07:55:29PM +0800, Frank Lee wrote:
> From: Yangtao Li <frank@xxxxxxxxxxxxxxxxx>
>
> Convert gpio.h to sunxi-gpio.h, and convert to use gpio bank name macro.
> This is done using the following command.
>
> sed -i 's/r_pio 0/r_pio PL/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/r_pio 1/r_pio PM/g' arch/arm64/boot/dts/allwinner/*
>
> sed -i 's/\&pio 0/\&pio PA/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/\&pio 2/\&pio PC/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/\&pio 3/\&pio PD/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/\&pio 4/\&pio PE/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/\&pio 5/\&pio PF/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/\&pio 6/\&pio PG/g' arch/arm64/boot/dts/allwinner/*
> sed -i 's/\&pio 7/\&pio PH/g' arch/arm64/boot/dts/allwinner/*
>
> sed -i 's/dt-bindings\/gpio\/gpio.h/dt-bindings\/gpio\/sunxi-gpio.h/g' \
> arch/arm64/boot/dts/allwinner/*
>
> Signed-off-by: Yangtao Li <frank@xxxxxxxxxxxxxxxxx>
>
> ---
> .../allwinner/sun50i-a64-amarula-relic.dts | 18 ++++++------
> .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 20 ++++++-------
> .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 8 +++---
> .../sun50i-a64-oceanic-5205-5inmfd.dts | 4 +--
> .../dts/allwinner/sun50i-a64-olinuxino.dts | 12 ++++----
> .../dts/allwinner/sun50i-a64-orangepi-win.dts | 20 ++++++-------
> .../boot/dts/allwinner/sun50i-a64-pine64.dts | 4 +--
> .../dts/allwinner/sun50i-a64-pinebook.dts | 16 +++++------
> .../dts/allwinner/sun50i-a64-pinephone.dtsi | 14 +++++-----
> .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 28 +++++++++----------
> .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 +--
> .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 20 ++++++-------
> .../sun50i-h5-emlid-neutis-n5-devboard.dts | 2 +-
> .../sun50i-h5-libretech-all-h5-cc.dts | 2 +-
> .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 14 +++++-----
> .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 14 +++++-----
> .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 16 +++++------
> .../allwinner/sun50i-h5-orangepi-prime.dts | 18 ++++++------
> .../sun50i-h5-orangepi-zero-plus.dts | 13 +++++----
> .../sun50i-h5-orangepi-zero-plus2.dts | 6 ++--
> .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 8 +++---
> .../dts/allwinner/sun50i-h6-orangepi-3.dts | 20 ++++++-------
> .../allwinner/sun50i-h6-orangepi-lite2.dts | 8 +++---
> .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +-
> .../dts/allwinner/sun50i-h6-orangepi.dtsi | 12 ++++----
> .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 16 +++++------
> .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 6 ++--
> 27 files changed, 163 insertions(+), 162 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
> index c7bd73f35ed8..92f8caecf939 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts
> @@ -7,7 +7,7 @@
> #include "sun50i-a64.dtsi"
> #include "sun50i-a64-cpu-opp.dtsi"
>
> -#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/gpio/sunxi-gpio.h>
>
> / {
> model = "Amarula A64-Relic";
> @@ -23,8 +23,8 @@ chosen {
>
> i2c {
> compatible = "i2c-gpio";
> - sda-gpios = <&pio 4 13 GPIO_ACTIVE_HIGH>;
> - scl-gpios = <&pio 4 12 GPIO_ACTIVE_HIGH>;
> + sda-gpios = <&pio PE 13 GPIO_ACTIVE_HIGH>;
> + scl-gpios = <&pio PE 12 GPIO_ACTIVE_HIGH>;
> i2c-gpio,delay-us = <5>;
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -40,8 +40,8 @@ ov5640: camera@3c {
> AVDD-supply = <®_aldo1>;
> DOVDD-supply = <®_dldo3>;
> DVDD-supply = <®_eldo3>;
> - reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* CSI-RST-R: PE14 */
> - powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* CSI-STBY-R: PE15 */
> + reset-gpios = <&pio PE 14 GPIO_ACTIVE_LOW>; /* CSI-RST-R: PE14 */
> + powerdown-gpios = <&pio PE 15 GPIO_ACTIVE_HIGH>; /* CSI-STBY-R: PE15 */
The pin name is fairly obvious now, I guess we can just remove the PE14
/ PE15 from the comment (and that applies to the other DT as well)
Maxime
Attachment:
signature.asc
Description: PGP signature
