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

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

Merge branch 'for-2637/s3c24xx-all' of git://git.fluff.org/bjdooks/linux 

* 'for-2637/s3c24xx-all' of git://git.fluff.org/bjdooks/linux:
  ARM: h1940: add UDA1380 to i2c devices list
  ARM: h1940: Fix backlight and LCD power functions
  ARM: S3C2440: fix boot failure introduced by recent changes in gpiolib
  ARM: S3C2440: various fixes in Kconfig file
  ARM: rx1950: Add UDA1380 to i2c devices list
  ARM: rx1950: Add LEDs support
  ARM: rx1950: Add battery device
  ARM: h1940: Implement mmc_power function
  ARM: h1940: Use gpiolib for latch access
parents 44234d0c d7b4e421

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

+10 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void h1940bt_enable(int on) 
{

	if (on) {

		/* Power on the chip */

		h1940_latch_control(0, H1940_LATCH_BLUETOOTH_POWER);

		gpio_set_value(H1940_LATCH_BLUETOOTH_POWER, 1);

		/* Reset the chip */

		mdelay(10);
@@ -43,7 +43,7 @@ static void h1940bt_enable(int on) 
		mdelay(10);

		gpio_set_value(S3C2410_GPH(1), 0);

		mdelay(10);

		h1940_latch_control(H1940_LATCH_BLUETOOTH_POWER, 0);

		gpio_set_value(H1940_LATCH_BLUETOOTH_POWER, 0);

	}

}
@@ -64,7 +64,14 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) 


	ret = gpio_request(S3C2410_GPH(1), dev_name(&pdev->dev));

	if (ret) {

		dev_err(&pdev->dev, "could not get GPH1\n");\

		dev_err(&pdev->dev, "could not get GPH1\n");

		return ret;

	}



	ret = gpio_request(H1940_LATCH_BLUETOOTH_POWER, dev_name(&pdev->dev));

	if (ret) {

		gpio_free(S3C2410_GPH(1));

		dev_err(&pdev->dev, "could not get BT_POWER\n");

		return ret;

	}

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

+18 −39
Original line number Diff line number Diff line
@@ -14,51 +14,30 @@ 
#ifndef __ASM_ARCH_H1940_LATCH_H

#define __ASM_ARCH_H1940_LATCH_H



#include <mach/gpio.h>



#ifndef __ASSEMBLY__

#define H1940_LATCH		((void __force __iomem *)0xF8000000)

#else

#define H1940_LATCH		0xF8000000

#endif



#define H1940_PA_LATCH		(S3C2410_CS2)

#define H1940_LATCH_GPIO(x)		(S3C_GPIO_END + (x))



/* SD layer latch */



#define H1940_LATCH_SDQ1		(1<<16)

#define H1940_LATCH_LCD_P1		(1<<17)

#define H1940_LATCH_LCD_P2		(1<<18)

#define H1940_LATCH_LCD_P3		(1<<19)

#define H1940_LATCH_MAX1698_nSHUTDOWN	(1<<20)		/* LCD backlight */

#define H1940_LATCH_LED_RED		(1<<21)

#define H1940_LATCH_SDQ7		(1<<22)

#define H1940_LATCH_USB_DP		(1<<23)

#define H1940_LATCH_LCD_P0		H1940_LATCH_GPIO(0)

#define H1940_LATCH_LCD_P1		H1940_LATCH_GPIO(1)

#define H1940_LATCH_LCD_P2		H1940_LATCH_GPIO(2)

#define H1940_LATCH_LCD_P3		H1940_LATCH_GPIO(3)

#define H1940_LATCH_MAX1698_nSHUTDOWN	H1940_LATCH_GPIO(4)

#define H1940_LATCH_LED_RED		H1940_LATCH_GPIO(5)

#define H1940_LATCH_SDQ7		H1940_LATCH_GPIO(6)

#define H1940_LATCH_USB_DP		H1940_LATCH_GPIO(7)



/* CPU layer latch */



#define H1940_LATCH_UDA_POWER		(1<<24)

#define H1940_LATCH_AUDIO_POWER		(1<<25)

#define H1940_LATCH_SM803_ENABLE	(1<<26)

#define H1940_LATCH_LCD_P4		(1<<27)

#define H1940_LATCH_CPUQ5		(1<<28)		/* untraced */

#define H1940_LATCH_BLUETOOTH_POWER	(1<<29)		/* active high */

