Commit e77277df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-samsung' of git://git.fluff.org/bjdooks/linux 

* 'next-samsung' of git://git.fluff.org/bjdooks/linux:
  ARM: H1940/RX1950: Change default LED triggers
  ARM: S3C2442: RX1950: Add support for LED blinking
  ARM: S3C2442: RX1950: Retain LEDs state in suspend
  ARM: S3C2410: H1940: Fix lcd_power_set function
  ARM: S3C2410: H1940: Add battery support
  ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing
  ARM: S3C2410: H1940: Make h1940-bluetooth.c compile again
  ARM: S3C2410: H1940: Add keys device
parents 75ea6358 9edb2406

arch/arm/mach-s3c2410/h1940-bluetooth.c

+7 −4
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ 
#include <linux/leds.h>

#include <linux/gpio.h>

#include <linux/rfkill.h>

#include <linux/leds.h>



#include <mach/regs-gpio.h>

#include <mach/hardware.h>

#include <mach/h1940-latch.h>

#include <mach/h1940.h>



#define DRV_NAME "h1940-bt"
@@ -37,6 +39,8 @@ static void h1940bt_enable(int on) 
		gpio_set_value(S3C2410_GPH(1), 1);

		mdelay(10);

		gpio_set_value(S3C2410_GPH(1), 0);



		h1940_led_blink_set(-EINVAL, GPIO_LED_BLINK, NULL, NULL);

	}

	else {

		gpio_set_value(S3C2410_GPH(1), 1);
@@ -44,6 +48,8 @@ static void h1940bt_enable(int on) 
		gpio_set_value(S3C2410_GPH(1), 0);

		mdelay(10);

		gpio_set_value(H1940_LATCH_BLUETOOTH_POWER, 0);



		h1940_led_blink_set(-EINVAL, GPIO_LED_NO_BLINK_LOW, NULL, NULL);

	}

}
@@ -85,7 +91,6 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) 
	s3c_gpio_cfgpin(S3C2410_GPH(3), S3C2410_GPH3_RXD0);

	s3c_gpio_setpull(S3C2410_GPH(3), S3C_GPIO_PULL_NONE);





	rfk = rfkill_alloc(DRV_NAME, &pdev->dev, RFKILL_TYPE_BLUETOOTH,

			&h1940bt_rfkill_ops, NULL);

	if (!rfk) {
@@ -93,8 +98,6 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) 
		goto err_rfk_alloc;

	}



	rfkill_set_led_trigger_name(rfk, "h1940-bluetooth");



	ret = rfkill_register(rfk);

	if (ret)

		goto err_rfkill;

arch/arm/mach-s3c2410/include/mach/h1940.h

+3 −0
Original line number Diff line number Diff line
@@ -17,5 +17,8 @@ 
#define H1940_SUSPEND_CHECK		(0x30080000)



extern void h1940_pm_return(void);

extern int h1940_led_blink_set(unsigned gpio, int state,

	unsigned long *delay_on, unsigned long *delay_off);





#endif /* __ASM_ARCH_H1940_H */

arch/arm/mach-s3c2410/mach-h1940.c

+290 −13
Original line number Diff line number Diff line
@@ -23,8 +23,15 @@ 
#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/pwm_backlight.h>

#include <linux/i2c.h>

#include <linux/leds.h>

#include <linux/pda_power.h>

#include <linux/s3c_adc_battery.h>

#include <linux/delay.h>



#include <video/platform_lcd.h>



