ar71xx: use ath79_setup_qca955x_eth_cfg helper for QCA955x based boards

[oweals/openwrt.git] / target / linux / ar71xx / patches-3.10 / 610-MIPS-ath79-openwrt-machines.patch

diff --git a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
index f05fc09fd9dd2e5b12cfd815bd7e1e4452459aa1..2dfecd2fda72999f213d1c287b3d741d6386cf4c 100644 (file)
--- a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -16,22 +16,142 @@
+@@ -16,22 +16,143 @@
  
  enum ath79_mach_type {
        ATH79_MACH_GENERIC = 0,
@@ -29,6 +29,7 @@
 +      ATH79_MACH_DIR_505_A1,          /* D-Link DIR-505 rev. A1 */
 +      ATH79_MACH_DIR_600_A1,          /* D-Link DIR-600 rev. A1 */
 +      ATH79_MACH_DIR_615_C1,          /* D-Link DIR-615 rev. C1 */
++      ATH79_MACH_DIR_615_E1,          /* D-Link DIR-615 rev. E1 */
 +      ATH79_MACH_DIR_615_E4,          /* D-Link DIR-615 rev. E4 */
 +      ATH79_MACH_DIR_825_B1,          /* D-Link DIR-825 rev. B1 */
 +      ATH79_MACH_DIR_825_C1,          /* D-Link DIR-825 rev. C1 */
@@ -423,7 +424,7 @@
 +      select ATH79_NVRAM
 +
 +config ATH79_MACH_DIR_600_A1
-+      bool "D-Link DIR-600 A1/DIR-615 E4 support"
++      bool "D-Link DIR-600 A1/DIR-615 E1/DIR-615 E4 support"
 +      select SOC_AR724X
 +      select ATH79_DEV_AP9X_PCI if PCI
 +      select ATH79_DEV_ETH
@@ -1151,14 +1152,15 @@
 +obj-$(CONFIG_ATH79_MACH_CARAMBOLA2)   += mach-carambola2.o
 --- a/arch/mips/ath79/prom.c
 +++ b/arch/mips/ath79/prom.c
-@@ -180,6 +180,11 @@ void __init prom_init(void)
+@@ -180,6 +180,12 @@ void __init prom_init(void)
                        ath79_prom_append_cmdline("board", env);
                }
        }
 +
 +      if (strstr(arcs_cmdline, "board=750Gr3") ||
 +          strstr(arcs_cmdline, "board=951G") ||
-+          strstr(arcs_cmdline, "board=2011L"))
++          strstr(arcs_cmdline, "board=2011L") ||
++          strstr(arcs_cmdline, "board=711Gr100"))
 +              ath79_prom_append_cmdline("console", "ttyS0,115200");
  }