ipq806x: move mdio node to ipq8064 dts
authorAnsuel Smith <ansuelsmth@gmail.com>
Tue, 3 Mar 2020 17:38:21 +0000 (18:38 +0100)
committerPetr Štetiar <ynezz@true.cz>
Tue, 3 Mar 2020 22:38:23 +0000 (23:38 +0100)
As mdio0 is used in every dts move it to general ipq8064
dts and use label to set device specific definition.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
15 files changed:
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
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-wg2600hp.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 cf39355897788c2d6b56075eb06089d40069a045..d55379380dbd95e35cc3e91319e3916e18f8ceef 100644 (file)
        chosen {
                stdout-path = "serial0:115200n8";
        };
-
-       soc {
-               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";
-
-                       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 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
 };
 
 &qcom_pinmux {
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index e114ff96e17f3bd5be6144e8d681f397558d276a..d6e6e000ca501cebbda311bc7f6f6890306d0c9d 100644 (file)
        chosen {
                stdout-path = "serial0:115200n8";
        };
-
-       soc {
-               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";
-
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               qca,ar8327-initvals = <
-                                       0x00004 0x7600000   /* PAD0_MODE */
-                                       0x00008 0x1000000   /* PAD5_MODE */
-                                       0x0000c 0x20080     /* PAD6_MODE */
-                                       0x000e4 0x6a545     /* MAC_POWER_SEL */
-                                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                                       0x0007c 0x4e        /* PORT0_STATUS */
-                                       0x00094 0x4e        /* PORT6_STATUS */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               qca,phy-rgmii-en;
-                               qca,txclk-delay-en;
-                               qca,rxclk-delay-en;
-                       };
-
-                       phy3: ethernet-phy@3 {
-                               device_type = "ethernet-phy";
-                               reg = <3>;
-                       };
-               };
-       };
 };
 
 &qcom_pinmux {
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_pins>;
+       pinctrl-names = "default";
+
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+               qca,ar8327-initvals = <
+                       0x00004 0x7600000   /* PAD0_MODE */
+                       0x00008 0x1000000   /* PAD5_MODE */
+                       0x0000c 0x20080     /* PAD6_MODE */
+                       0x000e4 0x6a545     /* MAC_POWER_SEL */
+                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                       0x0007c 0x4e        /* PORT0_STATUS */
+                       0x00094 0x4e        /* PORT6_STATUS */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               qca,phy-rgmii-en;
+               qca,txclk-delay-en;
+               qca,rxclk-delay-en;
+       };
+
+       phy3: ethernet-phy@3 {
+               device_type = "ethernet-phy";
+               reg = <3>;
+       };
+};
+
 &gmac0 {
        status = "okay";
        phy-mode = "rgmii";
index 1c492eca669639dc4d948009d3e95fcf1623bdef..abe712ba3d17841cdeb0691dec72704b94b32699 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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";
-
-                       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 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        force_gen1 = <1>;
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index e60ed4aa02faa132aedf18f0e183612db51d230f..c272f34b2cba7fd1e8b58ec669c910c2a20b6946 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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";
-
-                       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 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index 5c1904f9172a51a4cd05fe1597ab4888714fe36a..d003a8a5d30527fff43db315ffbd1481c778b78f 100644 (file)
        chosen {
                stdout-path = "serial0:115200n8";
        };
-
-       soc {
-               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";
-
-                       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 */
-                               >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-
-                       phy6: ethernet-phy@6 {
-                               reg = <6>;
-                       };
-
-                       phy7: ethernet-phy@7 {
-                               reg = <7>;
-                       };
-               };
-       };
 };
 
 &qcom_pinmux {
        status = "okay";
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+               >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+
+       phy6: ethernet-phy@6 {
+               reg = <6>;
+       };
+
+       phy7: ethernet-phy@7 {
+               reg = <7>;
+       };
+};
+
 &gmac0 {
        status = "okay";
        phy-mode = "rgmii";
index 75ca00024a77479de753e186725026a67c763529..92dbd9b626a757aaf82aa08481380c336d8c2596 100644 (file)
                append-rootblock = "ubi.mtd=";  /* append to bootargs adding the root deviceblock nbr from bootloader */
        };
 
