Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2f42cc authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'dev/pwm-backlight' into for-next 

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
parents a9518cde 5cd435b4

arch/arm/mach-s3c64xx/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ config MACH_SMDK6410 
	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_PWM

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_I2C1
@@ -231,7 +232,7 @@ config MACH_HMT 
	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	select S3C64XX_SETUP_FB_24BPP

	select HAVE_PWM

	select SAMSUNG_DEV_PWM

	help

	  Machine support for the Airgoo HMT
@@ -249,8 +250,8 @@ config MACH_SMARTQ 
	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_FB_24BPP

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_TS

	select HAVE_PWM

	help

	    Shared machine support for SmartQ 5/7

arch/arm/mach-s3c64xx/mach-smdk6410.c

+43 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/smsc911x.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/pwm_backlight.h>



#ifdef CONFIG_SMDK6410_WM1190_EV1

#include <linux/mfd/wm8350/core.h>
@@ -49,6 +50,7 @@ 
#include <mach/hardware.h>

#include <mach/regs-fb.h>

#include <mach/map.h>

#include <mach/gpio-bank-f.h>



#include <asm/irq.h>

#include <asm/mach-types.h>
@@ -119,7 +121,6 @@ static void smdk6410_lcd_power_set(struct plat_lcd_data *pd, 
{

	if (power) {

		gpio_direction_output(S3C64XX_GPF(13), 1);

		gpio_direction_output(S3C64XX_GPF(15), 1);



		/* fire nRESET on power up */

		gpio_direction_output(S3C64XX_GPN(5), 0);
@@ -127,7 +128,6 @@ static void smdk6410_lcd_power_set(struct plat_lcd_data *pd, 
		gpio_direction_output(S3C64XX_GPN(5), 1);

		msleep(1);

	} else {

		gpio_direction_output(S3C64XX_GPF(15), 0);

		gpio_direction_output(S3C64XX_GPF(13), 0);

	}

}
@@ -270,6 +270,45 @@ static struct samsung_keypad_platdata smdk6410_keypad_data __initdata = { 
	.cols		= 8,

};



static int smdk6410_backlight_init(struct device *dev)

{

	int ret;



	ret = gpio_request(S3C64XX_GPF(15), "Backlight");

	if (ret) {

		printk(KERN_ERR "failed to request GPF for PWM-OUT1\n");

		return ret;

	}



	/* Configure GPIO pin with S3C64XX_GPF15_PWM_TOUT1 */

	s3c_gpio_cfgpin(S3C64XX_GPF(15), S3C_GPIO_SFN(2));



	return 0;

}



static void smdk6410_backlight_exit(struct device *dev)

{

	s3c_gpio_cfgpin(S3C64XX_GPF(15), S3C_GPIO_OUTPUT);

	gpio_free(S3C64XX_GPF(15));

}



static struct platform_pwm_backlight_data smdk6410_backlight_data = {

	.pwm_id		= 1,

	.max_brightness	= 255,

	.dft_brightness	= 255,

	.pwm_period_ns	= 78770,

	.init		= smdk6410_backlight_init,

	.exit		= smdk6410_backlight_exit,

};



static struct platform_device smdk6410_backlight_device = {

	.name		= "pwm-backlight",

	.dev		= {

		.parent		= &s3c_device_timer[1].dev,

		.platform_data	= &smdk6410_backlight_data,

	},

};



static struct map_desc smdk6410_iodesc[] = {};



static struct platform_device *smdk6410_devices[] __initdata = {
@@ -299,6 +338,8 @@ static struct platform_device *smdk6410_devices[] __initdata = { 
	&s3c_device_rtc,

	&s3c_device_ts,

	&s3c_device_wdt,

	&s3c_device_timer[1],

	&smdk6410_backlight_device,

};



#ifdef CONFIG_REGULATOR
@@ -694,7 +735,6 @@ static void __init smdk6410_machine_init(void) 


	gpio_request(S3C64XX_GPN(5), "LCD power");

	gpio_request(S3C64XX_GPF(13), "LCD power");

	gpio_request(S3C64XX_GPF(15), "LCD power");



	i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));

	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));

arch/arm/mach-s5p64x0/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ config MACH_SMDK6440 
	select S3C_DEV_WDT

	select S3C64XX_DEV_SPI

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_TS

	select S5P64X0_SETUP_I2C1

	help
@@ -47,6 +48,7 @@ config MACH_SMDK6450 
	select S3C_DEV_WDT

	select S3C64XX_DEV_SPI

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_PWM

	select SAMSUNG_DEV_TS

	select S5P64X0_SETUP_I2C1

	help

