Commit bc3b67b8 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/s3c24xx-general 

Merge branch 'for-2635/s3c24xx-general' into for-linus/samsung2
parents b78232da 26be1b7b

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

+5 −4
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ static struct s3c2410fb_display h1940_lcd __initdata = { 
	.xres =		240,

	.yres =		320,

	.bpp =		16,

	.left_margin =	20,

	.right_margin =	8,

	.left_margin =	8,

	.right_margin =	20,

	.hsync_len =	4,

	.upper_margin =	8,

	.lower_margin = 7,
@@ -271,7 +271,6 @@ static struct platform_device h1940_lcd_powerdev = { 
};



static struct platform_device *h1940_devices[] __initdata = {

	&s3c_device_ts,

	&s3c_device_ohci,

	&s3c_device_lcd,

	&s3c_device_wdt,
@@ -285,6 +284,8 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_timer[0],

	&h1940_backlight,

	&h1940_lcd_powerdev,

	&s3c_device_adc,

	&s3c_device_ts,

};



static void __init h1940_map_io(void)
@@ -337,7 +338,7 @@ static void __init h1940_init(void) 
}



MACHINE_START(H1940, "IPAQ-H1940")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

arch/arm/mach-s3c2412/mach-jive.c

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static void __init jive_machine_init(void) 
}



MACHINE_START(JIVE, "JIVE")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

arch/arm/mach-s3c2412/mach-smdk2413.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static void __init smdk2413_machine_init(void) 
}



MACHINE_START(S3C2413, "S3C2413")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,
@@ -163,7 +163,7 @@ MACHINE_START(S3C2413, "S3C2413") 
MACHINE_END



MACHINE_START(SMDK2412, "SMDK2412")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,
@@ -176,7 +176,7 @@ MACHINE_START(SMDK2412, "SMDK2412") 
MACHINE_END



MACHINE_START(SMDK2413, "SMDK2413")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static void __init rx3715_init_machine(void) 
}



MACHINE_START(RX3715, "IPAQ-RX3715")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

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

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void __init smdk2440_machine_init(void) 
}



MACHINE_START(S3C2440, "SMDK2440")

	/* Maintainer: Ben Dooks <ben@fluff.org> */

	/* Maintainer: Ben Dooks <ben-linux@fluff.org> */

	.phys_io	= S3C2410_PA_UART,

	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,