#define H1940_LATCH_LED_GREEN		(1<<30)

#define H1940_LATCH_LED_FLASH		(1<<31)



/* default settings */



#define H1940_LATCH_DEFAULT		\

	H1940_LATCH_LCD_P4		| \

	H1940_LATCH_SM803_ENABLE	| \

	H1940_LATCH_SDQ1		| \

	H1940_LATCH_LCD_P1		| \

	H1940_LATCH_LCD_P2		| \

	H1940_LATCH_LCD_P3		| \

	H1940_LATCH_MAX1698_nSHUTDOWN   | \

	H1940_LATCH_CPUQ5



/* control functions */



extern void h1940_latch_control(unsigned int clear, unsigned int set);

#define H1940_LATCH_UDA_POWER		H1940_LATCH_GPIO(8)

#define H1940_LATCH_AUDIO_POWER		H1940_LATCH_GPIO(9)

#define H1940_LATCH_SM803_ENABLE	H1940_LATCH_GPIO(10)

#define H1940_LATCH_LCD_P4		H1940_LATCH_GPIO(11)

#define H1940_LATCH_SD_POWER		H1940_LATCH_GPIO(12)

#define H1940_LATCH_BLUETOOTH_POWER	H1940_LATCH_GPIO(13)

#define H1940_LATCH_LED_GREEN		H1940_LATCH_GPIO(14)

#define H1940_LATCH_LED_FLASH		H1940_LATCH_GPIO(15)



#endif /* __ASM_ARCH_H1940_LATCH_H */

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

+154 −15
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/pwm_backlight.h>

#include <linux/i2c.h>

#include <video/platform_lcd.h>



#include <linux/mmc/host.h>
@@ -59,6 +60,14 @@ 
#include <plat/mci.h>

#include <plat/ts.h>



#include <sound/uda1380.h>



#define H1940_LATCH		((void __force __iomem *)0xF8000000)



#define H1940_PA_LATCH		S3C2410_CS2



#define H1940_LATCH_BIT(x)	(1 << ((x) + 16 - S3C_GPIO_END))



static struct map_desc h1940_iodesc[] __initdata = {

