ipq806x: ArcherC2600: devictree cleanup

add blank lines and use macros for GPIOs

Signed-off-by: Henryk Heisig <hyniu@o2.pl>

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index 737a9fa07a5d357b7922cf83d197cf61fe63a52f..1740e3eb3af168b2ee6a05a267c309124834d366 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -121,7 +121,7 @@
                                pinctrl-0 = <&spi_pins>;
                                pinctrl-names = "default";
 
-                               cs-gpios = <&qcom_pinmux 20 0>;
+                               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
 
                                flash: m25p80@0 {
                                        compatible = "s25fl256s1";
@@ -135,119 +135,143 @@
                                                reg = <0x0 0x20000>;
                                                read-only;
                                        };
+
                                        MIBIB@20000 {
                                                label = "MIBIB";
                                                reg = <0x20000 0x20000>;
                                                read-only;
                                        };
+
                                        SBL2@40000 {
                                                label = "SBL2";
                                                reg = <0x40000 0x20000>;
                                                read-only;
                                        };
+
                                        SBL3@60000 {
                                                label = "SBL3";
                                                reg = <0x60000 0x30000>;
                                                read-only;
                                        };
+
                                        DDRCONFIG@90000 {
                                                label = "DDRCONFIG";
                                                reg = <0x90000 0x10000>;
                                                read-only;
                                        };
+
                                        SSD@a0000 {
                                                label = "SSD";
                                                reg = <0xa0000 0x10000>;
                                                read-only;
                                        };
+
                                        TZ@b0000 {
                                                label = "TZ";
                                                reg = <0xb0000 0x30000>;
                                                read-only;
                                        };
+
                                        RPM@e0000 {
                                                label = "RPM";
                                                reg = <0xe0000 0x20000>;
                                                read-only;
                                        };
+
                                        fs-uboot@100000 {
                                                label = "fs-uboot";
                                                reg = <0x100000 0x70000>;
                                                read-only;
                                        };
+
                                        uboot-env@170000 {
                                                label = "uboot-env";
                                                reg = <0x170000 0x40000>;
                                                read-only;
                                        };
+
                                        radio@1b0000 {
                                                label = "radio";
                                                reg = <0x1b0000 0x40000>;
                                                read-only;
                                        };
+
                                        os-image@1f0000 {
                                                label = "os-image";
                                                reg = <0x1f0000 0x200000>;
                                        };
+
                                        rootfs@3f0000 {
                                                label = "rootfs";
                                                reg = <0x3f0000 0x1b00000>;
                                        };
+
                                        defaultmac: default-mac@1ef0000 {
                                                label = "default-mac";
                                                reg = <0x1ef0000 0x00200>;
                                                read-only;
                                        };
+
                                        pin@1ef0200 {
                                                label = "pin";
                                                reg = <0x1ef0200 0x00200>;
                                                read-only;
                                        };
+
                                        product-info@1ef0400 {
                                                label = "product-info";
                                                reg = <0x1ef0400 0x0fc00>;
                                                read-only;
                                        };
+
                                        partition-table@1f00000 {
                                                label = "partition-table";
                                                reg = <0x1f00000 0x10000>;
                                                read-only;
                                        };
+
                                        soft-version@1f10000 {
                                                label = "soft-version";
                                                reg = <0x1f10000 0x10000>;
                                                read-only;
                                        };
+
                                        support-list@1f20000 {
                                                label = "support-list";
                                                reg = <0x1f20000 0x10000>;
                                                read-only;
                                        };
+
                                        profile@1f30000 {
                                                label = "profile";
                                                reg = <0x1f30000 0x10000>;
                                                read-only;
                                        };
+
                                        default-config@1f40000 {
                                                label = "default-config";
                                                reg = <0x1f40000 0x10000>;
                                                read-only;
                                        };
+
                                        user-config@1f50000 {
                                                label = "user-config";
                                                reg = <0x1f50000 0x40000>;
                                                read-only;
                                        };
+
                                        qos-db@1f90000 {
                                                label = "qos-db";
                                                reg = <0x1f90000 0x40000>;
                                                read-only;
                                        };
+
                                        usb-config@1fd0000 {
                                                label = "usb-config";
                                                reg = <0x1fd0000 0x10000>;
                                                read-only;
                                        };
+
                                        log@1fe0000 {
                                                label = "log";
                                                reg = <0x1fe0000 0x20000>;
@@ -295,7 +319,7 @@
                        compatible = "virtual,mdio-gpio";
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
+                       gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
                        pinctrl-0 = <&mdio0_pins>;
                        pinctrl-names = "default";
 
@@ -355,24 +379,25 @@
 
                wifi {
                        label = "wifi";
-                       gpios = <&qcom_pinmux 49 1>;
+                       gpios = <&qcom_pinmux 49 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WLAN>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&qcom_pinmux 64 1>;
+                       gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&qcom_pinmux 65 1>;
+                       gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
+
                 ledgeneral {
                        label = "ledgeneral";
-                       gpios = <&qcom_pinmux 16 1>;
+                       gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_DOLLAR>;
                };
        };
@@ -382,31 +407,37 @@
 
                lan {
                        label = "c2600:white:lan";
-                       gpios = <&qcom_pinmux 6 0>;
+                       gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
                };
+
                usb4 {
                        label = "c2600:white:usb_4";
-                       gpios = <&qcom_pinmux 7 0>;
+                       gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
                };
+
                usb2 {
                        label = "c2600:white:usb_2";
-                       gpios = <&qcom_pinmux 8 0>;
+                       gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
                };
+
                wps {
                        label = "c2600:white:wps";
-                       gpios = <&qcom_pinmux 9 0>;
+                       gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
                };
+
                wan_blue {
                        label = "c2600:white:wan";
-                       gpios = <&qcom_pinmux 33 1>;
+                       gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>;
                };
+
                power: status {
                        label = "c2600:white:status";
-                       gpios = <&qcom_pinmux 53 0>;
+                       gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
                };
+
                ledgnr: ledgnr {
                        label = "c2600:white:ledgnr";
-                       gpios = <&qcom_pinmux 66 0>;
+                       gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
                };
        };
 };