#include <linux/mmc/host.h>
@@ -205,7 +212,7 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = { 


	.lpcsel =	0x02,

	.gpccon =	0xaa940659,

	.gpccon_mask=	0xffffffff,

	.gpccon_mask =	0xffffc0f0,

	.gpcup =	0x0000ffff,

	.gpcup_mask =	0xffffffff,

	.gpdcon =	0xaa84aaa0,
@@ -214,9 +221,228 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = { 
	.gpdup_mask =	0xffffffff,

};



static int power_supply_init(struct device *dev)

{

	return gpio_request(S3C2410_GPF(2), "cable plugged");

}



static int h1940_is_ac_online(void)

{

	return !gpio_get_value(S3C2410_GPF(2));

}



static void power_supply_exit(struct device *dev)

{

	gpio_free(S3C2410_GPF(2));

}



static char *h1940_supplicants[] = {

	"main-battery",

	"backup-battery",

};



static struct pda_power_pdata power_supply_info = {

	.init			= power_supply_init,

	.is_ac_online		= h1940_is_ac_online,

	.exit			= power_supply_exit,

	.supplied_to		= h1940_supplicants,

	.num_supplicants	= ARRAY_SIZE(h1940_supplicants),

};



static struct resource power_supply_resources[] = {

	[0] = {

			.name	= "ac",

			.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE |

					  IORESOURCE_IRQ_HIGHEDGE,

			.start	= IRQ_EINT2,

			.end	= IRQ_EINT2,

	},

};



static struct platform_device power_supply = {

	.name		= "pda-power",

	.id		= -1,

	.dev		= {

				.platform_data =

					&power_supply_info,

	},

	.resource	= power_supply_resources,

	.num_resources	= ARRAY_SIZE(power_supply_resources),

};



static const struct s3c_adc_bat_thresh bat_lut_noac[] = {

	{ .volt = 4070, .cur = 162, .level = 100},

	{ .volt = 4040, .cur = 165, .level = 95},

	{ .volt = 4016, .cur = 164, .level = 90},

	{ .volt = 3996, .cur = 166, .level = 85},

	{ .volt = 3971, .cur = 168, .level = 80},

	{ .volt = 3951, .cur = 168, .level = 75},

	{ .volt = 3931, .cur = 170, .level = 70},

	{ .volt = 3903, .cur = 172, .level = 65},

	{ .volt = 3886, .cur = 172, .level = 60},

	{ .volt = 3858, .cur = 176, .level = 55},

	{ .volt = 3842, .cur = 176, .level = 50},

	{ .volt = 3818, .cur = 176, .level = 45},

	{ .volt = 3789, .cur = 180, .level = 40},

	{ .volt = 3769, .cur = 180, .level = 35},

	{ .volt = 3749, .cur = 184, .level = 30},

	{ .volt = 3732, .cur = 184, .level = 25},

	{ .volt = 3716, .cur = 184, .level = 20},

	{ .volt = 3708, .cur = 184, .level = 15},

	{ .volt = 3716, .cur = 96, .level = 10},

	{ .volt = 3700, .cur = 96, .level = 5},

	{ .volt = 3684, .cur = 96, .level = 0},

};



static const struct s3c_adc_bat_thresh bat_lut_acin[] = {

	{ .volt = 4130, .cur = 0, .level = 100},

	{ .volt = 3982, .cur = 0, .level = 50},

	{ .volt = 3854, .cur = 0, .level = 10},

	{ .volt = 3841, .cur = 0, .level = 0},

};



int h1940_bat_init(void)

{

	int ret;



	ret = gpio_request(H1940_LATCH_SM803_ENABLE, "h1940-charger-enable");

	if (ret)

		return ret;

	gpio_direction_output(H1940_LATCH_SM803_ENABLE, 0);



	return 0;



}



void h1940_bat_exit(void)

{

	gpio_free(H1940_LATCH_SM803_ENABLE);

}



void h1940_enable_charger(void)

{

	gpio_set_value(H1940_LATCH_SM803_ENABLE, 1);

}



void h1940_disable_charger(void)

{

	gpio_set_value(H1940_LATCH_SM803_ENABLE, 0);

}



static struct s3c_adc_bat_pdata h1940_bat_cfg = {

	.init = h1940_bat_init,

	.exit = h1940_bat_exit,

	.enable_charger = h1940_enable_charger,

	.disable_charger = h1940_disable_charger,

	.gpio_charge_finished = S3C2410_GPF(3),

	.gpio_inverted = 1,

	.lut_noac = bat_lut_noac,

	.lut_noac_cnt = ARRAY_SIZE(bat_lut_noac),

	.lut_acin = bat_lut_acin,

	.lut_acin_cnt = ARRAY_SIZE(bat_lut_acin),

	.volt_channel = 0,

	.current_channel = 1,

	.volt_mult = 4056,

	.current_mult = 1893,

	.internal_impedance = 200,

	.backup_volt_channel = 3,

	/* TODO Check backup volt multiplier */

	.backup_volt_mult = 4056,

	.backup_volt_min = 0,

	.backup_volt_max = 4149288

};



static struct platform_device h1940_battery = {

	.name             = "s3c-adc-battery",

	.id               = -1,

	.dev = {

		.parent = &s3c_device_adc.dev,

		.platform_data = &h1940_bat_cfg,

	},

};



DEFINE_SPINLOCK(h1940_blink_spin);



int h1940_led_blink_set(unsigned gpio, int state,

	unsigned long *delay_on, unsigned long *delay_off)

{

	int blink_gpio, check_gpio1, check_gpio2;



	switch (gpio) {

	case H1940_LATCH_LED_GREEN:

		blink_gpio = S3C2410_GPA(7);

		check_gpio1 = S3C2410_GPA(1);

		check_gpio2 = S3C2410_GPA(3);

		break;

	case H1940_LATCH_LED_RED:

		blink_gpio = S3C2410_GPA(1);

		check_gpio1 = S3C2410_GPA(7);

		check_gpio2 = S3C2410_GPA(3);

		break;

	default:

		blink_gpio = S3C2410_GPA(3);

		check_gpio1 = S3C2410_GPA(1);

		check_gpio1 = S3C2410_GPA(7);

		break;

	}



	if (delay_on && delay_off && !*delay_on && !*delay_off)

		*delay_on = *delay_off = 500;



	spin_lock(&h1940_blink_spin);



	switch (state) {

	case GPIO_LED_NO_BLINK_LOW:

	case GPIO_LED_NO_BLINK_HIGH:

		if (!gpio_get_value(check_gpio1) &&

		    !gpio_get_value(check_gpio2))

			gpio_set_value(H1940_LATCH_LED_FLASH, 0);

		gpio_set_value(blink_gpio, 0);

		if (gpio_is_valid(gpio))

			gpio_set_value(gpio, state);

		break;

	case GPIO_LED_BLINK:

		if (gpio_is_valid(gpio))

			gpio_set_value(gpio, 0);

		gpio_set_value(H1940_LATCH_LED_FLASH, 1);

		gpio_set_value(blink_gpio, 1);

		break;

	}



	spin_unlock(&h1940_blink_spin);



	return 0;

}

EXPORT_SYMBOL(h1940_led_blink_set);



static struct gpio_led h1940_leds_desc[] = {

	{

		.name			= "Green",

		.default_trigger	= "main-battery-full",

		.gpio			= H1940_LATCH_LED_GREEN,

		.retain_state_suspended	= 1,

	},

	{

		.name			= "Red",

		.default_trigger

			= "main-battery-charging-blink-full-solid",

		.gpio			= H1940_LATCH_LED_RED,

		.retain_state_suspended	= 1,

	},

};



static struct gpio_led_platform_data h1940_leds_pdata = {

	.num_leds	= ARRAY_SIZE(h1940_leds_desc),

	.leds		= h1940_leds_desc,

	.gpio_blink_set	= h1940_led_blink_set,

};



static struct platform_device h1940_device_leds = {

	.name             = "h1940-leds",

	.name	= "leds-gpio",

	.id	= -1,

	.dev	= {

			.platform_data = &h1940_leds_pdata,

	},

};



static struct platform_device h1940_device_bluetooth = {
@@ -302,14 +528,14 @@ static struct platform_device h1940_backlight = { 
static void h1940_lcd_power_set(struct plat_lcd_data *pd,

					unsigned int power)

{

	int value;

	int value, retries = 100;



	if (!power) {

		gpio_set_value(S3C2410_GPC(0), 0);

		/* wait for 3ac */

		do {

			value = gpio_get_value(S3C2410_GPC(6));

		} while (value);

		} while (value && retries--);



		gpio_set_value(H1940_LATCH_LCD_P2, 0);

		gpio_set_value(H1940_LATCH_LCD_P3, 0);
@@ -327,6 +553,9 @@ static void h1940_lcd_power_set(struct plat_lcd_data *pd, 
		gpio_set_value(H1940_LATCH_LCD_P0, 1);

		gpio_set_value(H1940_LATCH_LCD_P1, 1);



		gpio_direction_input(S3C2410_GPC(1));

		gpio_direction_input(S3C2410_GPC(4));

		mdelay(10);

		s3c_gpio_cfgpin(S3C2410_GPC(1), S3C_GPIO_SFN(2));

		s3c_gpio_cfgpin(S3C2410_GPC(4), S3C_GPIO_SFN(2));
@@ -362,7 +591,44 @@ static struct i2c_board_info h1940_i2c_devices[] = { 
	},

};



#define DECLARE_BUTTON(p, k, n, w)	\

	{				\

		.gpio		= p,	\

		.code		= k,	\

		.desc		= n,	\

		.wakeup		= w,	\

		.active_low	= 1,	\

	}



static struct gpio_keys_button h1940_buttons[] = {

	DECLARE_BUTTON(S3C2410_GPF(0),       KEY_POWER,          "Power", 1),

	DECLARE_BUTTON(S3C2410_GPF(6),       KEY_ENTER,         "Select", 1),

	DECLARE_BUTTON(S3C2410_GPF(7),      KEY_RECORD,         "Record", 0),

	DECLARE_BUTTON(S3C2410_GPG(0),         KEY_F11,       "Calendar", 0),

	DECLARE_BUTTON(S3C2410_GPG(2),         KEY_F12,       "Contacts", 0),

	DECLARE_BUTTON(S3C2410_GPG(3),        KEY_MAIL,           "Mail", 0),

	DECLARE_BUTTON(S3C2410_GPG(6),        KEY_LEFT,     "Left_arrow", 0),

	DECLARE_BUTTON(S3C2410_GPG(7),    KEY_HOMEPAGE,           "Home", 0),

	DECLARE_BUTTON(S3C2410_GPG(8),       KEY_RIGHT,    "Right_arrow", 0),

	DECLARE_BUTTON(S3C2410_GPG(9),          KEY_UP,       "Up_arrow", 0),

	DECLARE_BUTTON(S3C2410_GPG(10),       KEY_DOWN,     "Down_arrow", 0),

};



static struct gpio_keys_platform_data h1940_buttons_data = {

	.buttons	= h1940_buttons,

	.nbuttons	= ARRAY_SIZE(h1940_buttons),

};



static struct platform_device h1940_dev_buttons = {

	.name		= "gpio-keys",

	.id		= -1,

	.dev		= {

		.platform_data  = &h1940_buttons_data,

	}

};



static struct platform_device *h1940_devices[] __initdata = {

	&h1940_dev_buttons,

	&s3c_device_ohci,

	&s3c_device_lcd,

	&s3c_device_wdt,
@@ -379,6 +645,8 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&h1940_lcd_powerdev,

	&s3c_device_adc,

	&s3c_device_ts,

	&power_supply,

	&h1940_battery,

};



static void __init h1940_map_io(void)
@@ -461,6 +729,15 @@ static void __init h1940_init(void) 


	platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices));



	gpio_request(S3C2410_GPA(1), "Red LED blink");

	gpio_request(S3C2410_GPA(3), "Blue LED blink");

	gpio_request(S3C2410_GPA(7), "Green LED blink");

	gpio_request(H1940_LATCH_LED_FLASH, "LED blink");

	gpio_direction_output(S3C2410_GPA(1), 0);

	gpio_direction_output(S3C2410_GPA(3), 0);

	gpio_direction_output(S3C2410_GPA(7), 0);

	gpio_direction_output(H1940_LATCH_LED_FLASH, 0);



	i2c_register_board_info(0, h1940_i2c_devices,

		ARRAY_SIZE(h1940_i2c_devices));

}

arch/arm/mach-s3c2440/mach-rx1950.c

+66 −8
Original line number Diff line number Diff line
@@ -263,27 +263,78 @@ void rx1950_disable_charger(void) 
	gpio_direction_output(S3C2410_GPJ(3), 0);

}