arch/arm/mach-s5p64x0/mach-smdk6440.c

+43 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/module.h>

#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/pwm_backlight.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -32,6 +33,7 @@ 
#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/i2c.h>

#include <mach/regs-gpio.h>



#include <plat/regs-serial.h>

#include <plat/gpio-cfg.h>
@@ -88,6 +90,45 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = { 
	},

};



static int smdk6440_backlight_init(struct device *dev)

{

	int ret;



	ret = gpio_request(S5P6440_GPF(15), "Backlight");

	if (ret) {

		printk(KERN_ERR "failed to request GPF for PWM-OUT1\n");

		return ret;

	}



	/* Configure GPIO pin with S5P6440_GPF15_PWM_TOUT1 */

	s3c_gpio_cfgpin(S5P6440_GPF(15), S3C_GPIO_SFN(2));



	return 0;

}



static void smdk6440_backlight_exit(struct device *dev)

{

	s3c_gpio_cfgpin(S5P6440_GPF(15), S3C_GPIO_OUTPUT);

	gpio_free(S5P6440_GPF(15));

}



static struct platform_pwm_backlight_data smdk6440_backlight_data = {

	.pwm_id		= 1,

	.max_brightness	= 255,

	.dft_brightness	= 255,

	.pwm_period_ns	= 78770,

	.init		= smdk6440_backlight_init,

	.exit		= smdk6440_backlight_exit,

};



static struct platform_device smdk6440_backlight_device = {

	.name		= "pwm-backlight",

	.dev		= {

		.parent		= &s3c_device_timer[1].dev,

		.platform_data	= &smdk6440_backlight_data,

	},

};



static struct platform_device *smdk6440_devices[] __initdata = {

	&s3c_device_adc,

	&s3c_device_rtc,
@@ -97,6 +138,8 @@ static struct platform_device *smdk6440_devices[] __initdata = { 
	&s3c_device_wdt,

	&samsung_asoc_dma,

	&s5p6440_device_iis,

	&s3c_device_timer[1],

	&smdk6440_backlight_device,

};



static struct s3c2410_platform_i2c s5p6440_i2c0_data __initdata = {

arch/arm/mach-s5p64x0/mach-smdk6450.c

+43 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/module.h>

#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/pwm_backlight.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -32,6 +33,7 @@ 
#include <mach/map.h>

#include <mach/regs-clock.h>

#include <mach/i2c.h>

#include <mach/regs-gpio.h>



#include <plat/regs-serial.h>

#include <plat/gpio-cfg.h>
@@ -106,6 +108,45 @@ static struct s3c2410_uartcfg smdk6450_uartcfgs[] __initdata = { 
#endif

};



static int smdk6450_backlight_init(struct device *dev)

{

	int ret;



	ret = gpio_request(S5P6450_GPF(15), "Backlight");

	if (ret) {

		printk(KERN_ERR "failed to request GPF for PWM-OUT1\n");

		return ret;

	}



	/* Configure GPIO pin with S5P6450_GPF15_PWM_TOUT1 */

	s3c_gpio_cfgpin(S5P6450_GPF(15), S3C_GPIO_SFN(2));



	return 0;

}



static void smdk6450_backlight_exit(struct device *dev)

{

	s3c_gpio_cfgpin(S5P6450_GPF(15), S3C_GPIO_OUTPUT);

	gpio_free(S5P6450_GPF(15));

}



static struct platform_pwm_backlight_data smdk6450_backlight_data = {

	.pwm_id		= 1,

	.max_brightness	= 255,

	.dft_brightness	= 255,

	.pwm_period_ns	= 78770,

	.init		= smdk6450_backlight_init,

	.exit		= smdk6450_backlight_exit,

};



static struct platform_device smdk6450_backlight_device = {

	.name		= "pwm-backlight",

	.dev		= {

		.parent		= &s3c_device_timer[1].dev,

		.platform_data	= &smdk6450_backlight_data,

	},

};



static struct platform_device *smdk6450_devices[] __initdata = {

	&s3c_device_adc,

	&s3c_device_rtc,
@@ -115,6 +156,8 @@ static struct platform_device *smdk6450_devices[] __initdata = { 
	&s3c_device_wdt,

	&samsung_asoc_dma,

	&s5p6450_device_iis0,

	&s3c_device_timer[1],

	&smdk6450_backlight_device,

	/* s5p6450_device_spi0 will be added */

};