lantiq: fix VG3503J ethernet/gphy led support

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37634 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
index 0878de8..e525ebd 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
@@ -21,10 +21,6 @@ board=$(lantiq_board_id)
 
 case "$board" in
 VG3503J)
-       ucidef_set_led_netdev "lan1" "lan1" "bt:green:lan1" "eth0"
-       ucidef_set_led_netdev "lan2" "lan2" "bt:green:lan2" "eth1"
-       ucidef_set_led_netdev "port1" "port1" "bt:green:port1" "eth0"
-       ucidef_set_led_netdev "port2" "port2" "bt:green:port2" "eth1"
        ucidef_set_led_netdev "vdsl" "vdsl" "bt:green:dsl" "ptm0"
        ;;
 *)

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index 9ae7c70..1d3a117 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -70,7 +70,8 @@ WBMR)
        ;;
 
 VG3503J)
-       ucidef_set_interface_lan 'eth0 eth1'
+       ucidef_set_interface_lan 'eth0'
+       uci set network.lan.type='none'
        ;;
 DGN3500*)
        ucidef_set_interface_lan "eth0.1"

diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts
index 037563b..8278a17 100644 (file)
--- a/target/linux/lantiq/dts/VG3503J.dts
+++ b/target/linux/lantiq/dts/VG3503J.dts
@@ -74,6 +74,15 @@
                                        lantiq,groups = "mdio";
                                        lantiq,function = "mdio";
                                };
+                               gphy-leds {
+                                       lantiq,groups = "gphy0 led0", "gphy0 led1",
+                                                       "gphy0 led2", "gphy1 led0",
+                                                       "gphy1 led1", "gphy1 led2";
+                                       lantiq,function = "gphy";
+                                       lantiq,pull = <2>;
+                                       lantiq,open-drain = <0>;
+                                       lantiq,output = <1>;
+                               };
                        };
                };
 
@@ -89,34 +98,24 @@
                        interrupt-parent = <&icu0>;
                        interrupts = <73 72>;
 
-                       lan1: interface@0 {
+                       interface@0 {
                                compatible = "lantiq,xrx200-pdi";
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0>;
                                mac-address = [ 00 11 22 33 44 55 ];
-                               lantiq,wan;
-                               ethernet@4 {
-                                       compatible = "lantiq,xrx200-pdi-port";
-                                       reg = <4>;
-                                       phy-mode = "mii";
-                                       phy-handle = <&phy13>;
-                               };
-                       };
-
-                       lan2: interface@1 {
-                               compatible = "lantiq,xrx200-pdi";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               reg = <1>;
-                               mac-address = [ 00 11 22 33 44 56 ];
-
                                ethernet@2 {
                                        compatible = "lantiq,xrx200-pdi-port";
                                        reg = <2>;
                                        phy-mode = "mii";
                                        phy-handle = <&phy11>;
                                };
+                               ethernet@4 {
+                                       compatible = "lantiq,xrx200-pdi-port";
+                                       reg = <4>;
+                                       phy-mode = "mii";
+                                       phy-handle = <&phy13>;
+                               };
                        };
 
                        mdio@0 {
@@ -156,18 +155,6 @@
        gpio-leds {
                compatible = "gpio-leds";
 
-               port2orange {
-                       label = "bt:orange:port2";
-                       gpios = <&gpio 2 0>;
-               };
-               lan2 {
-                       label = "bt:green:lan2";
-                       gpios = <&gpio 5 0>;
-               };
-               port2green {
-                       label = "bt:green:port2";
-                       gpios = <&gpio 7 0>;
-               };
                power2 {
                        label = "power2";
                        gpios = <&gpio 14 1>;
@@ -180,17 +167,5 @@
                        label = "power";
                        gpios = <&gpio 28 1>;
                };
-               lan1 {
-                       label = "bt:green:lan1";
-                       gpios = <&gpio 44 0>;
-               };
-               port1green {
-                       label = "bt:green:port1";
-                       gpios = <&gpio 45 0>;
-               };
-               port1orange {
-                       label = "bt:orange:port1";
-                       gpios = <&gpio 47 0>;
-               };
        };
 };