ARM: sunxi: DT: convert DTs to use common GPIOs includes

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / sun6i-a31-hummingbird.dts

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index a3bf20930d5083471d2d0b303425169f77c0a781..7364d22b33dd9ab9c8af5955e39dc777b640aac6 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -51,6 +51,8 @@
 #include "sun6i-a31.dtsi"
 #include "sunxi-common-regulators.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
        model = "Merrii A31 Hummingbird";
        compatible = "merrii,a31-hummingbird", "allwinner,sun6i-a31";
@@ -65,7 +67,7 @@
                        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
                        vmmc-supply = <&reg_vcc3v0>;
                        bus-width = <4>;
-                       cd-gpios = <&pio 0 8 0>; /* PA8 */
+                       cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
                        cd-inverted;
                        status = "okay";
                };
@@ -139,7 +141,7 @@
                        pinctrl-0 = <&gmac_pins_rgmii_a>;
                        phy = <&phy1>;
                        phy-mode = "rgmii";
-                       snps,reset-gpio = <&pio 0 21 0>;
+                       snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
                        snps,reset-active-low;
                        snps,reset-delays-us = <0 10000 30000>;
                        status = "okay";
@@ -152,7 +154,7 @@
 
        reg_usb1_vbus: usb1-vbus {
                pinctrl-0 = <&usb1_vbus_pin_a>;
-               gpio = <&pio 7 24 0>; /* PH24 */
+               gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */
                status = "okay";
        };
 };