	[0] = {

		.virtual	= (unsigned long)H1940_LATCH,
@@ -100,9 +109,9 @@ static struct s3c2410_uartcfg h1940_uartcfgs[] __initdata = { 


/* Board control latch control */



static unsigned int latch_state = H1940_LATCH_DEFAULT;

static unsigned int latch_state;



void h1940_latch_control(unsigned int clear, unsigned int set)

static void h1940_latch_control(unsigned int clear, unsigned int set)

{

	unsigned long flags;
@@ -116,7 +125,42 @@ void h1940_latch_control(unsigned int clear, unsigned int set) 
	local_irq_restore(flags);

}



EXPORT_SYMBOL_GPL(h1940_latch_control);

static inline int h1940_gpiolib_to_latch(int offset)

{

	return 1 << (offset + 16);

}



static void h1940_gpiolib_latch_set(struct gpio_chip *chip,

					unsigned offset, int value)

{

	int latch_bit = h1940_gpiolib_to_latch(offset);



	h1940_latch_control(value ? 0 : latch_bit,

		value ? latch_bit : 0);

}



static int h1940_gpiolib_latch_output(struct gpio_chip *chip,

					unsigned offset, int value)

{

	h1940_gpiolib_latch_set(chip, offset, value);

	return 0;

}



static int h1940_gpiolib_latch_get(struct gpio_chip *chip,

					unsigned offset)

{

	return (latch_state >> (offset + 16)) & 1;

}



struct gpio_chip h1940_latch_gpiochip = {

	.base			= H1940_LATCH_GPIO(0),

	.owner			= THIS_MODULE,

	.label			= "H1940_LATCH",

	.ngpio			= 16,

	.direction_output	= h1940_gpiolib_latch_output,

	.set			= h1940_gpiolib_latch_set,

	.get			= h1940_gpiolib_latch_get,

};



static void h1940_udc_pullup(enum s3c2410_udc_cmd_e cmd)

{
@@ -125,10 +169,10 @@ static void h1940_udc_pullup(enum s3c2410_udc_cmd_e cmd) 
	switch (cmd)

	{

		case S3C2410_UDC_P_ENABLE :

			h1940_latch_control(0, H1940_LATCH_USB_DP);

			gpio_set_value(H1940_LATCH_USB_DP, 1);

			break;

		case S3C2410_UDC_P_DISABLE :

			h1940_latch_control(H1940_LATCH_USB_DP, 0);

			gpio_set_value(H1940_LATCH_USB_DP, 0);

			break;

		case S3C2410_UDC_P_RESET :

			break;
@@ -199,10 +243,25 @@ static struct platform_device h1940_device_bluetooth = { 
	.id               = -1,

};



static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd)

{

	switch (power_mode) {

	case MMC_POWER_OFF:

		gpio_set_value(H1940_LATCH_SD_POWER, 0);

		break;

	case MMC_POWER_UP:

	case MMC_POWER_ON:

		gpio_set_value(H1940_LATCH_SD_POWER, 1);

		break;

	default:

		break;

	};

}



static struct s3c24xx_mci_pdata h1940_mmc_cfg __initdata = {

	.gpio_detect   = S3C2410_GPF(5),

	.gpio_wprotect = S3C2410_GPH(8),

	.set_power     = NULL,

	.set_power     = h1940_set_mmc_power,

	.ocr_avail     = MMC_VDD_32_33,

};
@@ -213,15 +272,32 @@ static int h1940_backlight_init(struct device *dev) 
	gpio_direction_output(S3C2410_GPB(0), 0);

	s3c_gpio_setpull(S3C2410_GPB(0), S3C_GPIO_PULL_NONE);

	s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0);

	gpio_set_value(H1940_LATCH_MAX1698_nSHUTDOWN, 1);



	return 0;

}



static int h1940_backlight_notify(struct device *dev, int brightness)

{

	if (!brightness) {

		gpio_direction_output(S3C2410_GPB(0), 1);

		gpio_set_value(H1940_LATCH_MAX1698_nSHUTDOWN, 0);

	} else {

		gpio_direction_output(S3C2410_GPB(0), 0);

		s3c_gpio_setpull(S3C2410_GPB(0), S3C_GPIO_PULL_NONE);

		s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPB0_TOUT0);

		gpio_set_value(H1940_LATCH_MAX1698_nSHUTDOWN, 1);

	}

	return brightness;

}



static void h1940_backlight_exit(struct device *dev)

{

	gpio_direction_output(S3C2410_GPB(0), 1);

	gpio_set_value(H1940_LATCH_MAX1698_nSHUTDOWN, 0);

}





static struct platform_pwm_backlight_data backlight_data = {

	.pwm_id         = 0,

	.max_brightness = 100,
@@ -229,6 +305,7 @@ static struct platform_pwm_backlight_data backlight_data = { 
	/* tcnt = 0x31 */

	.pwm_period_ns  = 36296,

	.init           = h1940_backlight_init,

	.notify		= h1940_backlight_notify,

	.exit           = h1940_backlight_exit,

};
@@ -247,19 +324,37 @@ static void h1940_lcd_power_set(struct plat_lcd_data *pd, 
	int value;



	if (!power) {

		/* set to 3ec */

		gpio_direction_output(S3C2410_GPC(0), 0);

		gpio_set_value(S3C2410_GPC(0), 0);

		/* wait for 3ac */

		do {

			value = gpio_get_value(S3C2410_GPC(6));

		} while (value);

		/* set to 38c */

		gpio_direction_output(S3C2410_GPC(5), 0);



		gpio_set_value(H1940_LATCH_LCD_P2, 0);

		gpio_set_value(H1940_LATCH_LCD_P3, 0);

		gpio_set_value(H1940_LATCH_LCD_P4, 0);



		gpio_direction_output(S3C2410_GPC(1), 0);

		gpio_direction_output(S3C2410_GPC(4), 0);



		gpio_set_value(H1940_LATCH_LCD_P1, 0);

		gpio_set_value(H1940_LATCH_LCD_P0, 0);



		gpio_set_value(S3C2410_GPC(5), 0);



	} else {

		/* Set to 3ac */

		gpio_direction_output(S3C2410_GPC(5), 1);

		/* Set to 3ad */

		gpio_direction_output(S3C2410_GPC(0), 1);

		gpio_set_value(H1940_LATCH_LCD_P0, 1);

		gpio_set_value(H1940_LATCH_LCD_P1, 1);



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

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



		gpio_set_value(S3C2410_GPC(5), 1);

		gpio_set_value(S3C2410_GPC(0), 1);



		gpio_set_value(H1940_LATCH_LCD_P3, 1);

		gpio_set_value(H1940_LATCH_LCD_P2, 1);

		gpio_set_value(H1940_LATCH_LCD_P4, 1);

	}

}
@@ -273,12 +368,26 @@ static struct platform_device h1940_lcd_powerdev = { 
	.dev.platform_data      = &h1940_lcd_power_data,

};



static struct uda1380_platform_data uda1380_info = {