DEFINE_SPINLOCK(rx1950_blink_spin);



static int rx1950_led_blink_set(unsigned gpio, int state,

	unsigned long *delay_on, unsigned long *delay_off)

{

	int blink_gpio, check_gpio;



	switch (gpio) {

	case S3C2410_GPA(6):

		blink_gpio = S3C2410_GPA(4);

		check_gpio = S3C2410_GPA(3);

		break;

	case S3C2410_GPA(7):

		blink_gpio = S3C2410_GPA(3);

		check_gpio = S3C2410_GPA(4);

		break;

	default:

		return -EINVAL;

		break;

	}



	if (delay_on && delay_off && !*delay_on && !*delay_off)

		*delay_on = *delay_off = 500;



	spin_lock(&rx1950_blink_spin);



	switch (state) {

	case GPIO_LED_NO_BLINK_LOW:

	case GPIO_LED_NO_BLINK_HIGH:

		if (!gpio_get_value(check_gpio))

			gpio_set_value(S3C2410_GPJ(6), 0);

		gpio_set_value(blink_gpio, 0);

		gpio_set_value(gpio, state);

		break;

	case GPIO_LED_BLINK:

		gpio_set_value(gpio, 0);

		gpio_set_value(S3C2410_GPJ(6), 1);

		gpio_set_value(blink_gpio, 1);

		break;

	}



	spin_unlock(&rx1950_blink_spin);



	return 0;

}