-       soc {
-               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";
-
-                       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 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index aab7b253ef3933b27f19f5e1df19a44051089bd4..02fbc37b2374b77e6551b103e5e0b66188522bbe 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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";
-
-                       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 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index 8c3568212328aeb5465e387e9b4aae3dfcd096a2..1fdf99e603461c4b42b3c6f4da6e4859caf7a6bd 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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";
-
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               qca,ar8327-initvals = <
-                                       0x00004 0x7600000   /* PAD0_MODE */
-                                       0x00008 0x1000000   /* PAD5_MODE */
-                                       0x0000c 0x80        /* PAD6_MODE */
-                                       0x000e4 0xaa545     /* MAC_POWER_SEL */
-                                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                                       0x0007c 0x4e        /* PORT0_STATUS */
-                                       0x00094 0x4e        /* PORT6_STATUS */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 0xaa545     /* MAC_POWER_SEL */
+                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                       0x0007c 0x4e        /* PORT0_STATUS */
+                       0x00094 0x4e        /* PORT6_STATUS */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index 22937599e5c27f7ab3bd7135570a7b286896954e..5e73b533d456a56510c977111db219751cc40191 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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";
-
-                       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 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        force_gen1 = <1>;
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index 73b8b526c20cb69705741cbb4f70576cfc63f8c1..a9325b446240d02710000f4da54ca4f4429c713d 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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 0x06000000  /* PAD0_MODE */
-                                       0x0000c 0x00080080  /* PAD6_MODE */
-                                       0x000e4 0x0006a545  /* MAC_POWER_SEL */
-                                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                                       0x0007c 0x0000004e  /* PORT0_STATUS */
-                                       0x00094 0x0000004e  /* PORT6_STATUS */
-                                       >;
-                       };
-
-                       ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        status = "okay";
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_pins>;
+       pinctrl-names = "default";
+
+       ethernet-phy@0 {
+               reg = <0>;
+               qca,ar8327-initvals = <
+                       0x00004 0x06000000  /* PAD0_MODE */
+                       0x0000c 0x00080080  /* PAD6_MODE */
+                       0x000e4 0x0006a545  /* MAC_POWER_SEL */
+                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                       0x0007c 0x0000004e  /* PORT0_STATUS */
+                       0x00094 0x0000004e  /* PORT6_STATUS */
+                       >;
+       };
+
+       ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
 
index 3fe99b82e84615af815310e88e8773ba9dceed5d..8be54804ead2a8c48025c8d3c1c6d36094a5921a 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-
-               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>;
-                       };
-               };
-
-       };
-
        leds {
                compatible = "gpio-leds";
 
        status = "okay";
 };
 
+&mdio0 {
+       status = "okay";
+
+       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>;
+       };
+};
+
 &gmac1 {
        status = "okay";
 
index 0cc1b7965f1aa23b811d6ba20d0fbd85828a2416..a93a7965834ba1a3e68bf89d12a290b393880cb2 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-
-               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 0x07600000  /* PAD0_MODE */
-                                       0x00008 0x01000000  /* PAD5_MODE */
-                                       0x0000c 0x00000080  /* PAD6_MODE */
-                                       0x00050 0xcc35cc35  /* LED_CTRL0 */
-                                       0x00054 0xca35ca35  /* LED_CTRL1 */
-                                       0x00058 0xc935c935  /* LED_CTRL2 */
-                                       0x0005c 0x03ffff00  /* LED_CTRL3 */
-                                       0x000e4 0x0006a545  /* MAC_POWER_SEL */
-                                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                                       0x0007c 0x0000007e  /* PORT0_STATUS */
-                                       0x00094 0x0000007e  /* PORT6_STATUS */
-                                       >;
-                       };
-
-                       ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
        leds {
                compatible = "gpio-leds";
                pinctrl-0 = <&led_pins>;
        status = "okay";
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_pins>;
+       pinctrl-names = "default";
+
+       ethernet-phy@0 {
+               reg = <0>;
+               qca,ar8327-initvals = <
+                       0x00004 0x07600000  /* PAD0_MODE */
+                       0x00008 0x01000000  /* PAD5_MODE */
+                       0x0000c 0x00000080  /* PAD6_MODE */
+                       0x00050 0xcc35cc35  /* LED_CTRL0 */
+                       0x00054 0xca35ca35  /* LED_CTRL1 */
+                       0x00058 0xc935c935  /* LED_CTRL2 */
+                       0x0005c 0x03ffff00  /* LED_CTRL3 */
+                       0x000e4 0x0006a545  /* MAC_POWER_SEL */
+                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                       0x0007c 0x0000007e  /* PORT0_STATUS */
+                       0x00094 0x0000007e  /* PORT6_STATUS */
+                       >;
+       };
+
+       ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &gmac1 {
        status = "okay";
 
index 8b45f20d5398e549831480db9503828f774f56e6..f986169a6f5a2be892dc201b0fd2b9f6aca0713d 100644 (file)
                        snps,blen = <16 0 0 0 0 0 0>;
                };
 
+               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";
+
+                       status = "disabled";
+               };
+
                gmac0: ethernet@37000000 {
                        device_type = "network";
                        compatible = "qcom,ipq806x-gmac";
index 3a27bf3451bb131d68c2af39143dd18cdd37405f..a2ee3f8bf7caa8f441143e59fac4502f7f0d6a02 100644 (file)
                append-rootblock = "root=/dev/mmcblk0p";
        };
 
