arm64: dts: uniphier: use macros in dt-bindings header

The dt-bindings header was applied to the driver subsystem.  I had to
wait for a merge window to use it from DT.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
index 6bdefb26b3296ae2dda562472bd26a8a8d8b23bd..54c53170699ad1942daec76cf51fe0659dba3f24 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
@@ -50,7 +50,7 @@
 &gpio {
        xirq0 {
                gpio-hog;
-               gpios = <120 0>;
+               gpios = <UNIPHIER_GPIO_IRQ(0) 0>;
                input;
        };
 };

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index 1c63d0ab8a58d04c5febaa78161b32b80b68ac19..ce40eb51ff68eb4541ebddedf2567b1c2d5cc468 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -8,6 +8,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/uniphier-gpio.h>
 
 /memreserve/ 0x80000000 0x02000000;
 
@@ -100,7 +101,7 @@
 
        emmc_pwrseq: emmc-pwrseq {
                compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio UNIPHIER_GPIO_PORT(3, 2) GPIO_ACTIVE_LOW>;
        };
 
        timer {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index 254d6795c67e94802789038ad3b9ccc872ffb3f5..693371033c902177ca587f8bea4d3a418f3291d2 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -50,7 +50,7 @@
 &gpio {
        xirq0 {
                gpio-hog;
-               gpios = <120 0>;
+               gpios = <UNIPHIER_GPIO_IRQ(0) 0>;
                input;
        };
 };

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 5c81070944ccbbc4fd0dee253d57d2b5ec139234..8a3276ba2da1addb36a1362734ce198c3b4d6daf 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -8,6 +8,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/uniphier-gpio.h>
 #include <dt-bindings/thermal/thermal.h>
 
 /memreserve/ 0x80000000 0x02000000;
@@ -172,7 +173,7 @@
 
        emmc_pwrseq: emmc-pwrseq {
                compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio UNIPHIER_GPIO_PORT(3, 2) GPIO_ACTIVE_LOW>;
        };
 
        timer {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index 48e733136db4580ffd06963f622b7ce7ada92d61..d2beadd6e24977d7c9bb447a09ac32492b0b14a4 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -8,6 +8,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/uniphier-gpio.h>
 
 /memreserve/ 0x80000000 0x02000000;
 
@@ -128,7 +129,7 @@
 
        emmc_pwrseq: emmc-pwrseq {
                compatible = "mmc-pwrseq-emmc";
-               reset-gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
+               reset-gpios = <&gpio UNIPHIER_GPIO_PORT(5, 7) GPIO_ACTIVE_LOW>;
        };
 
        timer {