static struct gpio_led rx1950_leds_desc[] = {

	{

		.name			= "Green",

		.default_trigger	= "main-battery-charging-or-full",

		.default_trigger	= "main-battery-full",

		.gpio			= S3C2410_GPA(6),

		.retain_state_suspended	= 1,

	},

	{

		.name			= "Red",

		.default_trigger	= "main-battery-full",

		.default_trigger

			= "main-battery-charging-blink-full-solid",

		.gpio			= S3C2410_GPA(7),

		.retain_state_suspended	= 1,

	},

	{

		.name			= "Blue",

		.default_trigger	= "rx1950-acx-mem",

		.gpio			= S3C2410_GPA(11),

		.retain_state_suspended	= 1,

	},

};



static struct gpio_led_platform_data rx1950_leds_pdata = {

	.num_leds	= ARRAY_SIZE(rx1950_leds_desc),

	.leds		= rx1950_leds_desc,

	.gpio_blink_set	= rx1950_led_blink_set,

};



static struct platform_device rx1950_leds = {
@@ -752,6 +803,13 @@ static void __init rx1950_init_machine(void) 


	WARN_ON(gpio_request(S3C2410_GPB(1), "LCD power"));



	WARN_ON(gpio_request(S3C2410_GPA(3), "Red blink"));

	WARN_ON(gpio_request(S3C2410_GPA(4), "Green blink"));

	WARN_ON(gpio_request(S3C2410_GPJ(6), "LED blink"));

	gpio_direction_output(S3C2410_GPA(3), 0);

	gpio_direction_output(S3C2410_GPA(4), 0);

	gpio_direction_output(S3C2410_GPJ(6), 0);



	platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices));



	i2c_register_board_info(0, rx1950_i2c_devices,

CRA Git | Maintained and supported by SUSTech CRA and CCSE