	.gpio_power	= H1940_LATCH_UDA_POWER,

	.gpio_reset	= S3C2410_GPA(12),

	.dac_clk	= UDA1380_DAC_CLK_SYSCLK,

};



static struct i2c_board_info h1940_i2c_devices[] = {

	{

		I2C_BOARD_INFO("uda1380", 0x1a),

		.platform_data = &uda1380_info,

	},

};



static struct platform_device *h1940_devices[] __initdata = {

	&s3c_device_ohci,

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&s3c_device_usbgadget,

	&h1940_device_leds,

	&h1940_device_bluetooth,
@@ -303,6 +412,10 @@ static void __init h1940_map_io(void) 
	memcpy(phys_to_virt(H1940_SUSPEND_RESUMEAT), h1940_pm_return, 1024);

#endif

	s3c_pm_init();



	/* Add latch gpio chip, set latch initial value */

	h1940_latch_control(0, 0);

	WARN_ON(gpiochip_add(&h1940_latch_gpiochip));

}



/* H1940 and RX3715 need to reserve this for suspend */
@@ -340,12 +453,38 @@ static void __init h1940_init(void) 
	writel(tmp, S3C2410_UPLLCON);



	gpio_request(S3C2410_GPC(0), "LCD power");

	gpio_request(S3C2410_GPC(1), "LCD power");

	gpio_request(S3C2410_GPC(4), "LCD power");

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

	gpio_request(S3C2410_GPC(6), "LCD power");



	gpio_request(H1940_LATCH_LCD_P0, "LCD power");

	gpio_request(H1940_LATCH_LCD_P1, "LCD power");

	gpio_request(H1940_LATCH_LCD_P2, "LCD power");

	gpio_request(H1940_LATCH_LCD_P3, "LCD power");

	gpio_request(H1940_LATCH_LCD_P4, "LCD power");

	gpio_request(H1940_LATCH_MAX1698_nSHUTDOWN, "LCD power");

	gpio_direction_output(S3C2410_GPC(0), 0);

	gpio_direction_output(S3C2410_GPC(1), 0);

	gpio_direction_output(S3C2410_GPC(4), 0);

	gpio_direction_output(S3C2410_GPC(5), 0);

	gpio_direction_input(S3C2410_GPC(6));

	gpio_direction_output(H1940_LATCH_LCD_P0, 0);

	gpio_direction_output(H1940_LATCH_LCD_P1, 0);

	gpio_direction_output(H1940_LATCH_LCD_P2, 0);

	gpio_direction_output(H1940_LATCH_LCD_P3, 0);

	gpio_direction_output(H1940_LATCH_LCD_P4, 0);

	gpio_direction_output(H1940_LATCH_MAX1698_nSHUTDOWN, 0);



	gpio_request(H1940_LATCH_USB_DP, "USB pullup");

	gpio_direction_output(H1940_LATCH_USB_DP, 0);



	gpio_request(H1940_LATCH_SD_POWER, "SD power");

	gpio_direction_output(H1940_LATCH_SD_POWER, 0);



	platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices));



	i2c_register_board_info(0, h1940_i2c_devices,

		ARRAY_SIZE(h1940_i2c_devices));

}



MACHINE_START(H1940, "IPAQ-H1940")

arch/arm/mach-s3c2440/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


config CPU_S3C2440

	bool

	depends on ARCH_S3C2410

	select CPU_ARM920T

	select S3C_GPIO_PULL_UP

	select S3C2410_CLOCK
@@ -18,7 +17,6 @@ config CPU_S3C2440 


config CPU_S3C2442

	bool

	depends on ARCH_S3C2410

	select CPU_ARM920T

	select S3C2410_CLOCK

	select S3C2410_GPIO
@@ -30,7 +28,7 @@ config CPU_S3C2442 


config CPU_S3C244X

	bool

	depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)

	depends on CPU_S3C2440 || CPU_S3C2442

	help

	  Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
@@ -72,7 +70,7 @@ config S3C2440_PLL_16934400 


