gmac0 is always connected to switch phy4 and mdio1 is always needed.
So add phy handle for eth0 and enable mdio1 by default.
Move fixed-link for gmac1 from device dts to ar9331.dtsi because gmac1 is always connected to builtin switch.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
resets = <&rst 9>;
reset-names = "mac";
-};
-
-&mdio0 {
- regmap = <ð1>;
- builtin-switch;
- resets = <&rst 23>;
- reset-names = "mdio";
+ phy-mode = "mii";
+ phy-handle = <&swphy4>;
};
&mdio1 {
+ status = "okay";
+
resets = <&rst 23>;
reset-names = "mdio";
-
builtin-switch;
+
+ builtin_switch: switch0@1f {
+ compatible = "qca,ar8216-builtin";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ reg = <0x1f>;
+
+ mdio-bus {
+ swphy4: ethernet-phy@4 {
+ reg = <4>;
+ phy-mode = "mii";
+ };
+ };
+ };
};
ð1 {
- compatible = "qca,ar9330-eth", "syscon";
+ compatible = "qca,ar9330-eth", "syscon", "simple-mfd";
pll-data = <0x00110000 0x00001099 0x00991099>;
phy-mode = "gmii";
resets = <&rst 13>;
reset-names = "mac";
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
};
};
};
-&mdio0 {
- status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
ð0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
-
- phy-handle = <&phy4>;
};
ð1 {
mtd-mac-address = <&art 0x0>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
-
gmac-config {
device = <&gmac>;
mtd-mac-address = <&art 0x1002>;
mtd-mac-address-increment = <0x40>;
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
-
};
&mdio1 {
status = "okay";
};
-&mdio0 {
- status = "okay";
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
ð0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
- phy-handle = <&phy4>;
gmac-config {
device = <&gmac>;
};
};
+ð1 {
+ status = "okay";
+ compatible = "syscon", "simple-mfd";
+};
+
&spi {
num-chipselects = <1>;
status = "okay";
};
};
-&mdio1 {
- status = "okay";
- phy4: ethernet-phy@4 {
- reg = <4>;
- };
-};
-ð1 {
+ð0 {
status = "okay";
- phy-handle = <&phy4>;
mtd-mac-address = <&uboot 0x1fc00>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
-
gmac-config {
- device = <&gmac>;
+ device = <&gmac>;
- switch-phy-addr-swap = <1>;
- switch-phy-swap = <1>;
+ switch-phy-addr-swap = <0>;
+ switch-phy-swap = <0>;
};
};
+ð1 {
+ status = "okay";
+ compatible = "syscon", "simple-mfd";
+};
+
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
ð0 {
status = "okay";
- phy-handle = <&phy4>;
-
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
};
};
-&gpio {
+ð1 {
status = "okay";
+ compatible = "syscon", "simple-mfd";
};
-&mdio0 {
+&gpio {
status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
};
&uart {
};
};
-&mdio0 {
- status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
ð0 {
status = "okay";
- phy-handle = <&phy4>;
-
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <1>;
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <(-1)>;
-
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
};
&gpio {