ar71xx: register the NAND flash controller device on DB120

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-3.3 / 605-MIPS-ath79-db120-fixes.patch

diff --git a/target/linux/ar71xx/patches-3.3/605-MIPS-ath79-db120-fixes.patch b/target/linux/ar71xx/patches-3.3/605-MIPS-ath79-db120-fixes.patch
index 031198fe48ea767cceb9d9832cae7f3fe5a418bb..34e39e375d6cc3d94767706e76e476e2a60f4700 100644 (file)
--- a/target/linux/ar71xx/patches-3.3/605-MIPS-ath79-db120-fixes.patch
+++ b/target/linux/ar71xx/patches-3.3/605-MIPS-ath79-db120-fixes.patch
@@ -9,7 +9,7 @@
   *
   * Permission to use, copy, modify, and/or distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
-@@ -19,16 +19,25 @@
+@@ -19,16 +19,26 @@
   */
  
  #include <linux/pci.h>
@@ -27,6 +27,7 @@
  #include "dev-gpio-buttons.h"
  #include "dev-leds-gpio.h"
 +#include "dev-m25p80.h"
++#include "dev-nfc.h"
  #include "dev-spi.h"
  #include "dev-usb.h"
  #include "dev-wmac.h"
@@ -37,7 +38,7 @@
  #define DB120_GPIO_LED_WLAN_5G                12
  #define DB120_GPIO_LED_WLAN_2G                13
  #define DB120_GPIO_LED_STATUS         14
-@@ -39,8 +48,10 @@
+@@ -39,8 +49,10 @@
  #define DB120_KEYS_POLL_INTERVAL      20      /* msecs */
  #define DB120_KEYS_DEBOUNCE_INTERVAL  (3 * DB120_KEYS_POLL_INTERVAL)
  
@@ -50,7 +51,7 @@
  
  static struct gpio_led db120_leds_gpio[] __initdata = {
        {
-@@ -63,6 +74,11 @@ static struct gpio_led db120_leds_gpio[]
+@@ -63,6 +75,11 @@ static struct gpio_led db120_leds_gpio[]
                .gpio           = DB120_GPIO_LED_WLAN_2G,
                .active_low     = 1,
        },
@@ -62,7 +63,7 @@
  };
  
  static struct gpio_keys_button db120_gpio_keys[] __initdata = {
-@@ -76,66 +92,99 @@ static struct gpio_keys_button db120_gpi
+@@ -76,66 +93,101 @@ static struct gpio_keys_button db120_gpi
        },
  };
  
@@ -195,12 +196,14 @@
 +      ath79_eth1_data.duplex = DUPLEX_FULL;
 +
 +      ath79_register_eth(1);
++
++      ath79_register_nfc();
  }
  
  MIPS_MACHINE(ATH79_MACH_DB120, "DB120", "Atheros DB120 reference board",
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -43,9 +43,11 @@ config ATH79_MACH_AP81
+@@ -43,9 +43,12 @@ config ATH79_MACH_AP81
  config ATH79_MACH_DB120
        bool "Atheros DB120 reference board"
        select SOC_AR934X
@@ -210,6 +213,7 @@
        select ATH79_DEV_LEDS_GPIO
 -      select ATH79_DEV_SPI
 +      select ATH79_DEV_M25P80
++      select ATH79_DEV_NFC
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
        help