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

Commit 668dfc75 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge next-samsung-devupdates1 

Merge branch 'next-samsung-devupdates1' into next-samsung-try7
parents 9e157144 22c810ab

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

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static struct platform_device *amlm5900_devices[] __initdata = { 
	&s3c_device_adc,

	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_usb,

	&s3c_device_ohci,

 	&s3c_device_rtc,

	&s3c_device_usbgadget,

        &s3c_device_sdi,

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

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static struct s3c_hwmon_pdata bast_hwmon_info = { 
// cat /sys/devices/platform/s3c24xx-adc/s3c-hwmon/in_0



static struct platform_device *bast_devices[] __initdata = {

	&s3c_device_usb,

	&s3c_device_ohci,

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c0,

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

+3 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static struct platform_device h1940_device_bluetooth = { 
	.id               = -1,

};



static struct s3c24xx_mci_pdata h1940_mmc_cfg = {

static struct s3c24xx_mci_pdata h1940_mmc_cfg __initdata = {

	.gpio_detect   = S3C2410_GPF(5),

	.gpio_wprotect = S3C2410_GPH(8),

	.set_power     = NULL,
@@ -272,7 +272,7 @@ static struct platform_device h1940_lcd_powerdev = { 


static struct platform_device *h1940_devices[] __initdata = {

	&s3c_device_ts,

	&s3c_device_usb,

	&s3c_device_ohci,

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c0,
@@ -311,12 +311,11 @@ static void __init h1940_init(void) 
	u32 tmp;



	s3c24xx_fb_set_platdata(&h1940_fb_info);

	s3c24xx_mci_set_platdata(&h1940_mmc_cfg);

 	s3c24xx_udc_set_platdata(&h1940_udc_cfg);

	s3c24xx_ts_set_platdata(&h1940_ts_cfg);

	s3c_i2c0_set_platdata(NULL);



	s3c_device_sdi.dev.platform_data = &h1940_mmc_cfg;



	/* Turn off suspend on both USB ports, and switch the

	 * selectable USB port to USB device mode. */

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

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static struct platform_device *n30_devices[] __initdata = { 
	&s3c_device_wdt,

	&s3c_device_i2c0,

	&s3c_device_iis,

	&s3c_device_usb,

	&s3c_device_ohci,

	&s3c_device_usbgadget,

	&n30_button_device,

	&n30_blue_led,

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static struct platform_device otom_device_nor = { 
/* Standard OTOM devices */



static struct platform_device *otom11_devices[] __initdata = {

	&s3c_device_usb,

	&s3c_device_ohci,

	&s3c_device_lcd,

	&s3c_device_wdt,

	&s3c_device_i2c0,