ipq806x: rework dts to use label
authorAnsuel Smith <ansuelsmth@gmail.com>
Wed, 5 Feb 2020 02:03:41 +0000 (03:03 +0100)
committerPetr Štetiar <ynezz@true.cz>
Tue, 3 Mar 2020 22:38:23 +0000 (23:38 +0100)
We should use label instead of redefine the node.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
13 files changed:
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts

index 32b32db2716c1780e5c3c8244a2bace9c40a9c89..e114ff96e17f3bd5be6144e8d681f397558d276a 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       i2c4_pins: i2c4_pinmux {
-                               pins = "gpio12", "gpio13";
-                               function = "gsbi4";
-                               bias-disable;
-                       };
-
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       drive-strength = <10>;
-                                       bias-none;
-                               };
-                       };
-                       nand_pins: nand_pins {
-                               disable {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               pullups {
-                                       pins = "gpio39";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-bus-hold;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio2", "gpio27", "gpio28",
-                                               "gpio29", "gpio30", "gpio31",
-                                               "gpio32", "gpio51", "gpio52",
-                                               "gpio59", "gpio60", "gpio61",
-                                               "gpio62" , "gpio66";
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-
-                       /*
-                       * The i2c device on gsbi4 should not be enabled.
-                       * On ipq806x designs gsbi4 i2c is meant for exclusive
-                       * RPM usage. Turning this on in kernel manifests as
-                       * i2c failure for the RPM.
-                       */
-               };
-
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "okay";
-
-                       spi4: spi@1a280000 {
-                               status = "okay";
-                               spi-max-frequency = <50000000>;
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 0>;
-
-                               m25p80@0 {
-                                       compatible = "s25fl256s1";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-
-                                       partitions {
-                                               compatible = "qcom,smem";
-                                       };
-                               };
-                       };
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       force_gen1 = <1>;
-               };
-
-               pcie2: pci@1b900000 {
-                       status = "okay";
-               };
-
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       nand@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "qcom,smem";
-                               };
-                       };
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <3>;
                        };
                };
+       };
+};
 
-               gmac0: ethernet@37000000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <0>;
+&qcom_pinmux {
+       i2c4_pins: i2c4_pinmux {
+               pins = "gpio12", "gpio13";
+               function = "gsbi4";
+               bias-disable;
+       };
 
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-                       mdiobus = <&mdio0>;
+       spi_pins: spi_pins {
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       drive-strength = <10>;
+                       bias-none;
+               };
+       };
+       nand_pins: nand_pins {
+               disable {
+                       pins = "gpio34", "gpio35", "gpio36",
+                                       "gpio37", "gpio38";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
 
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
+               pullups {
+                       pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-pull-up;
                };
 
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-                       mdiobus = <&mdio0>;
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                                       "gpio43", "gpio44", "gpio45",
+                                       "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-bus-hold;
+               };
+       };
 
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio2", "gpio27", "gpio28",
+                               "gpio29", "gpio30", "gpio31",
+                               "gpio32", "gpio51", "gpio52",
+                               "gpio59", "gpio60", "gpio61",
+                               "gpio62" , "gpio66";
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
                };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+