config S3C2440_DMA

	bool

	depends on ARCH_S3C2410 && CPU_S3C24405B

	depends on CPU_S3C2440

	help

	  Support for S3C2440 specific DMA code5A
@@ -181,7 +179,6 @@ config MACH_MINI2440 
	select CPU_S3C2440

	select EEPROM_AT24

	select LEDS_TRIGGER_BACKLIGHT

	select SND_S3C24XX_SOC_S3C24XX_UDA134X

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	help

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

+212 −6
Original line number Diff line number Diff line
@@ -25,8 +25,12 @@ 
#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/sysdev.h>

#include <linux/pda_power.h>

#include <linux/pwm_backlight.h>

#include <linux/pwm.h>

#include <linux/s3c_adc_battery.h>

#include <linux/leds.h>

#include <linux/i2c.h>



#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -55,6 +59,8 @@ 
#include <plat/irq.h>

#include <plat/ts.h>



#include <sound/uda1380.h>



#define LCD_PWM_PERIOD 192960

#define LCD_PWM_DUTY 127353
@@ -127,6 +133,193 @@ static struct s3c2410fb_display rx1950_display = { 


};



static int power_supply_init(struct device *dev)

{

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

}



static int rx1950_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 *rx1950_supplicants[] = {

	"main-battery"

};



static struct pda_power_pdata power_supply_info = {

	.init			= power_supply_init,

	.is_ac_online		= rx1950_is_ac_online,

	.exit			= power_supply_exit,

	.supplied_to		= rx1950_supplicants,

	.num_supplicants	= ARRAY_SIZE(rx1950_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 = 4100, .cur = 156, .level = 100},

	{ .volt = 4050, .cur = 156, .level = 95},

	{ .volt = 4025, .cur = 141, .level = 90},

	{ .volt = 3995, .cur = 144, .level = 85},

	{ .volt = 3957, .cur = 162, .level = 80},

	{ .volt = 3931, .cur = 147, .level = 75},

	{ .volt = 3902, .cur = 147, .level = 70},

	{ .volt = 3863, .cur = 153, .level = 65},

	{ .volt = 3838, .cur = 150, .level = 60},

	{ .volt = 3800, .cur = 153, .level = 55},

	{ .volt = 3765, .cur = 153, .level = 50},

	{ .volt = 3748, .cur = 172, .level = 45},

	{ .volt = 3740, .cur = 153, .level = 40},

	{ .volt = 3714, .cur = 175, .level = 35},

	{ .volt = 3710, .cur = 156, .level = 30},

	{ .volt = 3963, .cur = 156, .level = 25},

	{ .volt = 3672, .cur = 178, .level = 20},

	{ .volt = 3651, .cur = 178, .level = 15},

	{ .volt = 3629, .cur = 178, .level = 10},

	{ .volt = 3612, .cur = 162, .level = 5},

	{ .volt = 3605, .cur = 162, .level = 0},

};



static const struct s3c_adc_bat_thresh bat_lut_acin[] = {

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

	{ .volt = 4190, .cur = 0, .level = 99},

	{ .volt = 4178, .cur = 0, .level = 95},

	{ .volt = 4110, .cur = 0, .level = 70},

	{ .volt = 4076, .cur = 0, .level = 65},

	{ .volt = 4046, .cur = 0, .level = 60},

	{ .volt = 4021, .cur = 0, .level = 55},

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

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

	{ .volt = 3965, .cur = 0, .level = 40},

	{ .volt = 3957, .cur = 0, .level = 35},

	{ .volt = 3948, .cur = 0, .level = 30},

	{ .volt = 3936, .cur = 0, .level = 25},

	{ .volt = 3927, .cur = 0, .level = 20},

	{ .volt = 3906, .cur = 0, .level = 15},

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

	{ .volt = 3829, .cur = 0, .level = 5},

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

};



int rx1950_bat_init(void)

{

	int ret;



	ret = gpio_request(S3C2410_GPJ(2), "rx1950-charger-enable-1");

	if (ret)

		goto err_gpio1;

	ret = gpio_request(S3C2410_GPJ(3), "rx1950-charger-enable-2");

	if (ret)

		goto err_gpio2;



	return 0;



err_gpio2:

	gpio_free(S3C2410_GPJ(2));

err_gpio1:

	return ret;

}



void rx1950_bat_exit(void)

{

	gpio_free(S3C2410_GPJ(2));

	gpio_free(S3C2410_GPJ(3));

}



