linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [ARM] pxa/cm-x300: add PWM backlight support
@ 2009-11-10 12:18 Igor Grinberg
  2009-11-15  8:29 ` Igor Grinberg
  0 siblings, 1 reply; 3+ messages in thread
From: Igor Grinberg @ 2009-11-10 12:18 UTC (permalink / raw)
  To: linux-arm-kernel


Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
 arch/arm/mach-pxa/Kconfig   |    1 +
 arch/arm/mach-pxa/cm-x300.c |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 5088b7b..f239cbb 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -244,6 +244,7 @@ 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 e475908..9ce1a4b 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -24,6 +24,7 @@
 #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>
@@ -50,6 +51,7 @@
 #include <asm/mach/map.h>
 
 #include "generic.h"
+#include "devices.h"
 
 #define CM_X300_ETH_PHYS	0x08000010
 
@@ -160,6 +162,9 @@ 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 = {
@@ -290,6 +295,30 @@ 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 */
@@ -649,6 +678,7 @@ 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,
-- 
1.6.0.6

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH] [ARM] pxa/cm-x300: add PWM backlight support
  2009-11-10 12:18 [PATCH] [ARM] pxa/cm-x300: add PWM backlight support Igor Grinberg
@ 2009-11-15  8:29 ` Igor Grinberg
  2009-11-16 16:31   ` Eric Miao
  0 siblings, 1 reply; 3+ messages in thread
From: Igor Grinberg @ 2009-11-15  8:29 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Eric,

Any updates on this?

Igor Grinberg wrote:
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
> ---
>  arch/arm/mach-pxa/Kconfig   |    1 +
>  arch/arm/mach-pxa/cm-x300.c |   30 ++++++++++++++++++++++++++++++
>  2 files changed, 31 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
> index 5088b7b..f239cbb 100644
> --- a/arch/arm/mach-pxa/Kconfig
> +++ b/arch/arm/mach-pxa/Kconfig
> @@ -244,6 +244,7 @@ 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 e475908..9ce1a4b 100644
> --- a/arch/arm/mach-pxa/cm-x300.c
> +++ b/arch/arm/mach-pxa/cm-x300.c
> @@ -24,6 +24,7 @@
>  #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>
> @@ -50,6 +51,7 @@
>  #include <asm/mach/map.h>
>  
>  #include "generic.h"
> +#include "devices.h"
>  
>  #define CM_X300_ETH_PHYS	0x08000010
>  
> @@ -160,6 +162,9 @@ 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 = {
> @@ -290,6 +295,30 @@ 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 */
> @@ -649,6 +678,7 @@ 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,
>   

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] [ARM] pxa/cm-x300: add PWM backlight support
  2009-11-15  8:29 ` Igor Grinberg
@ 2009-11-16 16:31   ` Eric Miao
  0 siblings, 0 replies; 3+ messages in thread
From: Eric Miao @ 2009-11-16 16:31 UTC (permalink / raw)
  To: linux-arm-kernel

On Sun, Nov 15, 2009 at 4:29 PM, Igor Grinberg <grinberg@compulab.co.il> wrote:
> Hi Eric,
>
> Any updates on this?
>

Patch is good, applied to 'topic/cm-x300' and will be merged back
into 'devel' later soon. Thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-11-16 16:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-10 12:18 [PATCH] [ARM] pxa/cm-x300: add PWM backlight support Igor Grinberg
2009-11-15  8:29 ` Igor Grinberg
2009-11-16 16:31   ` Eric Miao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).