+       /*
+       * The i2c device on gsbi4 should not be enabled.
+       * On ipq806x designs gsbi4 i2c is meant for exclusive
+       * RPM usage. Turning this on in kernel manifests as
+       * i2c failure for the RPM.
+       */
+};
 
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-                       mdiobus = <&mdio0>;
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       status = "okay";
 
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
+       spi4: spi@1a280000 {
+               status = "okay";
+               spi-max-frequency = <50000000>;
+
+               pinctrl-0 = <&spi_pins>;
+               pinctrl-names = "default";
+
+               cs-gpios = <&qcom_pinmux 20 0>;
+
+               m25p80@0 {
+                       compatible = "s25fl256s1";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       spi-max-frequency = <50000000>;
+                       reg = <0>;
+
+                       partitions {
+                               compatible = "qcom,smem";
                        };
                };
        };
 };
 
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+};
+
+&usb3_1 {
+       status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
+
+&pcie1 {
+       status = "okay";
+       force_gen1 = <1>;
+};
+
+&pcie2 {
+       status = "okay";
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "qcom,smem";
+               };
+       };
+};
+
+&gmac0 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <0>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+       mdiobus = <&mdio0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+       mdiobus = <&mdio0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+       mdiobus = <&mdio0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
index 3a7b830daa125c935bde27543b422ffe71e4ed34..1c492eca669639dc4d948009d3e95fcf1623bdef 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio16", "gpio54", "gpio65";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33",
-                                              "gpio53", "gpio66";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       bias-pull-down;
-                               };
-
-                               data {
-                                       pins = "gpio18", "gpio19";
-                                       drive-strength = <10>;
-                               };
-
-                               cs {
-                                       pins = "gpio20";
-                                       function = "gpio";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               clk {
-                                       pins = "gpio21";
-                                       drive-strength = <12>;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       usb0_pwr_en_pin: usb0_pwr_en_pin {
-                               mux {
-                                       pins = "gpio25";
-                                       function = "gpio";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                                       output-high;
-                               };
-                       };
-
-                       usb1_pwr_en_pin: usb1_pwr_en_pin {
-                               mux {
-                                       pins = "gpio23";
-                                       function = "gpio";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                                       output-high;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "okay";
-
-                       spi5: spi@1a280000 {
-                               status = "okay";
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-                               m25p80@0 {
-                                       compatible = "jedec,spi-nor";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-
-                                       SBL1@0 {
-                                               label = "SBL1";
-                                               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 0x400000>;
-                                       };
-
-                                       rootfs@5f0000 {
-                                               label = "rootfs";
-                                               reg = <0x5f0000 0x1900000>;
-                                       };
-
-                                       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>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb0_pwr_en_pin>;
-                       pinctrl-names = "default";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb1_pwr_en_pin>;
-                       pinctrl-names = "default";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       force_gen1 = <1>;
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <4>;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       mtd-mac-address = <&defaultmac 0x8>;
-                       mtd-mac-address-increment = <1>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-
-                       mtd-mac-address = <&defaultmac 0x8>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio16", "gpio54", "gpio65";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio26", "gpio33",
+                                       "gpio53", "gpio66";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       spi_pins: spi_pins {
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       bias-pull-down;
+               };
+
+               data {
+                       pins = "gpio18", "gpio19";
+                       drive-strength = <10>;
+               };
+
+               cs {
+                       pins = "gpio20";
+                       function = "gpio";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               clk {
+                       pins = "gpio21";
+                       drive-strength = <12>;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       usb0_pwr_en_pin: usb0_pwr_en_pin {
+               mux {
+                       pins = "gpio25";
+                       function = "gpio";
+                       drive-strength = <10>;
+                       bias-pull-up;
+                       output-high;
+               };
+       };
+
+       usb1_pwr_en_pin: usb1_pwr_en_pin {
+               mux {
+                       pins = "gpio23";
+                       function = "gpio";
+                       drive-strength = <10>;
+                       bias-pull-up;
+                       output-high;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       status = "okay";
+
+       spi5: spi@1a280000 {
+               status = "okay";
+
+               pinctrl-0 = <&spi_pins>;
+               pinctrl-names = "default";
+
+               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
+
+               m25p80@0 {
+                       compatible = "jedec,spi-nor";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       spi-max-frequency = <50000000>;
+                       reg = <0>;
+
+                       SBL1@0 {
+                               label = "SBL1";
+                               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 0x400000>;
+                       };
+
+                       rootfs@5f0000 {
+                               label = "rootfs";
+                               reg = <0x5f0000 0x1900000>;
+                       };
+
+                       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>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&usb3_0 {
+       status = "okay";
+
+       pinctrl-0 = <&usb0_pwr_en_pin>;
+       pinctrl-names = "default";
+};
+
+&usb3_1 {
+       status = "okay";
+
+       pinctrl-0 = <&usb1_pwr_en_pin>;
+       pinctrl-names = "default";
+};
+
+&pcie0 {
+       status = "okay";
+};
+
+&pcie1 {
+       status = "okay";
+       force_gen1 = <1>;
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       mtd-mac-address = <&defaultmac 0x8>;
+       mtd-mac-address-increment = <1>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+
+       mtd-mac-address = <&defaultmac 0x8>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
index b266670dab93943aae92afb069950ae01a605b83..e60ed4aa02faa132aedf18f0e183612db51d230f 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio6", "gpio54", "gpio65";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-                                               "gpio24","gpio26", "gpio53", "gpio64";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       nand_pins: nand_pins {
-                               disable {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               pullups {
-                                       pins = "gpio39";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-bus-hold;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       usb0_pwr_en_pins: usb0_pwr_en_pins {
-                               mux {
-                                       pins = "gpio15";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-
-                       usb1_pwr_en_pins: usb1_pwr_en_pins {
-                               mux {
-                                       pins = "gpio16", "gpio68";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       ports-implemented = <0x1>;
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb0_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb1_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-                       reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
-                       pinctrl-0 = <&pcie0_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>;
-                       pinctrl-0 = <&pcie1_pins>;
-                       pinctrl-names = "default";
-                       force_gen1 = <1>;
-               };
-
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       nand@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       qcadata@0 {
-                                               label = "qcadata";
-                                               reg = <0x0000000 0x0c80000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@c80000 {
-                                               label = "APPSBL";
-                                               reg = <0x0c80000 0x0500000>;
-                                               read-only;
-                                       };
-
-                                       APPSBLENV@1180000 {
-                                               label = "APPSBLENV";
-                                               reg = <0x1180000 0x0080000>;
-                                               read-only;
-                                       };
-
-                                       art: art@1200000 {
-                                               label = "art";
-                                               reg = <0x1200000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       artbak: art@1340000 {
-                                               label = "artbak";
-                                               reg = <0x1340000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       kernel@1480000 {
-                                               label = "kernel";
-                                               reg = <0x1480000 0x0400000>;
-                                       };
-
-                                       ubi@1880000 {
-                                               label = "ubi";
-                                               reg = <0x1880000 0x1C00000>;
-                                       };
-
-                                       netgear@3480000 {
-                                               label = "netgear";
-                                               reg = <0x3480000 0x4480000>;
-                                               read-only;
-                                       };
-
-                                       reserve@7900000 {
-                                               label = "reserve";
-                                               reg = <0x7900000 0x0700000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <4>;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       phy-handle = <&phy4>;
-                       qcom,id = <1>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       mtd-mac-address = <&art 6>;
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-
-                       mtd-mac-address = <&art 0>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio6", "gpio54", "gpio65";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
+                               "gpio24","gpio26", "gpio53", "gpio64";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       nand_pins: nand_pins {
+               disable {
+                       pins = "gpio34", "gpio35", "gpio36",
+                                       "gpio37", "gpio38";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
+               pullups {
+                       pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                                       "gpio43", "gpio44", "gpio45",
+                                       "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-bus-hold;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       usb0_pwr_en_pins: usb0_pwr_en_pins {
+               mux {
+                       pins = "gpio15";
+                       function = "gpio";
+                       drive-strength = <12>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+
+       usb1_pwr_en_pins: usb1_pwr_en_pins {
+               mux {
+                       pins = "gpio16", "gpio68";
+                       function = "gpio";
+                       drive-strength = <12>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       ports-implemented = <0x1>;
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+
+       pinctrl-0 = <&usb0_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&usb3_1 {
+       status = "okay";
+
+       pinctrl-0 = <&usb1_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie0 {
+       status = "okay";
+       reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
+       pinctrl-0 = <&pcie0_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie1 {
+       status = "okay";
+       reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>;
+       pinctrl-0 = <&pcie1_pins>;
+       pinctrl-names = "default";
+       force_gen1 = <1>;
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       nand@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       qcadata@0 {
+                               label = "qcadata";
+                               reg = <0x0000000 0x0c80000>;
+                               read-only;
+                       };
+
+                       APPSBL@c80000 {
+                               label = "APPSBL";
+                               reg = <0x0c80000 0x0500000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@1180000 {
+                               label = "APPSBLENV";
+                               reg = <0x1180000 0x0080000>;
+                               read-only;
+                       };
+
+                       art: art@1200000 {
+                               label = "art";
+                               reg = <0x1200000 0x0140000>;
+                               read-only;
+                       };
+
+                       artbak: art@1340000 {
+                               label = "artbak";
+                               reg = <0x1340000 0x0140000>;
+                               read-only;
+                       };
+
+                       kernel@1480000 {
+                               label = "kernel";
+                               reg = <0x1480000 0x0400000>;
+                       };
+
+                       ubi@1880000 {
+                               label = "ubi";
+                               reg = <0x1880000 0x1C00000>;
+                       };
+
+                       netgear@3480000 {
+                               label = "netgear";
+                               reg = <0x3480000 0x4480000>;
+                               read-only;
+                       };
+
+                       reserve@7900000 {
+                               label = "reserve";
+                               reg = <0x7900000 0x0700000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       phy-handle = <&phy4>;
+       qcom,id = <1>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       mtd-mac-address = <&art 6>;
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+
+       mtd-mac-address = <&art 0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
index eb8de37708712beff48b27c9e4c634b6c36d133f..5c1904f9172a51a4cd05fe1597ab4888714fe36a 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       i2c4_pins: i2c4_pinmux {
-                               pins = "gpio12", "gpio13";
-                               function = "gsbi4";
-                               bias-disable;
-                       };
-
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       drive-strength = <10>;
-                                       bias-none;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       rgmii0_pins: rgmii0_pins {
-                               mux {
-                                       pins = "gpio2", "gpio66";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-               };
-
-               gsbi2: gsbi@12480000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       uart2: serial@12490000 {
-                               status = "okay";
-                       };
-               };
-
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "okay";
-
-                       spi4: spi@1a280000 {
-                               status = "okay";
-                               spi-max-frequency = <50000000>;
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 0>;
-
-                               m25p80@0 {
-                                       compatible = "s25fl256s1";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-                                       m25p,fast-read;
-
-                                       partition@0 {
-                                               label = "lowlevel_init";
-                                               reg = <0x0 0x1b0000>;
-                                       };
-
-                                       partition@1 {
-                                               label = "u-boot";
-                                               reg = <0x1b0000 0x80000>;
-                                       };
-
-                                       partition@2 {
-                                               label = "u-boot-env";
-                                               reg = <0x230000 0x40000>;
-                                       };
-
-                                       partition@3 {
-                                               label = "caldata";
-                                               reg = <0x270000 0x40000>;
-                                       };
-
-                                       partition@4 {
-                                               label = "firmware";
-                                               reg = <0x2b0000 0x1d50000>;
-                                       };
-                               };
-                       };
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-               };
-
-               pcie2: pci@1b900000 {
-                       status = "okay";
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <7>;
                        };
                };
+       };
+};
 
-               gmac0: ethernet@37000000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <0>;
-                       phy-handle = <&phy4>;
+&qcom_pinmux {
+       i2c4_pins: i2c4_pinmux {
+               pins = "gpio12", "gpio13";
+               function = "gsbi4";
+               bias-disable;
+       };
 
-                       pinctrl-0 = <&rgmii0_pins>;
-                       pinctrl-names = "default";
+       spi_pins: spi_pins {
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       drive-strength = <10>;
+                       bias-none;
                };
+       };
 
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <1>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
                };
+       };
 
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-                       phy-handle = <&phy6>;
+       rgmii0_pins: rgmii0_pins {
+               mux {
+                       pins = "gpio2", "gpio66";
+                       drive-strength = <8>;
+                       bias-disable;
                };
+       };
+};
+
+&gsbi2 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       uart2: serial@12490000 {
+               status = "okay";
+       };
+};
+
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       status = "okay";
+
+       spi4: spi@1a280000 {
+               status = "okay";
+               spi-max-frequency = <50000000>;
+
+               pinctrl-0 = <&spi_pins>;
+               pinctrl-names = "default";
+
+               cs-gpios = <&qcom_pinmux 20 0>;
+
+               m25p80@0 {
+                       compatible = "s25fl256s1";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       spi-max-frequency = <50000000>;
+                       reg = <0>;
+                       m25p,fast-read;
+
+                       partition@0 {
+                               label = "lowlevel_init";
+                               reg = <0x0 0x1b0000>;
+                       };
+
+                       partition@1 {
+                               label = "u-boot";
+                               reg = <0x1b0000 0x80000>;
+                       };
+
+                       partition@2 {
+                               label = "u-boot-env";
+                               reg = <0x230000 0x40000>;
+                       };
+
+                       partition@3 {
+                               label = "caldata";
+                               reg = <0x270000 0x40000>;
+                       };
 
-               gmac3: ethernet@37600000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <3>;
-                       phy-handle = <&phy7>;
+                       partition@4 {
+                               label = "firmware";
+                               reg = <0x2b0000 0x1d50000>;
+                       };
                };
        };
 };
+
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+};
+
+&usb3_1 {
+       status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
+
+&pcie1 {
+       status = "okay";
+};
+
+&pcie2 {
+       status = "okay";
+};
+
+&gmac0 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <0>;
+       phy-handle = <&phy4>;
+
+       pinctrl-0 = <&rgmii0_pins>;
+       pinctrl-names = "default";
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <1>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+       phy-handle = <&phy6>;
+};
+
+&gmac3 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <3>;
+       phy-handle = <&phy7>;
+};
\ No newline at end of file
index fd2f193b9e050577c731d0a83213005e40f7a9fd..75ca00024a77479de753e186725026a67c763529 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio65", "gpio67", "gpio68";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio6", "gpio53", "gpio54";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       nand_pins: nand_pins {
-                               disable {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               pullups {
-                                       pins = "gpio39";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-bus-hold;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-                       force_gen1 = <1>;
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-               };
-
-               pcie2: pci@1b900000 {
-                       status = "okay";
-               };
-
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       nand@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       SBL1@0 {
-                                               label = "SBL1";
-                                               reg = <0x0000000 0x0040000>;
-                                               read-only;
-                                       };
-
-                                       MIBIB@40000 {
-                                               label = "MIBIB";
-                                               reg = <0x0040000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       SBL2@180000 {
-                                               label = "SBL2";
-                                               reg = <0x0180000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       SBL3@2c0000 {
-                                               label = "SBL3";
-                                               reg = <0x02c0000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       DDRCONFIG@540000 {
-                                               label = "DDRCONFIG";
-                                               reg = <0x0540000 0x0120000>;
-                                               read-only;
-                                       };
-
-                                       SSD@660000 {
-                                               label = "SSD";
-                                               reg = <0x0660000 0x0120000>;
-                                               read-only;
-                                       };
-
-                                       TZ@780000 {
-                                               label = "TZ";
-                                               reg = <0x0780000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       RPM@a00000 {
-                                               label = "RPM";
-                                               reg = <0x0a00000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       art: art@c80000 {
-                                               label = "art";
-                                               reg = <0x0c80000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@dc0000 {
-                                               label = "APPSBL";
-                                               reg = <0x0dc0000 0x0100000>;
-                                               read-only;
-                                       };
-
-                                       u_env@ec0000 {
-                                               label = "u_env";
-                                               reg = <0x0ec0000 0x0040000>;
-                                       };
-
-                                       s_env@f00000 {
-                                               label = "s_env";
-                                               reg = <0x0f00000 0x0040000>;
-                                       };
-
-                                       devinfo@f40000 {
-                                               label = "devinfo";
-                                               reg = <0x0f40000 0x0040000>;
-                                       };
-
-                                       linux@f80000 {
-                                               label = "kernel1";
-                                               reg = <0x0f80000 0x2800000>;  /* 3 MB spill to rootfs*/
-                                       };
-
-                                       rootfs@1280000 {
-                                               label = "rootfs1";
-                                               reg = <0x1280000 0x2500000>;
-                                       };
-
-                                       linux2@3780000 {
-                                               label = "kernel2";
-                                               reg = <0x3780000 0x2800000>;
-                                       };
-
-                                       rootfs2@3a80000 {
-                                               label = "rootfs2";
-                                               reg = <0x3a80000 0x2500000>;
-                                       };
-
-                                       syscfg@5f80000 {
-                                               label = "syscfg";
-                                               reg = <0x5f80000 0x2080000>;
-                                       };
-                               };
-                       };
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <4>;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-                       qcom,phy_mdio_addr = <4>;
-                       qcom,poll_required = <1>;
-                       qcom,rgmii_delay = <0>;
-                       qcom,emulation = <0>;
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-               //lan
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-                       qcom,phy_mdio_addr = <0>;       /* none */
-                       qcom,poll_required = <0>;       /* no polling */
-                       qcom,rgmii_delay = <0>;
-                       qcom,emulation = <0>;
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               adm_dma: dma@18300000 {
-                       status = "okay";
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio65", "gpio67", "gpio68";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio6", "gpio53", "gpio54";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       nand_pins: nand_pins {
+               disable {
+                       pins = "gpio34", "gpio35", "gpio36",
+                                       "gpio37", "gpio38";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
+               pullups {
+                       pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                                       "gpio43", "gpio44", "gpio45",
+                                       "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-bus-hold;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+};
+
+&usb3_1 {
+       status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+       force_gen1 = <1>;
+};
+
+&pcie1 {
+       status = "okay";
+};
+
+&pcie2 {
+       status = "okay";
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       SBL1@0 {
+                               label = "SBL1";
+                               reg = <0x0000000 0x0040000>;
+                               read-only;
+                       };
+
+                       MIBIB@40000 {
+                               label = "MIBIB";
+                               reg = <0x0040000 0x0140000>;
+                               read-only;
+                       };
+
+                       SBL2@180000 {
+                               label = "SBL2";
+                               reg = <0x0180000 0x0140000>;
+                               read-only;
+                       };
+
+                       SBL3@2c0000 {
+                               label = "SBL3";
+                               reg = <0x02c0000 0x0280000>;
+                               read-only;
+                       };
+
+                       DDRCONFIG@540000 {
+                               label = "DDRCONFIG";
+                               reg = <0x0540000 0x0120000>;
+                               read-only;
+                       };
+
+                       SSD@660000 {
+                               label = "SSD";
+                               reg = <0x0660000 0x0120000>;
+                               read-only;
+                       };
+
+                       TZ@780000 {
+                               label = "TZ";
+                               reg = <0x0780000 0x0280000>;
+                               read-only;
+                       };
+
+                       RPM@a00000 {
+                               label = "RPM";
+                               reg = <0x0a00000 0x0280000>;
+                               read-only;
+                       };
+
+                       art: art@c80000 {
+                               label = "art";
+                               reg = <0x0c80000 0x0140000>;
+                               read-only;
+                       };
+
+                       APPSBL@dc0000 {
+                               label = "APPSBL";
+                               reg = <0x0dc0000 0x0100000>;
+                               read-only;
+                       };
+
+                       u_env@ec0000 {
+                               label = "u_env";
+                               reg = <0x0ec0000 0x0040000>;
+                       };
+
+                       s_env@f00000 {
+                               label = "s_env";
+                               reg = <0x0f00000 0x0040000>;
+                       };
+
+                       devinfo@f40000 {
+                               label = "devinfo";
+                               reg = <0x0f40000 0x0040000>;
+                       };
+
+                       linux@f80000 {
+                               label = "kernel1";
+                               reg = <0x0f80000 0x2800000>;  /* 3 MB spill to rootfs*/
+                       };
+
+                       rootfs@1280000 {
+                               label = "rootfs1";
+                               reg = <0x1280000 0x2500000>;
+                       };
+
+                       linux2@3780000 {
+                               label = "kernel2";
+                               reg = <0x3780000 0x2800000>;
+                       };
+
+                       rootfs2@3a80000 {
+                               label = "rootfs2";
+                               reg = <0x3a80000 0x2500000>;
+                       };
+
+                       syscfg@5f80000 {
+                               label = "syscfg";
+                               reg = <0x5f80000 0x2080000>;
+                       };
+               };
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+       qcom,phy_mdio_addr = <4>;
+       qcom,poll_required = <1>;
+       qcom,rgmii_delay = <0>;
+       qcom,emulation = <0>;
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+/* LAN */
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+       qcom,phy_mdio_addr = <0>;       /* none */
+       qcom,poll_required = <0>;       /* no polling */
+       qcom,rgmii_delay = <0>;
+       qcom,emulation = <0>;
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&adm_dma {
+       status = "okay";
+};
index 6cd781d06e2ad716f9beeff2e4916a1b8449611c..aab7b253ef3933b27f19f5e1df19a44051089bd4 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio6", "gpio54", "gpio65";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-                                               "gpio24","gpio26", "gpio53", "gpio64";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       nand_pins: nand_pins {
-                               disable {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               pullups {
-                                       pins = "gpio39";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-bus-hold;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       clocks = <&gcc USB30_1_MASTER_CLK>;
-                       status = "okay";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       clocks = <&gcc USB30_0_MASTER_CLK>;
-                       status = "okay";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       force_gen1 = <1>;
-               };
-
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       nand@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       qcadata@0 {
-                                               label = "qcadata";
-                                               reg = <0x0000000 0x0c80000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@c80000 {
-                                               label = "APPSBL";
-                                               reg = <0x0c80000 0x0500000>;
-                                               read-only;
-                                       };
-
-                                       APPSBLENV@1180000 {
-                                               label = "APPSBLENV";
-                                               reg = <0x1180000 0x0080000>;
-                                               read-only;
-                                       };
-
-                                       art: art@1200000 {
-                                               label = "art";
-                                               reg = <0x1200000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       kernel@1340000 {
-                                               label = "kernel";
-                                               reg = <0x1340000 0x0400000>;
-                                       };
-
-                                       ubi@1740000 {
-                                               label = "ubi";
-                                               reg = <0x1740000 0x1600000>;
-                                       };
-
-                                       netgear@2d40000 {
-                                               label = "netgear";
-                                               reg = <0x2d40000 0x0c00000>;
-                                               read-only;
-                                       };
-
-                                       reserve@3940000 {
-                                               label = "reserve";
-                                               reg = <0x3940000 0x46c0000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        };
                };
 
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       mtd-mac-address = <&art 6>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-
-                       mtd-mac-address = <&art 0>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio6", "gpio54", "gpio65";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
+                               "gpio24","gpio26", "gpio53", "gpio64";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       nand_pins: nand_pins {
+               disable {
+                       pins = "gpio34", "gpio35", "gpio36",
+                                       "gpio37", "gpio38";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
+               pullups {
+                       pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                                       "gpio43", "gpio44", "gpio45",
+                                       "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-bus-hold;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
+};
+
+&usb3_0 {
+       clocks = <&gcc USB30_1_MASTER_CLK>;
+       status = "okay";
+};
+
+&usb3_1 {
+       clocks = <&gcc USB30_0_MASTER_CLK>;
+       status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
+
+&pcie1 {
+       status = "okay";
+       force_gen1 = <1>;
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       qcadata@0 {
+                               label = "qcadata";
+                               reg = <0x0000000 0x0c80000>;
+                               read-only;
+                       };
+
+                       APPSBL@c80000 {
+                               label = "APPSBL";
+                               reg = <0x0c80000 0x0500000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@1180000 {
+                               label = "APPSBLENV";
+                               reg = <0x1180000 0x0080000>;
+                               read-only;
+                       };
+
+                       art: art@1200000 {
+                               label = "art";
+                               reg = <0x1200000 0x0140000>;
+                               read-only;
+                       };
+
+                       kernel@1340000 {
+                               label = "kernel";
+                               reg = <0x1340000 0x0400000>;
+                       };
+
+                       ubi@1740000 {
+                               label = "ubi";
+                               reg = <0x1740000 0x1600000>;
+                       };
+
+                       netgear@2d40000 {
+                               label = "netgear";
+                               reg = <0x2d40000 0x0c00000>;
+                               read-only;
+                       };
+
+                       reserve@3940000 {
+                               label = "reserve";
+                               reg = <0x3940000 0x46c0000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       mtd-mac-address = <&art 6>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+
+       mtd-mac-address = <&art 0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
 &tcsr {
        qcom,usb-ctrl-select = <TCSR_USB_SELECT_USB3_DUAL>;
        compatible = "qcom,tcsr";
index 283ececd76804cfe67c2a2ab90ea9afa9bceb970..8c3568212328aeb5465e387e9b4aae3dfcd096a2 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio6", "gpio54", "gpio65";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-                                               "gpio24","gpio26", "gpio53", "gpio64";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       nand_pins: nand_pins {
-                               disable {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               pullups {
-                                       pins = "gpio39";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-bus-hold;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       usb0_pwr_en_pins: usb0_pwr_en_pins {
-                               mux {
-                                       pins = "gpio15";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-
-                       usb1_pwr_en_pins: usb1_pwr_en_pins {
-                               mux {
-                                       pins = "gpio16", "gpio68";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb0_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb1_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-                       reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
-                       pinctrl-0 = <&pcie0_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
-                       pinctrl-0 = <&pcie1_pins>;
-                       pinctrl-names = "default";
-                       force_gen1 = <1>;
-               };
-
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       nand@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       qcadata@0 {
-                                               label = "qcadata";
-                                               reg = <0x0000000 0x0c80000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@c80000 {
-                                               label = "APPSBL";
-                                               reg = <0x0c80000 0x0500000>;
-                                               read-only;
-                                       };
-
-                                       APPSBLENV@1180000 {
-                                               label = "APPSBLENV";
-                                               reg = <0x1180000 0x0080000>;
-                                               read-only;
-                                       };
-
-                                       art: art@1200000 {
-                                               label = "art";
-                                               reg = <0x1200000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       artbak: art@1340000 {
-                                               label = "artbak";
-                                               reg = <0x1340000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       kernel@1480000 {
-                                               label = "kernel";
-                                               reg = <0x1480000 0x0400000>;
-                                       };
-
-                                       ubi@1880000 {
-                                               label = "ubi";
-                                               reg = <0x1880000 0x6080000>;
-                                       };
-
-                                       reserve@7900000 {
-                                               label = "reserve";
-                                               reg = <0x7900000 0x0700000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <4>;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       mtd-mac-address = <&art 6>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-
-                       mtd-mac-address = <&art 0>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
        };
 
        keys {
 &adm_dma {
        status = "okay";
 };
+
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio6", "gpio54", "gpio65";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
+                               "gpio24","gpio26", "gpio53", "gpio64";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       nand_pins: nand_pins {
+               disable {
+                       pins = "gpio34", "gpio35", "gpio36",
+                                       "gpio37", "gpio38";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
+               pullups {
+                       pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                                       "gpio43", "gpio44", "gpio45",
+                                       "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-bus-hold;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       usb0_pwr_en_pins: usb0_pwr_en_pins {
+               mux {
+                       pins = "gpio15";
+                       function = "gpio";
+                       drive-strength = <12>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+
+       usb1_pwr_en_pins: usb1_pwr_en_pins {
+               mux {
+                       pins = "gpio16", "gpio68";
+                       function = "gpio";
+                       drive-strength = <12>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+
+       pinctrl-0 = <&usb0_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&usb3_1 {
+       status = "okay";
+
+       pinctrl-0 = <&usb1_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie0 {
+       status = "okay";
+       reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
+       pinctrl-0 = <&pcie0_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie1 {
+       status = "okay";
+       reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
+       pinctrl-0 = <&pcie1_pins>;
+       pinctrl-names = "default";
+       force_gen1 = <1>;
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       qcadata@0 {
+                               label = "qcadata";
+                               reg = <0x0000000 0x0c80000>;
+                               read-only;
+                       };
+
+                       APPSBL@c80000 {
+                               label = "APPSBL";
+                               reg = <0x0c80000 0x0500000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@1180000 {
+                               label = "APPSBLENV";
+                               reg = <0x1180000 0x0080000>;
+                               read-only;
+                       };
+
+                       art: art@1200000 {
+                               label = "art";
+                               reg = <0x1200000 0x0140000>;
+                               read-only;
+                       };
+
+                       artbak: art@1340000 {
+                               label = "artbak";
+                               reg = <0x1340000 0x0140000>;
+                               read-only;
+                       };
+
+                       kernel@1480000 {
+                               label = "kernel";
+                               reg = <0x1480000 0x0400000>;
+                       };
+
+                       ubi@1880000 {
+                               label = "ubi";
+                               reg = <0x1880000 0x6080000>;
+                       };
+
+                       reserve@7900000 {
+                               label = "reserve";
+                               reg = <0x7900000 0x0700000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       mtd-mac-address = <&art 6>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+
+       mtd-mac-address = <&art 0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
\ No newline at end of file
index ef31bf00b04dfeb9ecacfd67e46712c0a3b905c8..22937599e5c27f7ab3bd7135570a7b286896954e 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio7", "gpio8", "gpio9", "gpio16", "gpio17",
-                                               "gpio26", "gpio53", "gpio56", "gpio66";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       bias-pull-down;
-                               };
-
-                               data {
-                                       pins = "gpio18", "gpio19";
-                                       drive-strength = <10>;
-                               };
-
-                               cs {
-                                       pins = "gpio20";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               clk {
-                                       pins = "gpio21";
-                                       drive-strength = <12>;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "okay";
-
-                       spi4: spi@1a280000 {
-                               status = "okay";
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-                               W25Q128@0 {
-                                       compatible = "jedec,spi-nor";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
-
-                                       SBL1@0 {
-                                               label = "SBL1";
-                                               reg = <0x0 0x20000>;
-                                               read-only;
-                                       };
-
-                                       MIBIB@20000 {
-                                               label = "MIBIB";
-                                               reg = <0x20000 0x20000>;
-                                               read-only;
-                                       };
-
-                                       SBL2@40000 {
-                                               label = "SBL2";
-                                               reg = <0x40000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       SBL3@80000 {
-                                               label = "SBL3";
-                                               reg = <0x80000 0x80000>;
-                                               read-only;
-                                       };
-
-                                       DDRCONFIG@100000 {
-                                               label = "DDRCONFIG";
-                                               reg = <0x100000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       SSD@110000 {
-                                               label = "SSD";
-                                               reg = <0x110000 0x10000>;
-                                               read-only;
-                                       };
-
-                                       TZ@120000 {
-                                               label = "TZ";
-                                               reg = <0x120000 0x80000>;
-                                               read-only;
-                                       };
-
-                                       RPM@1a0000 {
-                                               label = "RPM";
-                                               reg = <0x1a0000 0x80000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@220000 {
-                                               label = "APPSBL";
-                                               reg = <0x220000 0x80000>;
-                                               read-only;
-                                       };
-
-                                       APPSBLENV@2a0000 {
-                                               label = "APPSBLENV";
-                                               reg = <0x2a0000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       OLDART@2e0000 {
-                                               label = "OLDART";
-                                               reg = <0x2e0000 0x40000>;
-                                               read-only;
-                                       };
-
-                                       kernel@320000 {
-                                               label = "kernel";
-                                               reg = <0x320000 0x300000>;
-                                       };
-
-                                       rootfs@620000 {
-                                               label = "rootfs";
-                                               reg = <0x620000 0x960000>;
-                                       };
-
-                                       defaultmac: default-mac@0xfaf100 {
-                                               label = "default-mac";
-                                               reg = <0xfaf100 0x00200>;
-                                               read-only;
-                                       };
-
-                                       ART@fc0000 {
-                                               label = "ART";
-                                               reg = <0xfc0000 0x40000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       force_gen1 = <1>;
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                reg = <4>;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       mtd-mac-address = <&defaultmac 0>;
-                       mtd-mac-address-increment = <1>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-
-                       mtd-mac-address = <&defaultmac 0>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio7", "gpio8", "gpio9", "gpio16", "gpio17",
+                               "gpio26", "gpio53", "gpio56", "gpio66";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio54", "gpio64", "gpio65", "gpio67", "gpio68";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       spi_pins: spi_pins {
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       bias-pull-down;
+               };
+
+               data {
+                       pins = "gpio18", "gpio19";
+                       drive-strength = <10>;
+               };
+
+               cs {
+                       pins = "gpio20";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               clk {
+                       pins = "gpio21";
+                       drive-strength = <12>;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       status = "okay";
+
+       spi4: spi@1a280000 {
+               status = "okay";
+
+               pinctrl-0 = <&spi_pins>;
+               pinctrl-names = "default";
+
+               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
+
+               W25Q128@0 {
+                       compatible = "jedec,spi-nor";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       spi-max-frequency = <50000000>;
+                       reg = <0>;
+
+                       SBL1@0 {
+                               label = "SBL1";
+                               reg = <0x0 0x20000>;
+                               read-only;
+                       };
+
+                       MIBIB@20000 {
+                               label = "MIBIB";
+                               reg = <0x20000 0x20000>;
+                               read-only;
+                       };
+
+                       SBL2@40000 {
+                               label = "SBL2";
+                               reg = <0x40000 0x40000>;
+                               read-only;
+                       };
+
+                       SBL3@80000 {
+                               label = "SBL3";
+                               reg = <0x80000 0x80000>;
+                               read-only;
+                       };
+
+                       DDRCONFIG@100000 {
+                               label = "DDRCONFIG";
+                               reg = <0x100000 0x10000>;
+                               read-only;
+                       };
+
+                       SSD@110000 {
+                               label = "SSD";
+                               reg = <0x110000 0x10000>;
+                               read-only;
+                       };
+
+                       TZ@120000 {
+                               label = "TZ";
+                               reg = <0x120000 0x80000>;
+                               read-only;
+                       };
+
+                       RPM@1a0000 {
+                               label = "RPM";
+                               reg = <0x1a0000 0x80000>;
+                               read-only;
+                       };
+
+                       APPSBL@220000 {
+                               label = "APPSBL";
+                               reg = <0x220000 0x80000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@2a0000 {
+                               label = "APPSBLENV";
+                               reg = <0x2a0000 0x40000>;
+                               read-only;
+                       };
+
+                       OLDART@2e0000 {
+                               label = "OLDART";
+                               reg = <0x2e0000 0x40000>;
+                               read-only;
+                       };
+
+                       kernel@320000 {
+                               label = "kernel";
+                               reg = <0x320000 0x300000>;
+                       };
+
+                       rootfs@620000 {
+                               label = "rootfs";
+                               reg = <0x620000 0x960000>;
+                       };
+
+                       defaultmac: default-mac@0xfaf100 {
+                               label = "default-mac";
+                               reg = <0xfaf100 0x00200>;
+                               read-only;
+                       };
+
+                       ART@fc0000 {
+                               label = "ART";
+                               reg = <0xfc0000 0x40000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&usb3_0 {
+       status = "okay";
+};
+
+&usb3_1 {
+       status = "okay";
+};
+
+&pcie0 {
+       status = "okay";
+};
+
+&pcie1 {
+       status = "okay";
+       force_gen1 = <1>;
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       mtd-mac-address = <&defaultmac 0>;
+       mtd-mac-address-increment = <1>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+
+       mtd-mac-address = <&defaultmac 0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
index a72395fb4658de12be0b065fb7618ee09c37276d..3fe99b82e84615af815310e88e8773ba9dceed5d 100644 (file)
        };
 
        soc {
-               rpm@108000 {
-                       pinctrl-0 = <&rpm_pins>;
-                       pinctrl-names = "default";
-               };
 
-               nand-controller@1ac00000 {
-                       status = "okay";
+               mdio0: mdio@37000000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
 
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
+                       compatible = "qcom,ipq8064-mdio", "syscon";
+                       reg = <0x37000000 0x200000>;
+                       resets = <&gcc GMAC_CORE1_RESET>;
+                       reset-names = "stmmaceth";
+                       clocks = <&gcc GMAC_CORE1_CLK>;
+                       clock-names = "stmmaceth";
 
-                       mt29f2g08abbeah4@0 {
-                               compatible = "qcom,nandcs";
+                       pinctrl-0 = <&mdio0_pins>;
+                       pinctrl-names = "default";
 
+                       ethernet-phy@0 {
                                reg = <0>;
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       SBL1@0 {
-                                               label = "SBL1";
-                                               reg = <0x0000000 0x0040000>;
-                                               read-only;
-                                       };
-
-                                       MIBIB@40000 {
-                                               label = "MIBIB";
-                                               reg = <0x0040000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       SBL2@180000 {
-                                               label = "SBL2";
-                                               reg = <0x0180000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       SBL3@2c0000 {
-                                               label = "SBL3";
-                                               reg = <0x02c0000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       DDRCONFIG@540000 {
-                                               label = "DDRCONFIG";
-                                               reg = <0x0540000 0x0120000>;
-                                               read-only;
-                                       };
-
-                                       SSD@660000 {
-                                               label = "SSD";
-                                               reg = <0x0660000 0x0120000>;
-                                               read-only;
-                                       };
-
-                                       TZ@780000 {
-                                               label = "TZ";
-                                               reg = <0x0780000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       RPM@a00000 {
-                                               label = "RPM";
-                                               reg = <0x0a00000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@c80000 {
-                                               label = "APPSBL";
-                                               reg = <0x0c80000 0x0500000>;
-                                               read-only;
-                                       };
-
-                                       APPSBLENV@1180000 {
-                                               label = "APPSBLENV";
-                                               reg = <0x1180000 0x0080000>;
-                                       };
-
-                                       ART@1200000 {
-                                               label = "ART";
-                                               reg = <0x1200000 0x0140000>;
-                                       };
-
-                                       ubi@1340000 {
-                                               label = "ubi";
-                                               reg = <0x1340000 0x4000000>;
-                                       };
-
-                                       BOOTCONFIG@5340000 {
-                                               label = "BOOTCONFIG";
-                                               reg = <0x5340000 0x0060000>;
-                                       };
-
-                                       SBL2-1@53a0000- {
-                                               label = "SBL2_1";
-                                               reg = <0x53a0000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       SBL3-1@54e0000 {
-                                               label = "SBL3_1";
-                                               reg = <0x54e0000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       DDRCONFIG-1@5760000 {
-                                               label = "DDRCONFIG_1";
-                                               reg = <0x5760000 0x0120000>;
-                                               read-only;
-                                       };
-
-                                       SSD-1@5880000 {
-                                               label = "SSD_1";
-                                               reg = <0x5880000 0x0120000>;
-                                               read-only;
-                                       };
-
-                                       TZ-1@59a0000 {
-                                               label = "TZ_1";
-                                               reg = <0x59a0000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       RPM-1@5c20000 {
-                                               label = "RPM_1";
-                                               reg = <0x5c20000 0x0280000>;
-                                               read-only;
-                                       };
-
-                                       BOOTCONFIG1@5ea0000 {
-                                               label = "BOOTCONFIG1";
-                                               reg = <0x5ea0000 0x0060000>;
-                                       };
-
-                                       APPSBL-1@5f00000 {
-                                               label = "APPSBL_1";
-                                               reg = <0x5f00000 0x0500000>;
-                                               read-only;
-                                       };
-
-                                       ubi-1@6400000 {
-                                               label = "ubi_1";
-                                               reg = <0x6400000 0x4000000>;
-                                       };
-
-                                       unused@a400000 {
-                                               label = "unused";
-                                               reg = <0xa400000 0x5c00000>;
-                                       };
-                               };
+                               qca,ar8327-initvals = <
+                                       0x00004 0x7600000   /* PAD0_MODE */
+                                       0x00008 0x1000000   /* PAD5_MODE */
+                                       0x0000c 0x80        /* PAD6_MODE */
+                                       0x000e4 0x6a545     /* MAC_POWER_SEL */
+                                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                                       0x0007c 0x4e        /* PORT0_STATUS */
+                                       0x00094 0x4e        /* PORT6_STATUS */
+                                       >;
                        };
-               };
-       };
-
-       mdio0: mdio@37000000 {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               compatible = "qcom,ipq8064-mdio", "syscon";
-               reg = <0x37000000 0x200000>;
-               resets = <&gcc GMAC_CORE1_RESET>;
-               reset-names = "stmmaceth";
-               clocks = <&gcc GMAC_CORE1_CLK>;
-               clock-names = "stmmaceth";
 
-               pinctrl-0 = <&mdio0_pins>;
-               pinctrl-names = "default";
-
-               ethernet-phy@0 {
-                       reg = <0>;
-                       qca,ar8327-initvals = <
-                               0x00004 0x7600000   /* PAD0_MODE */
-                               0x00008 0x1000000   /* PAD5_MODE */
-                               0x0000c 0x80        /* PAD6_MODE */
-                               0x000e4 0x6a545     /* MAC_POWER_SEL */
-                               0x000e0 0xc74164de  /* SGMII_CTRL */
-                               0x0007c 0x4e        /* PORT0_STATUS */
-                               0x00094 0x4e        /* PORT6_STATUS */
-                               >;
+                       ethernet-phy@4 {
+                               reg = <4>;
+                       };
                };
 
-               ethernet-phy@4 {
-                       reg = <4>;
-               };
        };
 
        leds {
        };
 };
 
+&rpm {
+       pinctrl-0 = <&rpm_pins>;
+       pinctrl-names = "default";
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       mt29f2g08abbeah4@0 {
+               compatible = "qcom,nandcs";
+
+               reg = <0>;
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       SBL1@0 {
+                               label = "SBL1";
+                               reg = <0x0000000 0x0040000>;
+                               read-only;
+                       };
+
+                       MIBIB@40000 {
+                               label = "MIBIB";
+                               reg = <0x0040000 0x0140000>;
+                               read-only;
+                       };
+
+                       SBL2@180000 {
+                               label = "SBL2";
+                               reg = <0x0180000 0x0140000>;
+                               read-only;
+                       };
+
+                       SBL3@2c0000 {
+                               label = "SBL3";
+                               reg = <0x02c0000 0x0280000>;
+                               read-only;
+                       };
+
+                       DDRCONFIG@540000 {
+                               label = "DDRCONFIG";
+                               reg = <0x0540000 0x0120000>;
+                               read-only;
+                       };
+
+                       SSD@660000 {
+                               label = "SSD";
+                               reg = <0x0660000 0x0120000>;
+                               read-only;
+                       };
+
+                       TZ@780000 {
+                               label = "TZ";
+                               reg = <0x0780000 0x0280000>;
+                               read-only;
+                       };
+
+                       RPM@a00000 {
+                               label = "RPM";
+                               reg = <0x0a00000 0x0280000>;
+                               read-only;
+                       };
+
+                       APPSBL@c80000 {
+                               label = "APPSBL";
+                               reg = <0x0c80000 0x0500000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@1180000 {
+                               label = "APPSBLENV";
+                               reg = <0x1180000 0x0080000>;
+                       };
+
+                       ART@1200000 {
+                               label = "ART";
+                               reg = <0x1200000 0x0140000>;
+                       };
+
+                       ubi@1340000 {
+                               label = "ubi";
+                               reg = <0x1340000 0x4000000>;
+                       };
+
+                       BOOTCONFIG@5340000 {
+                               label = "BOOTCONFIG";
+                               reg = <0x5340000 0x0060000>;
+                       };
+
+                       SBL2-1@53a0000- {
+                               label = "SBL2_1";
+                               reg = <0x53a0000 0x0140000>;
+                               read-only;
+                       };
+
+                       SBL3-1@54e0000 {
+                               label = "SBL3_1";
+                               reg = <0x54e0000 0x0280000>;
+                               read-only;
+                       };
+
+                       DDRCONFIG-1@5760000 {
+                               label = "DDRCONFIG_1";
+                               reg = <0x5760000 0x0120000>;
+                               read-only;
+                       };
+
+                       SSD-1@5880000 {
+                               label = "SSD_1";
+                               reg = <0x5880000 0x0120000>;
+                               read-only;
+                       };
+
+                       TZ-1@59a0000 {
+                               label = "TZ_1";
+                               reg = <0x59a0000 0x0280000>;
+                               read-only;
+                       };
+
+                       RPM-1@5c20000 {
+                               label = "RPM_1";
+                               reg = <0x5c20000 0x0280000>;
+                               read-only;
+                       };
+
+                       BOOTCONFIG1@5ea0000 {
+                               label = "BOOTCONFIG1";
+                               reg = <0x5ea0000 0x0060000>;
+                       };
+
+                       APPSBL-1@5f00000 {
+                               label = "APPSBL_1";
+                               reg = <0x5f00000 0x0500000>;
+                               read-only;
+                       };
+
+                       ubi-1@6400000 {
+                               label = "ubi_1";
+                               reg = <0x6400000 0x4000000>;
+                       };
+
+                       unused@a400000 {
+                               label = "unused";
+                               reg = <0xa400000 0x5c00000>;
+                       };
+               };
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
        status = "okay";
 };
 
-
 &usb3_1 {
        status = "okay";
 };
index 401cd0c7f72b508240e61b971a4ffb16a86b5a1f..0cc1b7965f1aa23b811d6ba20d0fbd85828a2416 100644 (file)
        };
 
        soc {
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       cs@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       ubi@0 {
-                                               label = "ubi";
-                                               reg = <0x0000000 0x4000000>;
-                                       };
-
-                                       rootfs_1@4000000 {
-                                               label = "rootfs_1";
-                                               reg = <0x4000000 0x4000000>;
-                                       };
-                               };
-                       };
-               };
 
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
        };
 };
 
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       cs@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       ubi@0 {
+                               label = "ubi";
+                               reg = <0x0000000 0x4000000>;
+                       };
+
+                       rootfs_1@4000000 {
+                               label = "rootfs_1";
+                               reg = <0x4000000 0x4000000>;
+                       };
+               };
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
index 3e0d84d7eb50328ad6d9a0d8a2b0d250e3b073de..8b45f20d5398e549831480db9503828f774f56e6 100644 (file)
                        };
                };
 
-               rpm@108000 {
+               rpm: rpm@108000 {
                        compatible = "qcom,rpm-ipq8064";
                        reg = <0x108000 0x1000>;
                        qcom,ipc = <&l2cc 0x8 2>;
 
                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                                        <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
+                                        <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "ack",
                                          "err",
                                          "wakeup";
                        leds_pins: leds_pins {
                                mux {
                                        pins = "gpio7", "gpio8", "gpio9",
-                                              "gpio26", "gpio53";
+                                                  "gpio26", "gpio53";
                                        function = "gpio";
                                        drive-strength = <2>;
                                        bias-pull-down;
                        interrupt-controller;
                        #interrupt-cells = <3>;
                        reg = <0x02000000 0x1000>,
-                             <0x02002000 0x1000>;
+                                 <0x02002000 0x1000>;
                };
 
                timer@200a000 {
                        compatible = "qcom,kpss-timer", "qcom,msm-timer";
                        interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) |
                                                 IRQ_TYPE_EDGE_RISING)>,
-                                    <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) |
+                                        <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) |
                                                 IRQ_TYPE_EDGE_RISING)>,
-                                    <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) |
+                                        <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) |
                                                 IRQ_TYPE_EDGE_RISING)>,
-                                    <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) |
+                                        <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) |
                                                 IRQ_TYPE_EDGE_RISING)>,
-                                    <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) |
+                                        <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) |
                                                 IRQ_TYPE_EDGE_RISING)>;
                        reg = <0x0200a000 0x100>;
                        clock-frequency = <25000000>,
                        uart2: serial@12490000 {
                                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                                reg = <0x12490000 0x1000>,
-                                     <0x12480000 0x1000>;
+                                         <0x12480000 0x1000>;
                                interrupts = <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>;
                                clock-names = "core", "iface";
                        gsbi4_serial: serial@16340000 {
                                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                                reg = <0x16340000 0x1000>,
-                                     <0x16300000 0x1000>;
+                                         <0x16300000 0x1000>;
                                interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;
                                clock-names = "core", "iface";
                        uart5: serial@1a240000 {
                                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                                reg = <0x1a240000 0x1000>,
-                                     <0x1a200000 0x1000>;
+                                         <0x1a200000 0x1000>;
                                interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;
                                clock-names = "core", "iface";
                        gsbi7_serial: serial@16640000 {
                                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                                reg = <0x16640000 0x1000>,
-                                     <0x16600000 0x1000>;
+                                         <0x16600000 0x1000>;
                                interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>;
                                clock-names = "core", "iface";
                pcie0: pci@1b500000 {
                        compatible = "qcom,pcie-ipq8064";
                        reg = <0x1b500000 0x1000
-                              0x1b502000 0x80
-                              0x1b600000 0x100
-                              0x0ff00000 0x100000>;
+                                  0x1b502000 0x80
+                                  0x1b600000 0x100
+                                  0x0ff00000 0x100000>;
                        reg-names = "dbi", "elbi", "parf", "config";
                        device_type = "pci";
                        linux,pci-domain = <0>;
                pcie1: pci@1b700000 {
                        compatible = "qcom,pcie-ipq8064";
                        reg = <0x1b700000 0x1000
-                              0x1b702000 0x80
-                              0x1b800000 0x100
-                              0x31f00000 0x100000>;
+                                  0x1b702000 0x80
+                                  0x1b800000 0x100
+                                  0x31f00000 0x100000>;
                        reg-names = "dbi", "elbi", "parf", "config";
                        device_type = "pci";
                        linux,pci-domain = <1>;
                pcie2: pci@1b900000 {
                        compatible = "qcom,pcie-ipq8064";
                        reg = <0x1b900000 0x1000
-                              0x1b902000 0x80
-                              0x1ba00000 0x100
-                              0x35f00000 0x100000>;
+                                  0x1b902000 0x80
+                                  0x1ba00000 0x100
+                                  0x35f00000 0x100000>;
                        reg-names = "dbi", "elbi", "parf", "config";
                        device_type = "pci";
                        linux,pci-domain = <2>;
                        regulator-always-on;
                };
 
-               sdcc1bam:dma@12402000 {
+               sdcc1bam: dma@12402000 {
                        compatible = "qcom,bam-v1.3.0";
                        reg = <0x12402000 0x8000>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "bam_clk";
                        #dma-cells = <1>;
                        qcom,ee = <0>;
-                };
+               };
 
-               sdcc3bam:dma@12182000 {
+               sdcc3bam: dma@12182000 {
                        compatible = "qcom,bam-v1.3.0";
                        reg = <0x12182000 0x8000>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                        qcom,ee = <0>;
                };
 
-               amba {
+               amba: amba {
                        compatible = "arm,amba-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
index 65325164257fe9f9555daf7650def06f27aed4be..3a27bf3451bb131d68c2af39143dd18cdd37405f 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio53", "gpio54", "gpio65";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio9", "gpio26", "gpio33", "gpio64";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-down;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-
-                               clk {
-                                       pins = "gpio1";
-                                       input-disable;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-
-                               tx {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
-                                       input-disable;
-                               };
-                       };
-
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       drive-strength = <10>;
-                                       bias-none;
-                               };
-
-                               cs {
-                                       pins = "gpio20";
-                                       drive-strength = <12>;
-                               };
-                       };
-
-                       usb0_pwr_en_pins: usb0_pwr_en_pins {
-                               mux {
-                                       pins = "gpio16", "gpio17";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                               };
-
-                               pwr {
-                                       pins = "gpio17";
-                                       bias-pull-down;
-                                       output-high;
-                               };
-
-                               ovc {
-                                       pins = "gpio16";
-                                       bias-pull-up;
-                               };
-                       };
-
-                       usb1_pwr_en_pins: usb1_pwr_en_pins {
-                               mux {
-                                       pins = "gpio14", "gpio15";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                               };
-
-                               pwr {
-                                       pins = "gpio14";
-                                       bias-pull-down;
-                                       output-high;
-                               };
-
-                               ovc {
-                                       pins = "gpio15";
-                                       bias-pull-up;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "okay";
-
-                       spi4: spi@1a280000 {
-                               status = "okay";
-
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
-
-                               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-                               m25p80@0 {
-                                       compatible = "jedec,spi-nor";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <51200000>;
-                                       reg = <0>;
-
-                                       partitions {
-                                               compatible = "qcom,smem";
-                                       };
-                               };
-                       };
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb0_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb1_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-                       reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
-                       pinctrl-0 = <&pcie0_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
-                       pinctrl-0 = <&pcie1_pins>;
-                       pinctrl-names = "default";
-                       force_gen1 = <1>;
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        pinctrl-0 = <&mdio0_pins>;
                        pinctrl-names = "default";
 
+
                        phy0: ethernet-phy@0 {
                                reg = <0>;
                                qca,ar8327-initvals = <
                                        >;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-                       qcom,phy_mdio_addr = <4>;
-                       qcom,poll_required = <0>;
-                       qcom,rgmii_delay = <1>;
-                       qcom,phy_mii_type = <0>;
-                       qcom,emulation = <0>;
-                       qcom,irq = <255>;
-                       mdiobus = <&mdio0>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-                       qcom,phy_mdio_addr = <0>;       /* none */
-                       qcom,poll_required = <0>;       /* no polling */
-                       qcom,rgmii_delay = <0>;
-                       qcom,phy_mii_type = <1>;
-                       qcom,emulation = <0>;
-                       qcom,irq = <258>;
-                       mdiobus = <&mdio0>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               amba {
-                       sdcc1: sdcc@12400000 {
-                               status = "okay";
-                       };
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio53", "gpio54", "gpio65";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio9", "gpio26", "gpio33", "gpio64";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-down;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
+               clk {
+                       pins = "gpio1";
+                       input-disable;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
+               tx {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
+                       input-disable;
+               };
+       };
+
+       spi_pins: spi_pins {
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       drive-strength = <10>;
+                       bias-none;
+               };
+
+               cs {
+                       pins = "gpio20";
+                       drive-strength = <12>;
+               };
+       };
+
+       usb0_pwr_en_pins: usb0_pwr_en_pins {
+               mux {
+                       pins = "gpio16", "gpio17";
+                       function = "gpio";
+                       drive-strength = <12>;
+               };
+
+               pwr {
+                       pins = "gpio17";
+                       bias-pull-down;
+                       output-high;
+               };
+
+               ovc {
+                       pins = "gpio16";
+                       bias-pull-up;
+               };
+       };
+
+       usb1_pwr_en_pins: usb1_pwr_en_pins {
+               mux {
+                       pins = "gpio14", "gpio15";
+                       function = "gpio";
+                       drive-strength = <12>;
+               };
+
+               pwr {
+                       pins = "gpio14";
+                       bias-pull-down;
+                       output-high;
+               };
+
+               ovc {
+                       pins = "gpio15";
+                       bias-pull-up;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+               * The i2c device on gsbi4 should not be enabled.
+               * On ipq806x designs gsbi4 i2c is meant for exclusive
+               * RPM usage. Turning this on in kernel manifests as
+               * i2c failure for the RPM.
+               */
+};
+
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       status = "okay";
+
+       spi4: spi@1a280000 {
+               status = "okay";
+
+               pinctrl-0 = <&spi_pins>;
+               pinctrl-names = "default";
+
+               cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
+
+               m25p80@0 {
+                       compatible = "jedec,spi-nor";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       spi-max-frequency = <51200000>;
+                       reg = <0>;
+
+                       partitions {
+                               compatible = "qcom,smem";
+                       };
+               };
+       };
+};
+
+&usb3_0 {
+       status = "okay";
+
+       pinctrl-0 = <&usb0_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&usb3_1 {
+       status = "okay";
+
+       pinctrl-0 = <&usb1_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie0 {
+       status = "okay";
+       reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
+       pinctrl-0 = <&pcie0_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie1 {
+       status = "okay";
+       reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
+       pinctrl-0 = <&pcie1_pins>;
+       pinctrl-names = "default";
+       force_gen1 = <1>;
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+       qcom,phy_mdio_addr = <4>;
+       qcom,poll_required = <0>;
+       qcom,rgmii_delay = <1>;
+       qcom,phy_mii_type = <0>;
+       qcom,emulation = <0>;
+       qcom,irq = <255>;
+       mdiobus = <&mdio0>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+       qcom,phy_mdio_addr = <0>;       /* none */
+       qcom,poll_required = <0>;       /* no polling */
+       qcom,rgmii_delay = <0>;
+       qcom,phy_mii_type = <1>;
+       qcom,emulation = <0>;
+       qcom,irq = <258>;
+       mdiobus = <&mdio0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&amba {
+       sdcc1: sdcc@12400000 {
+               status = "okay";
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
index f345a33c2ecb40090836a36e7166146210beb736..e2a7e9e6a6ccf3c491668b2e85e3b2409fafaaad 100644 (file)
        };
 
        soc {
-               pinmux@800000 {
-                       button_pins: button_pins {
-                               mux {
-                                       pins = "gpio6", "gpio54", "gpio65";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       i2c4_pins: i2c4_pinmux {
-                               mux {
-                                       pins = "gpio12", "gpio13";
-                                       function = "gsbi4";
-                                       drive-strength = <12>;
-                                       bias-disable;
-                               };
-                       };
-
-                       led_pins: led_pins {
-                               mux {
-                                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
-                                               "gpio24","gpio26", "gpio53", "gpio64";
-                                       function = "gpio";
-                                       drive-strength = <2>;
-                                       bias-pull-down;
-                               };
-                       };
-
-                       nand_pins: nand_pins {
-                               disable {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               pullups {
-                                       pins = "gpio39";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-bus-hold;
-                               };
-                       };
-
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "mdio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-
-                               clk {
-                                       pins = "gpio1";
-                                       input-disable;
-                               };
-                       };
-
-                       rgmii2_pins: rgmii2_pins {
-                               mux {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-                                              "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-                                       function = "rgmii2";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-
-                               tx {
-                                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
-                                       input-disable;
-                               };
-                       };
-
-                       spi_pins: spi_pins {
-                               mux {
-                                       pins = "gpio18", "gpio19", "gpio21";
-                                       function = "gsbi5";
-                                       bias-pull-down;
-                               };
-
-                               data {
-                                       pins = "gpio18", "gpio19";
-                                       drive-strength = <10>;
-                               };
-
-                               cs {
-                                       pins = "gpio20";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-
-                               clk {
-                                       pins = "gpio21";
-                                       drive-strength = <12>;
-                               };
-                       };
-
-                       spi6_pins: spi6_pins {
-                               mux {
-                                       pins = "gpio55", "gpio56", "gpio58";
-                                       function = "gsbi6";
-                                       bias-pull-down;
-                               };
-
-                               mosi {
-                                       pins = "gpio55";
-                                       drive-strength = <12>;
-                               };
-
-                               miso {
-                                       pins = "gpio56";
-                                       drive-strength = <14>;
-                               };
-
-                               cs {
-                                       pins = "gpio57";
-                                       drive-strength = <12>;
-                                       bias-pull-up;
-                               };
-
-                               clk {
-                                       pins = "gpio58";
-                                       drive-strength = <12>;
-                               };
-
-                               reset {
-                                       pins = "gpio33";
-                                       drive-strength = <10>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-
-                       usb0_pwr_en_pins: usb0_pwr_en_pins {
-                               mux {
-                                       pins = "gpio15";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-
-                       usb1_pwr_en_pins: usb1_pwr_en_pins {
-                               mux {
-                                       pins = "gpio16", "gpio68";
-                                       function = "gpio";
-                                       drive-strength = <12>;
-                                       bias-pull-down;
-                                       output-high;
-                               };
-                       };
-               };
-
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
-                       /*
-                        * The i2c device on gsbi4 should not be enabled.
-                        * On ipq806x designs gsbi4 i2c is meant for exclusive
-                        * RPM usage. Turning this on in kernel manifests as
-                        * i2c failure for the RPM.
-                        */
-               };
-
-               sata-phy@1b400000 {
-                       status = "okay";
-               };
-
-               sata@29000000 {
-                       ports-implemented = <0x1>;
-                       status = "okay";
-               };
-
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb0_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-
-                       pinctrl-0 = <&usb1_pwr_en_pins>;
-                       pinctrl-names = "default";
-               };
-
-               pcie0: pci@1b500000 {
-                       status = "okay";
-
-                       bridge@0,0 {
-                               reg = <0x00000000 0 0 0 0>;
-                               #address-cells = <3>;
-                               #size-cells = <2>;
-                               ranges;
-
-                               wifi@1,0 {
-                                       compatible = "pci168c,0046";
-                                       reg = <0x00010000 0 0 0 0>;
-
-                                       mtd-mac-address = <&art 6>;
-                                       mtd-mac-address-increment = <(1)>;
-                               };
-                       };
-               };
-
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       force_gen1 = <1>;
-
-                       bridge@0,0 {
-                               reg = <0x00000000 0 0 0 0>;
-                               #address-cells = <3>;
-                               #size-cells = <2>;
-                               ranges;
-
-                               wifi@1,0 {
-                                       compatible = "pci168c,0046";
-                                       reg = <0x00010000 0 0 0 0>;
-
-                                       mtd-mac-address = <&art 6>;
-                                       mtd-mac-address-increment = <(2)>;
-                               };
-                       };
-               };
-
-               nand-controller@1ac00000 {
-                       status = "okay";
-
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
-
-                       nand@0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
-
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       qcadata@0 {
-                                               label = "qcadata";
-                                               reg = <0x0000000 0x0c80000>;
-                                               read-only;
-                                       };
-
-                                       APPSBL@c80000 {
-                                               label = "APPSBL";
-                                               reg = <0x0c80000 0x0500000>;
-                                               read-only;
-                                       };
-
-                                       APPSBLENV@1180000 {
-                                               label = "APPSBLENV";
-                                               reg = <0x1180000 0x0080000>;
-                                               read-only;
-                                       };
-
-                                       art: art@1200000 {
-                                               label = "art";
-                                               reg = <0x1200000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       artbak: art@1340000 {
-                                               label = "artbak";
-                                               reg = <0x1340000 0x0140000>;
-                                               read-only;
-                                       };
-
-                                       kernel@1480000 {
-                                               label = "kernel";
-                                               reg = <0x1480000 0x0400000>;
-                                       };
-
-                                       ubi@1880000 {
-                                               label = "ubi";
-                                               reg = <0x1880000 0x6080000>;
-                                       };
-
-                                       reserve@7900000 {
-                                               label = "reserve";
-                                               reg = <0x7900000 0x0700000>;
-                                               read-only;
-                                       };
-                               };
-                       };
-               };
-
                mdio0: mdio@37000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                                        >;
                        };
                };
-
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
-                       qcom,phy_mdio_addr = <4>;
-                       qcom,poll_required = <0>;
-                       qcom,rgmii_delay = <1>;
-                       qcom,phy_mii_type = <0>;
-                       qcom,emulation = <0>;
-                       qcom,irq = <255>;
-                       mdiobus = <&mdio0>;
-
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
-
-                       mtd-mac-address = <&art 6>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
-
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
-                       qcom,phy_mdio_addr = <0>;       /* none */
-                       qcom,poll_required = <0>;       /* no polling */
-                       qcom,rgmii_delay = <0>;
-                       qcom,phy_mii_type = <1>;
-                       qcom,emulation = <0>;
-                       qcom,irq = <258>;
-                       mdiobus = <&mdio0>;
-
-                       mtd-mac-address = <&art 0>;
-
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
        };
 
        keys {
        };
 };
 
+&qcom_pinmux {
+       button_pins: button_pins {
+               mux {
+                       pins = "gpio6", "gpio54", "gpio65";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       i2c4_pins: i2c4_pinmux {
+               mux {
+                       pins = "gpio12", "gpio13";
+                       function = "gsbi4";
+                       drive-strength = <12>;
+                       bias-disable;
+               };
+       };
+
+       led_pins: led_pins {
+               mux {
+                       pins = "gpio7", "gpio8", "gpio9", "gpio22", "gpio23",
+                               "gpio24","gpio26", "gpio53", "gpio64";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-down;
+               };
+       };
+
+       nand_pins: nand_pins {
+               disable {
+                       pins = "gpio34", "gpio35", "gpio36",
+                                       "gpio37", "gpio38";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+               pullups {
+                       pins = "gpio39";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                                       "gpio43", "gpio44", "gpio45",
+                                       "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-bus-hold;
+               };
+       };
+
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "mdio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
+               clk {
+                       pins = "gpio1";
+                       input-disable;
+               };
+       };
+
+       rgmii2_pins: rgmii2_pins {
+               mux {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
+                                       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
+                       function = "rgmii2";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
+               tx {
+                       pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
+                       input-disable;
+               };
+       };
+
+       spi_pins: spi_pins {
+               mux {
+                       pins = "gpio18", "gpio19", "gpio21";
+                       function = "gsbi5";
+                       bias-pull-down;
+               };
+
+               data {
+                       pins = "gpio18", "gpio19";
+                       drive-strength = <10>;
+               };
+
+               cs {
+                       pins = "gpio20";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               clk {
+                       pins = "gpio21";
+                       drive-strength = <12>;
+               };
+       };
+
+       spi6_pins: spi6_pins {
+               mux {
+                       pins = "gpio55", "gpio56", "gpio58";
+                       function = "gsbi6";
+                       bias-pull-down;
+               };
+
+               mosi {
+                       pins = "gpio55";
+                       drive-strength = <12>;
+               };
+
+               miso {
+                       pins = "gpio56";
+                       drive-strength = <14>;
+               };
+
+               cs {
+                       pins = "gpio57";
+                       drive-strength = <12>;
+                       bias-pull-up;
+               };
+
+               clk {
+                       pins = "gpio58";
+                       drive-strength = <12>;
+               };
+
+               reset {
+                       pins = "gpio33";
+                       drive-strength = <10>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+
+       usb0_pwr_en_pins: usb0_pwr_en_pins {
+               mux {
+                       pins = "gpio15";
+                       function = "gpio";
+                       drive-strength = <12>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+
+       usb1_pwr_en_pins: usb1_pwr_en_pins {
+               mux {
+                       pins = "gpio16", "gpio68";
+                       function = "gpio";
+                       drive-strength = <12>;
+                       bias-pull-down;
+                       output-high;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+
+       serial@16340000 {
+               status = "okay";
+       };
+
+       /*
+       * The i2c device on gsbi4 should not be enabled.
+       * On ipq806x designs gsbi4 i2c is meant for exclusive
+       * RPM usage. Turning this on in kernel manifests as
+       * i2c failure for the RPM.
+       */
+};
+
+&nand_controller {
+       status = "okay";
+
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
+
+       nand@0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
+
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       qcadata@0 {
+                               label = "qcadata";
+                               reg = <0x0000000 0x0c80000>;
+                               read-only;
+                       };
+
+                       APPSBL@c80000 {
+                               label = "APPSBL";
+                               reg = <0x0c80000 0x0500000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@1180000 {
+                               label = "APPSBLENV";
+                               reg = <0x1180000 0x0080000>;
+                               read-only;
+                       };
+
+                       art: art@1200000 {
+                               label = "art";
+                               reg = <0x1200000 0x0140000>;
+                               read-only;
+                       };
+
+                       artbak: art@1340000 {
+                               label = "artbak";
+                               reg = <0x1340000 0x0140000>;
+                               read-only;
+                       };
+
+                       kernel@1480000 {
+                               label = "kernel";
+                               reg = <0x1480000 0x0400000>;
+                       };
+
+                       ubi@1880000 {
+                               label = "ubi";
+                               reg = <0x1880000 0x6080000>;
+                       };
+
+                       reserve@7900000 {
+                               label = "reserve";
+                               reg = <0x7900000 0x0700000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
+       qcom,phy_mdio_addr = <4>;
+       qcom,poll_required = <0>;
+       qcom,rgmii_delay = <1>;
+       qcom,phy_mii_type = <0>;
+       qcom,emulation = <0>;
+       qcom,irq = <255>;
+       mdiobus = <&mdio0>;
+
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
+
+       mtd-mac-address = <&art 6>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
+       qcom,phy_mdio_addr = <0>;       /* none */
+       qcom,poll_required = <0>;       /* no polling */
+       qcom,rgmii_delay = <0>;
+       qcom,phy_mii_type = <1>;
+       qcom,emulation = <0>;
+       qcom,irq = <258>;
+       mdiobus = <&mdio0>;
+
+       mtd-mac-address = <&art 0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
+
 &adm_dma {
        status = "okay";
 };
+
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
+       ports-implemented = <0x1>;
+       status = "okay";
+};
+
+&usb3_0 {
+       status = "okay";
+       
+       pinctrl-0 = <&usb0_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&usb3_1 {
+       status = "okay";
+       
+       pinctrl-0 = <&usb1_pwr_en_pins>;
+       pinctrl-names = "default";
+};
+
+&pcie0 {
+       status = "okay";
+
+       bridge@0,0 {
+               reg = <0x00000000 0 0 0 0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               ranges;
+
+               wifi@1,0 {
+                       compatible = "pci168c,0046";
+                       reg = <0x00010000 0 0 0 0>;
+
+                       mtd-mac-address = <&art 6>;
+                       mtd-mac-address-increment = <(1)>;
+               };
+       };
+};
+
+&pcie1 {
+       status = "okay";
+       force_gen1 = <1>;
+
+       bridge@0,0 {
+               reg = <0x00000000 0 0 0 0>;
+               #address-cells = <3>;
+               #size-cells = <2>;
+               ranges;
+
+               wifi@1,0 {
+                       compatible = "pci168c,0046";
+                       reg = <0x00010000 0 0 0 0>;
+
+                       mtd-mac-address = <&art 6>;
+                       mtd-mac-address-increment = <(2)>;
+               };
+       };
+};