void rx1950_enable_charger(void)

{

	gpio_direction_output(S3C2410_GPJ(2), 1);

	gpio_direction_output(S3C2410_GPJ(3), 1);

}



void rx1950_disable_charger(void)

{

	gpio_direction_output(S3C2410_GPJ(2), 0);

	gpio_direction_output(S3C2410_GPJ(3), 0);

}



static struct gpio_led rx1950_leds_desc[] = {

	{

		.name				= "Green",

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

		.gpio				= S3C2410_GPA(6),

	},

	{

		.name				= "Red",

		.default_trigger	= "main-battery-full",

		.gpio				= S3C2410_GPA(7),

	},

	{

		.name				= "Blue",

		.default_trigger	= "rx1950-acx-mem",

		.gpio				= S3C2410_GPA(11),

	},

};



static struct gpio_led_platform_data rx1950_leds_pdata = {

	.num_leds	= ARRAY_SIZE(rx1950_leds_desc),

	.leds		= rx1950_leds_desc,

};



static struct platform_device rx1950_leds = {

	.name	= "leds-gpio",

	.id		= -1,

	.dev	= {

				.platform_data = &rx1950_leds_pdata,

	},

};



static struct s3c_adc_bat_pdata rx1950_bat_cfg = {

	.init = rx1950_bat_init,

	.exit = rx1950_bat_exit,

	.enable_charger = rx1950_enable_charger,

	.disable_charger = rx1950_disable_charger,

	.gpio_charge_finished = S3C2410_GPF(3),

	.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 = 4235,

	.current_mult = 2900,

	.internal_impedance = 200,

};



static struct platform_device rx1950_battery = {

	.name             = "s3c-adc-battery",

	.id               = -1,

	.dev = {

		.parent = &s3c_device_adc.dev,

		.platform_data = &rx1950_bat_cfg,

	},

};



static struct s3c2410fb_mach_info rx1950_lcd_cfg = {

	.displays = &rx1950_display,

	.num_displays = 1,
@@ -481,11 +674,17 @@ static struct platform_device rx1950_device_gpiokeys = { 
	.dev.platform_data = &rx1950_gpio_keys_data,

};



static struct s3c2410_platform_i2c rx1950_i2c_data = {

	.flags = 0,

	.slave_addr = 0x42,

	.frequency = 400 * 1000,

	.sda_delay = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON,

static struct uda1380_platform_data uda1380_info = {

	.gpio_power	= S3C2410_GPJ(0),

	.gpio_reset	= S3C2410_GPD(0),

	.dac_clk	= UDA1380_DAC_CLK_SYSCLK,

};



static struct i2c_board_info rx1950_i2c_devices[] = {

	{

		I2C_BOARD_INFO("uda1380", 0x1a),

		.platform_data = &uda1380_info,

	},

};



static struct platform_device *rx1950_devices[] __initdata = {
@@ -493,6 +692,7 @@ static struct platform_device *rx1950_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_pcm,

	&s3c_device_usbgadget,

	&s3c_device_rtc,

	&s3c_device_nand,
@@ -503,6 +703,9 @@ static struct platform_device *rx1950_devices[] __initdata = { 
	&s3c_device_timer[1],

	&rx1950_backlight,

	&rx1950_device_gpiokeys,

	&power_supply,

	&rx1950_battery,

	&rx1950_leds,

};



static struct clk *rx1950_clocks[] __initdata = {
@@ -538,7 +741,7 @@ static void __init rx1950_init_machine(void) 
	s3c24xx_udc_set_platdata(&rx1950_udc_cfg);

	s3c24xx_ts_set_platdata(&rx1950_ts_cfg);

	s3c24xx_mci_set_platdata(&rx1950_mmc_cfg);

	s3c_i2c0_set_platdata(&rx1950_i2c_data);

	s3c_i2c0_set_platdata(NULL);

	s3c_nand_set_platdata(&rx1950_nand_info);



	/* Turn off suspend on both USB ports, and switch the
@@ -569,6 +772,9 @@ static void __init rx1950_init_machine(void) 
	WARN_ON(gpio_request(S3C2410_GPB(1), "LCD power"));



	platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices));



	i2c_register_board_info(0, rx1950_i2c_devices,

		ARRAY_SIZE(rx1950_i2c_devices));

}



/* H1940 and RX3715 need to reserve this for suspend */