lantiq: DGN3500 support

This requires all the preceding patches and finishes support for the
DGN3500, also removing an obsolete file.

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
SVN-Revision: 36781

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 06390a73d994d72612871d37dc18bd6ecbe0f1e6..a48fc684db729b1293c81b3c0027e124226e7642 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -72,6 +72,11 @@ WBMR)
 VG3503J)
        ucidef_set_interface_lan 'eth0 eth1'
        ;;
+DGN3500*)
+       ucidef_set_interface_lan "eth0.1"
+       ucidef_add_switch "switch0" "1" "1"
+       ucidef_add_switch_vlan "switch0" "1" "3 2 1 0 5t"
+       ;;
 esac
 
 [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"

diff --git a/target/linux/lantiq/base-files/lib/preinit/42_athfix b/target/linux/lantiq/base-files/lib/preinit/42_athfix
deleted file mode 100644 (file)
index d182fbf..0000000
--- a/target/linux/lantiq/base-files/lib/preinit/42_athfix
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. /lib/functions/lantiq.sh
-
-init_atheeprom() {
-       local board=$(lantiq_board_name)
-       case $board in
-       "Netgear DGN3500B")
-               echo "- loading eeprom -"
-               dd if=/dev/mtd2 of=/sys/firmware/ath_eeprom bs=1k skip=60 count=4
-               echo 0 > /sys/bus/pci/slots/0000\:00\:0e.0/power
-               sleep 1
-               echo 1 > /sys/bus/pci/rescan
-               ;;
-       esac
-}
-
-boot_hook_add preinit_essential init_atheeprom
-

diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index 795e8bce0af9df56194a896162e27d0d99ecc234..75839d253fb4144d6c049ff057bd539e1006083c 100644 (file)
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -2,7 +2,7 @@
 
 / {
        chosen {
-               bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
+               bootargs-append = "console=ttyLTQ0,115200 init=/etc/preinit";
        };
 
        memory@0 {
@@ -99,7 +99,7 @@
                                read-only;
                        };
 
-                       partition@20000 {
+                       ath9k_cal: partition@20000 {
                                reg = <0x20000 0x10000>;
                                label = "calibration";
                                read-only;
@@ -112,6 +112,13 @@
                };
        };
 
+       ath9k_eep {
+               compatible = "ath9k,eeprom";
+               ath,eep-flash = <&ath9k_cal 0xf000>;
+               ath,pci-slot = <14>;
+               ath,eep-swap;
+       };
+
        rtl8366rb {
                compatible = "rtl8366rb";
                gpio-sda = <&gpio 35 0>;
@@ -144,7 +151,7 @@
        gpio-leds {
                compatible = "gpio-leds";
                internet {
-                       label = "inernet";
+                       label = "internet";
                        gpios = <&gpio 2 1>;
                };
                dsl {
@@ -158,7 +165,6 @@
                power {
                        label = "power";
                        gpios = <&gpio 34 1>;
-                       default-state = "on";
                };
                power2 {
                        label = "power2";