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";
resets = <&rst 9>;
reset-names = "mac";
-};
-
-&mdio0 {
- regmap = <ð1>;
- builtin-switch;
- resets = <&rst 23>;
- reset-names = "mdio";
+ phy-mode = "mii";
+ phy-handle = <&swphy4>;
resets = <&rst 23>;
reset-names = "mdio";
resets = <&rst 23>;
reset-names = "mdio";
+
+ 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";
+ };
+ };
+ };
- 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";
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>;
ð0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
-
- phy-handle = <&phy4>;
mtd-mac-address = <&art 0x0>;
mtd-mac-address = <&art 0x0>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
-
gmac-config {
device = <&gmac>;
gmac-config {
device = <&gmac>;
mtd-mac-address = <&art 0x1002>;
mtd-mac-address-increment = <0x40>;
mtd-mac-address = <&art 0x1002>;
mtd-mac-address-increment = <0x40>;
-
- 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>;
ð0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
gmac-config {
device = <&gmac>;
gmac-config {
device = <&gmac>;
+ð1 {
+ status = "okay";
+ compatible = "syscon", "simple-mfd";
+};
+
&spi {
num-chipselects = <1>;
status = "okay";
&spi {
num-chipselects = <1>;
status = "okay";
-&mdio1 {
- status = "okay";
- phy4: ethernet-phy@4 {
- reg = <4>;
- };
-};
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address = <&uboot 0x1fc00>;
- fixed-link {
- speed = <1000>;
- full-duplex;
- };
-
- 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>;
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
- phy-handle = <&phy4>;
-
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
+ compatible = "syscon", "simple-mfd";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-&mdio0 {
- status = "okay";
-
- phy4: ethernet-phy@4 {
- reg = <4>;
- phy-mode = "mii";
- };
-};
-
- phy-handle = <&phy4>;
-
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <1>;
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <1>;
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;
- };