From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 27 Aug 2013 10:48:24 +0000 (+0000)
Subject: ar71xx: don't register USB device on WNDAP360
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9af6a5a88f01a940451f22bd0dee21fba8d0ba83;p=openwrt%2Fstaging%2Fnbd.git

ar71xx: don't register USB device on WNDAP360

Apparently registering usb device on newest trunk causes
this AP not to boot...
Since there is no USB socket in that device anyway this
can be simply removed (and device boots then no problem).

[juhosg:
  - tweak subject line and description,
  - remove #include "dev-usb.h",
  - remove 'select ATH79_DEV_USB' from Kconfig]

Signed-off-by: Jacek Kikiewicz <jaceq@aol.pl>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37844
---

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
index 0fd399ebc7..5b4b7b066c 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndap360.c
@@ -22,7 +22,6 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-m25p80.h"
-#include "dev-usb.h"
 #include "machtypes.h"
 
 #define WNDAP360_GPIO_LED_POWER_ORANGE		0
@@ -87,8 +86,6 @@ static void __init wndap360_setup(void)
 
 	ath79_register_eth(0);
 
-	ath79_register_usb();
-
 	ath79_register_m25p80(NULL);
 
 	ath79_register_leds_gpio(-1, ARRAY_SIZE(wndap360_leds_gpio),
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 b624d4556e..f68630e638 100644
--- 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
@@ -190,7 +190,7 @@
  config ATH79_MACH_AP121
  	bool "Atheros AP121 reference board"
  	select SOC_AR933X
-@@ -11,62 +66,654 @@ config ATH79_MACH_AP121
+@@ -11,62 +66,653 @@ config ATH79_MACH_AP121
  	select ATH79_DEV_M25P80
  	select ATH79_DEV_USB
  	select ATH79_DEV_WMAC
@@ -518,7 +518,6 @@
 +	select ATH79_DEV_GPIO_BUTTONS
 +	select ATH79_DEV_LEDS_GPIO
 +	select ATH79_DEV_M25P80
-+	select ATH79_DEV_USB
 +
 +config ATH79_MACH_WNDR3700
 +	bool "NETGEAR WNDR3700 board support"
@@ -871,7 +870,7 @@
  
  config ATH79_MACH_UBNT_XM
  	bool "Ubiquiti Networks XM/UniFi boards"
-@@ -83,6 +730,34 @@ config ATH79_MACH_UBNT_XM
+@@ -83,6 +729,34 @@ config ATH79_MACH_UBNT_XM
  	  Say 'Y' here if you want your kernel to support the
  	  Ubiquiti Networks XM (rev 1.0) board.
  
@@ -906,7 +905,7 @@
  endmenu
  
  config SOC_AR71XX
-@@ -132,7 +807,10 @@ config ATH79_DEV_DSA
+@@ -132,7 +806,10 @@ config ATH79_DEV_DSA
  config ATH79_DEV_ETH
  	def_bool n
  
@@ -918,7 +917,7 @@
  	def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
-@@ -164,4 +842,7 @@ config ATH79_PCI_ATH9K_FIXUP
+@@ -164,4 +841,7 @@ config ATH79_PCI_ATH9K_FIXUP
  config ATH79_ROUTERBOOT
  	def_bool n
  
diff --git a/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch b/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch
index dfab27dfcc..c3d577a8f7 100644
--- a/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch
+++ b/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -577,7 +577,7 @@ config ATH79_MACH_TL_WDR4300
+@@ -576,7 +576,7 @@ config ATH79_MACH_TL_WDR4300
  	select ATH79_DEV_WMAC
  
  config ATH79_MACH_TL_WR703N
diff --git a/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch b/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch
index 09438d3d96..22c812b399 100644
--- a/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch
+++ b/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -577,7 +577,7 @@ config ATH79_MACH_TL_WDR4300
+@@ -576,7 +576,7 @@ config ATH79_MACH_TL_WDR4300
  	select ATH79_DEV_WMAC
  
  config ATH79_MACH_TL_WR703N
diff --git a/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch b/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch
index ad528815f7..24a2d9bae7 100644
--- a/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch
+++ b/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch
@@ -10,7 +10,7 @@
  	ATH79_MACH_WRT160NL,		/* Linksys WRT160NL */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -420,7 +420,7 @@ config ATH79_MACH_WNR2000
+@@ -419,7 +419,7 @@ config ATH79_MACH_WNR2000
  	select ATH79_DEV_WMAC
  
  config ATH79_MACH_WNR2000_V3