diff options
| author | Mike Dunn <mikedunn@newsguy.com> | 2012-12-27 19:02:18 +0100 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-01-23 09:56:32 +0100 |
| commit | 6a639bb83b751bfed61be13c0e3df17e5a970a94 (patch) | |
| tree | f934ca4779d1d1708cbb2ae2cbc6698f67eb4d04 /arch/arm/mach-pxa | |
| parent | ARM: palmtreo: fix lcd initilialization on treo680 (diff) | |
| download | linux-6a639bb83b751bfed61be13c0e3df17e5a970a94.tar.xz linux-6a639bb83b751bfed61be13c0e3df17e5a970a94.zip | |
ARM: palmtreo: fix #ifdefs for leds-gpio device
The #ifdefs around the leds-gpio device platform data are erroneous. Currently
the device is not instantiated on the centro unless CONFIG_MACH_TREO680 is
defined. This patch eliminates the #ifdefs, and uses the machine_is_* macros to
initialize the data based on which machine the code is running on and the
build-time configuration. Unused data is optimized out by the build tools if
build configuration does not enable support for both machines.
Tested on my palm treo 680, and compile-tested for all three combinations of
treo680/centro build configurations.
Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
Acked-by: Tomas Cech <sleep_walker@suse.cz>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtreo.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/palmtreo.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmtreo.h b/arch/arm/mach-pxa/include/mach/palmtreo.h index 32661945d4c3..714b6574393e 100644 --- a/arch/arm/mach-pxa/include/mach/palmtreo.h +++ b/arch/arm/mach-pxa/include/mach/palmtreo.h @@ -38,7 +38,6 @@ #define GPIO_NR_TREO_LCD_POWER 25 /* Treo680 specific GPIOs */ -#ifdef CONFIG_MACH_TREO680 #define GPIO_NR_TREO680_SD_READONLY 33 #define GPIO_NR_TREO680_SD_POWER 42 #define GPIO_NR_TREO680_VIBRATE_EN 44 @@ -47,7 +46,6 @@ #define GPIO_NR_TREO680_LCD_POWER 77 #define GPIO_NR_TREO680_LCD_EN 86 #define GPIO_NR_TREO680_LCD_EN_N 25 -#endif /* CONFIG_MACH_TREO680 */ /* Centro685 specific GPIOs */ #define GPIO_NR_CENTRO_SD_POWER 21 diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index 44412162fd27..577512845a6c 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c @@ -334,7 +334,6 @@ static inline void palmtreo_uhc_init(void) {} /****************************************************************************** * Vibra and LEDs ******************************************************************************/ -#ifdef CONFIG_MACH_TREO680 static struct gpio_led treo680_gpio_leds[] = { { .name = "treo680:vibra:vibra", @@ -385,21 +384,17 @@ static struct gpio_led_platform_data centro_gpio_led_info = { static struct platform_device palmtreo_leds = { .name = "leds-gpio", .id = -1, - .dev = { - .platform_data = &treo680_gpio_led_info, - } }; static void __init palmtreo_leds_init(void) { if (machine_is_centro()) palmtreo_leds.dev.platform_data = ¢ro_gpio_led_info; + else if (machine_is_treo680()) + palmtreo_leds.dev.platform_data = &treo680_gpio_led_info; platform_device_register(&palmtreo_leds); } -#else -static inline void palmtreo_leds_init(void) {} -#endif /****************************************************************************** * Machine init |