-       soc {
-               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";
-
-
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               qca,ar8327-initvals = <
-                                       0x00004 0x7600000   /* PAD0_MODE */
-                                       0x00008 0x1000000   /* PAD5_MODE */
-                                       0x0000c 0x80        /* PAD6_MODE */
-                                       0x000e4 0xaa545     /* MAC_POWER_SEL */
-                                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                                       0x0007c 0x4e        /* PORT0_STATUS */
-                                       0x00094 0x4e        /* PORT6_STATUS */
-                                       0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
-                                       0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
-                                       0x00978 0x19008643  /* QM_PORT1_CTRL0 */
-                                       0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
-                                       0x00980 0x19008643  /* QM_PORT2_CTRL0 */
-                                       0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
-                                       0x00988 0x19008643  /* QM_PORT3_CTRL0 */
-                                       0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
-                                       0x00990 0x19008643  /* QM_PORT4_CTRL0 */
-                                       0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
-                                       0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
-                                       0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
-                                       0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
-                                       0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
-                                       >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               qca,ar8327-initvals = <
-                                       0x000e4 0x6a545     /* MAC_POWER_SEL */
-                                       0x0000c 0x80        /* PAD6_MODE */
-                                       >;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        force_gen1 = <1>;
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 0xaa545     /* MAC_POWER_SEL */
+                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                       0x0007c 0x4e        /* PORT0_STATUS */
+                       0x00094 0x4e        /* PORT6_STATUS */
+                       0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
+                       0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
+                       0x00978 0x19008643  /* QM_PORT1_CTRL0 */
+                       0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
+                       0x00980 0x19008643  /* QM_PORT2_CTRL0 */
+                       0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
+                       0x00988 0x19008643  /* QM_PORT3_CTRL0 */
+                       0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
+                       0x00990 0x19008643  /* QM_PORT4_CTRL0 */
+                       0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
+                       0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
+                       0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
+                       0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
+                       0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
+                       >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               qca,ar8327-initvals = <
+                       0x000e4 0x6a545     /* MAC_POWER_SEL */
+                       0x0000c 0x80        /* PAD6_MODE */
+                       >;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";
index e2a7e9e6a6ccf3c491668b2e85e3b2409fafaaad..76834be21fac86d80c4b410803d96740378457c4 100644 (file)
                stdout-path = "serial0:115200n8";
        };
 
-       soc {
-               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";
-
-                       phy0: ethernet-phy@0 {
-                               reg = <0>;
-                               qca,ar8327-initvals = <
-                                       0x00004 0x7600000   /* PAD0_MODE */
-                                       0x00008 0x1000000   /* PAD5_MODE */
-                                       0x0000c 0x80        /* PAD6_MODE */
-                                       0x000e4 0xaa545     /* MAC_POWER_SEL */
-                                       0x000e0 0xc74164de  /* SGMII_CTRL */
-                                       0x0007c 0x4e        /* PORT0_STATUS */
-                                       0x00094 0x4e        /* PORT6_STATUS */
-                                       0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
-                                       0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
-                                       0x00978 0x19008643  /* QM_PORT1_CTRL0 */
-                                       0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
-                                       0x00980 0x19008643  /* QM_PORT2_CTRL0 */
-                                       0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
-                                       0x00988 0x19008643  /* QM_PORT3_CTRL0 */
-                                       0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
-                                       0x00990 0x19008643  /* QM_PORT4_CTRL0 */
-                                       0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
-                                       0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
-                                       0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
-                                       0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
-                                       0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
-                                       >;
-                               qca,ar8327-vlans = <
-                                       0x1     0x5e        /* VLAN1 Ports 1/2/3/4/6 */
-                                       0x2     0x21        /* VLAN2 Ports 0/5 */
-                               >;
-                       };
-
-                       phy4: ethernet-phy@4 {
-                               reg = <4>;
-                               qca,ar8327-initvals = <
-                                       0x000e4 0x6a545     /* MAC_POWER_SEL */
-                                       0x0000c 0x80        /* PAD6_MODE */
-                                       >;
-                       };
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
        };
 };
 
+&mdio0 {
+       status = "okay";
+
+       pinctrl-0 = <&mdio0_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 0xaa545     /* MAC_POWER_SEL */
+                       0x000e0 0xc74164de  /* SGMII_CTRL */
+                       0x0007c 0x4e        /* PORT0_STATUS */
+                       0x00094 0x4e        /* PORT6_STATUS */
+                       0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
+                       0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
+                       0x00978 0x19008643  /* QM_PORT1_CTRL0 */
+                       0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
+                       0x00980 0x19008643  /* QM_PORT2_CTRL0 */
+                       0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
+                       0x00988 0x19008643  /* QM_PORT3_CTRL0 */
+                       0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
+                       0x00990 0x19008643  /* QM_PORT4_CTRL0 */
+                       0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
+                       0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
+                       0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
+                       0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
+                       0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
+                       >;
+               qca,ar8327-vlans = <
+                       0x1     0x5e        /* VLAN1 Ports 1/2/3/4/6 */
+                       0x2     0x21        /* VLAN2 Ports 0/5 */
+               >;
+       };
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               qca,ar8327-initvals = <
+                       0x000e4 0x6a545     /* MAC_POWER_SEL */
+                       0x0000c 0x80        /* PAD6_MODE */
+                       >;
+       };
+};
+
 &gmac1 {
        status = "okay";
        phy-mode = "rgmii";