浏览代码

ARM: ux500: don't select LEDS_GPIO for snowball

Using 'select' in Kconfig is hard, a platform cannot just
enable a driver without also making sure that its subsystem
is there. Also, there is no actual code dependency between
the platform and the gpio leds driver.

Without this patch, building without LEDS_CLASS esults in:

drivers/built-in.o: In function `create_gpio_led.part.2':
governor_userspace.c:(.devinit.text+0x5a58): undefined reference to `led_classdev_register'
drivers/built-in.o: In function `gpio_led_remove':
governor_userspace.c:(.devexit.text+0x6b8): undefined reference to `led_classdev_unregister'

This reverts 8733f53c6 "ARM: ux500: Kconfig: Compile in leds-gpio
support for Snowball" that introduced the regression and did not
provide a helpful explanation.

In order to leave the GPIO LED code still present in normal
builds, this also enables the symbol in u8500_defconfig, in addition
to the other LED drivers that are already selected there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Lee Jones <lee.jones@linaro.org>
Arnd Bergmann 13 年之前
父节点
当前提交
db43b18468
共有 2 个文件被更改,包括 1 次插入1 次删除
  1. 1 0
      arch/arm/configs/u8500_defconfig
  2. 0 1
      arch/arm/mach-ux500/Kconfig

+ 1 - 0
arch/arm/configs/u8500_defconfig

@@ -86,6 +86,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_LM3530=y
 CONFIG_LEDS_LM3530=y
 CONFIG_LEDS_LP5521=y
 CONFIG_LEDS_LP5521=y
+CONFIG_LEDS_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AB8500=y
 CONFIG_RTC_DRV_AB8500=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_PL031=y

+ 0 - 1
arch/arm/mach-ux500/Kconfig

@@ -41,7 +41,6 @@ config MACH_HREFV60
 config MACH_SNOWBALL
 config MACH_SNOWBALL
 	bool "U8500 Snowball platform"
 	bool "U8500 Snowball platform"
 	select MACH_MOP500
 	select MACH_MOP500
-	select LEDS_GPIO
 	help
 	help
 	  Include support for the snowball development platform.
 	  Include support for the snowball development platform.