ipq806x: ap148: reorganize dts
authorChristian Lamparter <chunkeey@gmail.com>
Wed, 4 Dec 2019 01:28:22 +0000 (02:28 +0100)
committerPetr Štetiar <ynezz@true.cz>
Thu, 19 Dec 2019 21:41:57 +0000 (22:41 +0100)
Reorganize dts to use tags from ipq8064 dtsi

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ap148.dts

index 987731b04fbb53fc4acf4eae031117d75711e345..8ef5b92b527e8a3e91998d052e5f70bd71b54bf5 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 {
-                               mux {
-                                       pins = "gpio34", "gpio35", "gpio36",
-                                              "gpio37", "gpio38", "gpio39",
-                                              "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       function = "nand";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-                               pullups {
-                                       pins = "gpio39";
-                                       bias-pull-up;
-                               };
-                               hold {
-                                       pins = "gpio40", "gpio41", "gpio42",
-                                              "gpio43", "gpio44", "gpio45",
-                                              "gpio46", "gpio47";
-                                       bias-bus-hold;
-                               };
-                       };
+               mdio0: mdio {
+                       compatible = "virtual,mdio-gpio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
+                               <&qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
+                       pinctrl-0 = <&mdio0_pins>;
+                       pinctrl-names = "default";
 
-                       mdio0_pins: mdio0_pins {
-                               mux {
-                                       pins = "gpio0", "gpio1";
-                                       function = "gpio";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
+                       phy0: 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 */
+                                       >;
                        };
 
-                       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;
-                               };
+                       phy4: ethernet-phy@4 {
+                               reg = <4>;
                        };
                };
+       };
+};
 
-               gsbi@16300000 {
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       status = "okay";
-                       serial@16340000 {
-                               status = "okay";
-                       };
+&qcom_pinmux {
+       i2c4_pins: i2c4_pinmux {
+               pins = "gpio12", "gpio13";
+               function = "gsbi4";
+               bias-disable;
+       };
 
-                       /*
-                       * 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_pins: nand_pins {
+               mux {
+                       pins = "gpio34", "gpio35", "gpio36",
+                              "gpio37", "gpio38", "gpio39",
+                              "gpio40", "gpio41", "gpio42",
+                              "gpio43", "gpio44", "gpio45",
+                              "gpio46", "gpio47";
+                       function = "nand";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+               pullups {
+                       pins = "gpio39";
+                       bias-pull-up;
                };
+               hold {
+                       pins = "gpio40", "gpio41", "gpio42",
+                              "gpio43", "gpio44", "gpio45",
+                              "gpio46", "gpio47";
+                       bias-bus-hold;
+               };
+       };
 
-               gsbi5: gsbi@1a200000 {
-                       qcom,mode = <GSBI_PROT_SPI>;
-                       status = "okay";
+       mdio0_pins: mdio0_pins {
+               mux {
+                       pins = "gpio0", "gpio1";
+                       function = "gpio";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+       };
 
-                       spi4: spi@1a280000 {
-                               status = "okay";
-                               spi-max-frequency = <50000000>;
+       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;
+               };
+       };
+};
 
-                               pinctrl-0 = <&spi_pins>;
-                               pinctrl-names = "default";
+&adm_dma {
+       status = "okay";
+};
 
-                               cs-gpios = <&qcom_pinmux 20 0>;
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
 
-                               flash: m25p80@0 {
-                                       compatible = "s25fl256s1";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       spi-max-frequency = <50000000>;
-                                       reg = <0>;
+       serial@16340000 {
+               status = "okay";
+       };
 
-                                       partitions {
-                                               compatible = "qcom,smem";
-                                       };
-                               };
-                       };
-               };
+       /*
+       * 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";
-               };
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_SPI>;
+       status = "okay";
 
-               sata@29000000 {
-                       status = "okay";
-               };
+       spi4: spi@1a280000 {
+               status = "okay";
+               spi-max-frequency = <50000000>;
 
-               usb3_0: usb3@110f8800 {
-                       status = "okay";
-               };
+               pinctrl-0 = <&spi_pins>;
+               pinctrl-names = "default";
 
-               usb3_1: usb3@100f8800 {
-                       status = "okay";
-               };
+               cs-gpios = <&qcom_pinmux 20 0>;
 
-               pcie0: pci@1b500000 {
-                       status = "okay";
-               };
+               flash: m25p80@0 {
+                       compatible = "s25fl256s1";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       spi-max-frequency = <50000000>;
+                       reg = <0>;
 
-               pcie1: pci@1b700000 {
-                       status = "okay";
-                       force_gen1 = <1>;
+                       partitions {
+                               compatible = "qcom,smem";
+                       };
                };
+       };
+};
 
-               nand@1ac00000 {
-                       status = "okay";
+&usb3_0 {
+       status = "okay";
+};
 
-                       pinctrl-0 = <&nand_pins>;
-                       pinctrl-names = "default";
+&usb3_1 {
+       status = "okay";
+};
 
-                       cs0 {
-                               reg = <0>;
-                               compatible = "qcom,nandcs";
+&pcie0 {
+       status = "okay";
+};
 
-                               nand-ecc-strength = <4>;
-                               nand-bus-width = <8>;
-                               nand-ecc-step-size = <512>;
+&pcie1 {
+       status = "okay";
+       force_gen1 = <1>;
+};
 
-                               partitions {
-                                       compatible = "qcom,smem";
-                               };
-                       };
-               };
+&nand {
+       status = "okay";
 
-               mdio0: mdio {
-                       compatible = "virtual,mdio-gpio";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
-                       pinctrl-0 = <&mdio0_pins>;
-                       pinctrl-names = "default";
+       pinctrl-0 = <&nand_pins>;
+       pinctrl-names = "default";
 
-                       phy0: 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 */
-                                       >;
-                       };
+       cs0 {
+               reg = <0>;
+               compatible = "qcom,nandcs";
 
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
+               nand-ecc-strength = <4>;
+               nand-bus-width = <8>;
+               nand-ecc-step-size = <512>;
+
+               partitions {
+                       compatible = "qcom,smem";
                };
+       };
+};
 
-               gmac1: ethernet@37200000 {
-                       status = "okay";
-                       phy-mode = "rgmii";
-                       qcom,id = <1>;
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       qcom,id = <1>;
 
-                       pinctrl-0 = <&rgmii2_pins>;
-                       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii2_pins>;
+       pinctrl-names = "default";
 
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+};
 
-               gmac2: ethernet@37400000 {
-                       status = "okay";
-                       phy-mode = "sgmii";
-                       qcom,id = <2>;
+&gmac2 {
+       status = "okay";
+       phy-mode = "sgmii";
+       qcom,id = <2>;
 
-                       fixed-link {
-                               speed = <1000>;
-                               full-duplex;
-                       };
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
        };
 };
 
-&adm_dma {
+&sata_phy {
+       status = "okay";
+};
+
+&sata {
        status = "okay";
 };