revert "[ARM] pxa/cm-x300: add PWM backlight support"

Commit db205463fd24c0972ad2c4e4fafb1c76e51b4380 was incorrectly applied,
and reverted here to re-apply.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e6d8e10ae5d1fe74c8e8b17414a325c69a763f6c..6f4f475bbc3df558e32189a592bddf4742da20ea 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -240,7 +240,6 @@ config MACH_COLIBRI300
        select PXA3xx
        select CPU_PXA300
        select CPU_PXA310
-       select HAVE_PWM
 
 config MACH_COLIBRI320
        bool "Toradex Colibri PXA320"

diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index d37cfa132a653227c9bc5225fc37d01909c77141..d564d8ea5a339aa04fd63c61b2fdf478ddf039cc 100644 (file)
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -24,7 +24,6 @@
 #include <linux/dm9000.h>
 #include <linux/leds.h>
 #include <linux/rtc-v3020.h>
-#include <linux/pwm_backlight.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c/pca953x.h>
@@ -51,7 +50,6 @@
 #include <asm/mach/map.h>
 
 #include "generic.h"
-#include "devices.h"
 
 #define CM_X300_ETH_PHYS       0x08000010
 
@@ -162,9 +160,6 @@ static mfp_cfg_t cm_x3xx_mfp_cfg[] __initdata = {
        /* Standard I2C */
        GPIO21_I2C_SCL,
        GPIO22_I2C_SDA,
-
-       /* PWM Backlight */
-       GPIO19_PWM2_OUT,
 };
 
 static mfp_cfg_t cm_x3xx_rev_lt130_mfp_cfg[] __initdata = {
@@ -295,30 +290,6 @@ static void __init cm_x300_init_lcd(void)
 static inline void cm_x300_init_lcd(void) {}
 #endif
 
-#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
-static struct platform_pwm_backlight_data cm_x300_backlight_data = {
-       .pwm_id         = 2,
-       .max_brightness = 100,
-       .dft_brightness = 100,
-       .pwm_period_ns  = 10000,
-};
-
-static struct platform_device cm_x300_backlight_device = {
-       .name           = "pwm-backlight",
-       .dev            = {
-               .parent = &pxa27x_device_pwm0.dev,
-               .platform_data  = &cm_x300_backlight_data,
-       },
-};
-
-static void cm_x300_init_bl(void)
-{
-       platform_device_register(&cm_x300_backlight_device);
-}
-#else
-static inline void cm_x300_init_bl(void) {}
-#endif
-
 #if defined(CONFIG_SPI_GPIO) || defined(CONFIG_SPI_GPIO_MODULE)
 #define GPIO_LCD_BASE  (144)
 #define GPIO_LCD_DIN   (GPIO_LCD_BASE + 8)     /* aux_gpio3_0 */
@@ -683,7 +654,6 @@ static void __init cm_x300_init(void)
        cm_x300_init_rtc();
        cm_x300_init_ac97();
        cm_x300_init_wi2wi();
-       cm_x300_init_bl();
 }
 
 static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 3395463bb5a654e6327a51028c17a4ce0dfd6301..d4cc41d04b255f037bf8391dc531d16d22d234b3 100644 (file)
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -4,7 +4,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <mach/hardware.h>
 #include <mach/udc.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>