Explorar o código

MIPS: ath79: Rename ATH79_DEV_AR913X_WMAC option to ATH79_DEV_WMAC

The ATH79_DEV_AR913X_WMAC option was used to select the AR913x specific
wireless MAC registration code.  The registration code now supports the
AR933X SoCs as well. Rename the option to reflect the changes.

Also make the new option depends on SOC_AR933X.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3031/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Gabor Juhos %!s(int64=13) %!d(string=hai) anos
pai
achega
3ae4002231
Modificáronse 2 ficheiros con 7 adicións e 6 borrados
  1. 6 5
      arch/mips/ath79/Kconfig
  2. 1 1
      arch/mips/ath79/Makefile

+ 6 - 5
arch/mips/ath79/Kconfig

@@ -9,6 +9,7 @@ config ATH79_MACH_AP121
 	select ATH79_DEV_LEDS_GPIO
 	select ATH79_DEV_LEDS_GPIO
 	select ATH79_DEV_SPI
 	select ATH79_DEV_SPI
 	select ATH79_DEV_USB
 	select ATH79_DEV_USB
+	select ATH79_DEV_WMAC
 	help
 	help
 	  Say 'Y' here if you want your kernel to support the
 	  Say 'Y' here if you want your kernel to support the
 	  Atheros AP121 reference board.
 	  Atheros AP121 reference board.
@@ -16,11 +17,11 @@ config ATH79_MACH_AP121
 config ATH79_MACH_AP81
 config ATH79_MACH_AP81
 	bool "Atheros AP81 reference board"
 	bool "Atheros AP81 reference board"
 	select SOC_AR913X
 	select SOC_AR913X
-	select ATH79_DEV_AR913X_WMAC
 	select ATH79_DEV_GPIO_BUTTONS
 	select ATH79_DEV_GPIO_BUTTONS
 	select ATH79_DEV_LEDS_GPIO
 	select ATH79_DEV_LEDS_GPIO
 	select ATH79_DEV_SPI
 	select ATH79_DEV_SPI
 	select ATH79_DEV_USB
 	select ATH79_DEV_USB
+	select ATH79_DEV_WMAC
 	help
 	help
 	  Say 'Y' here if you want your kernel to support the
 	  Say 'Y' here if you want your kernel to support the
 	  Atheros AP81 reference board.
 	  Atheros AP81 reference board.
@@ -67,10 +68,6 @@ config SOC_AR933X
 	select USB_ARCH_HAS_EHCI
 	select USB_ARCH_HAS_EHCI
 	def_bool n
 	def_bool n
 
 
-config ATH79_DEV_AR913X_WMAC
-	depends on SOC_AR913X
-	def_bool n
-
 config ATH79_DEV_GPIO_BUTTONS
 config ATH79_DEV_GPIO_BUTTONS
 	def_bool n
 	def_bool n
 
 
@@ -83,4 +80,8 @@ config ATH79_DEV_SPI
 config ATH79_DEV_USB
 config ATH79_DEV_USB
 	def_bool n
 	def_bool n
 
 
+config ATH79_DEV_WMAC
+	depends on (SOC_AR913X || SOC_AR933X)
+	def_bool n
+
 endif
 endif

+ 1 - 1
arch/mips/ath79/Makefile

@@ -16,11 +16,11 @@ obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o
 # Devices
 # Devices
 #
 #
 obj-y					+= dev-common.o
 obj-y					+= dev-common.o
-obj-$(CONFIG_ATH79_DEV_AR913X_WMAC)	+= dev-ar913x-wmac.o
 obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o
 obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o
 obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o
 obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)	+= dev-leds-gpio.o
 obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o
 obj-$(CONFIG_ATH79_DEV_SPI)		+= dev-spi.o
 obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o
 obj-$(CONFIG_ATH79_DEV_USB)		+= dev-usb.o
+obj-$(CONFIG_ATH79_DEV_WMAC)		+= dev-ar913x-wmac.o
 
 
 #
 #
 # Machines
 # Machines