mirror of
https://github.com/torvalds/linux
synced 2024-09-22 20:37:18 +00:00
ARM: Merge for-2635/s3c24xx-general
Merge branch 'for-2635/s3c24xx-general' into for-linus/samsung2
This commit is contained in:
commit
bc3b67b8e9
|
@ -162,8 +162,8 @@ static struct s3c2410fb_display h1940_lcd __initdata = {
|
||||||
.xres = 240,
|
.xres = 240,
|
||||||
.yres = 320,
|
.yres = 320,
|
||||||
.bpp = 16,
|
.bpp = 16,
|
||||||
.left_margin = 20,
|
.left_margin = 8,
|
||||||
.right_margin = 8,
|
.right_margin = 20,
|
||||||
.hsync_len = 4,
|
.hsync_len = 4,
|
||||||
.upper_margin = 8,
|
.upper_margin = 8,
|
||||||
.lower_margin = 7,
|
.lower_margin = 7,
|
||||||
|
@ -271,7 +271,6 @@ static struct platform_device h1940_lcd_powerdev = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device *h1940_devices[] __initdata = {
|
static struct platform_device *h1940_devices[] __initdata = {
|
||||||
&s3c_device_ts,
|
|
||||||
&s3c_device_ohci,
|
&s3c_device_ohci,
|
||||||
&s3c_device_lcd,
|
&s3c_device_lcd,
|
||||||
&s3c_device_wdt,
|
&s3c_device_wdt,
|
||||||
|
@ -285,6 +284,8 @@ static struct platform_device *h1940_devices[] __initdata = {
|
||||||
&s3c_device_timer[0],
|
&s3c_device_timer[0],
|
||||||
&h1940_backlight,
|
&h1940_backlight,
|
||||||
&h1940_lcd_powerdev,
|
&h1940_lcd_powerdev,
|
||||||
|
&s3c_device_adc,
|
||||||
|
&s3c_device_ts,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init h1940_map_io(void)
|
static void __init h1940_map_io(void)
|
||||||
|
@ -337,7 +338,7 @@ static void __init h1940_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(H1940, "IPAQ-H1940")
|
MACHINE_START(H1940, "IPAQ-H1940")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
|
|
@ -674,7 +674,7 @@ static void __init jive_machine_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(JIVE, "JIVE")
|
MACHINE_START(JIVE, "JIVE")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
|
|
@ -150,7 +150,7 @@ static void __init smdk2413_machine_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(S3C2413, "S3C2413")
|
MACHINE_START(S3C2413, "S3C2413")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
@ -163,7 +163,7 @@ MACHINE_START(S3C2413, "S3C2413")
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
MACHINE_START(SMDK2412, "SMDK2412")
|
MACHINE_START(SMDK2412, "SMDK2412")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
@ -176,7 +176,7 @@ MACHINE_START(SMDK2412, "SMDK2412")
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
MACHINE_START(SMDK2413, "SMDK2413")
|
MACHINE_START(SMDK2413, "SMDK2413")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
|
|
@ -209,7 +209,7 @@ static void __init rx3715_init_machine(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(RX3715, "IPAQ-RX3715")
|
MACHINE_START(RX3715, "IPAQ-RX3715")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
|
|
@ -174,7 +174,7 @@ static void __init smdk2440_machine_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(S3C2440, "SMDK2440")
|
MACHINE_START(S3C2440, "SMDK2440")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
|
|
@ -131,7 +131,7 @@ static void __init smdk2443_machine_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(SMDK2443, "SMDK2443")
|
MACHINE_START(SMDK2443, "SMDK2443")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C2410_PA_UART,
|
.phys_io = S3C2410_PA_UART,
|
||||||
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
.boot_params = S3C2410_SDRAM_PA + 0x100,
|
||||||
|
|
|
@ -84,7 +84,7 @@ static void __init smdk6400_machine_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(SMDK6400, "SMDK6400")
|
MACHINE_START(SMDK6400, "SMDK6400")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C_PA_UART & 0xfff00000,
|
.phys_io = S3C_PA_UART & 0xfff00000,
|
||||||
.io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C64XX_PA_SDRAM + 0x100,
|
.boot_params = S3C64XX_PA_SDRAM + 0x100,
|
||||||
|
|
|
@ -656,7 +656,7 @@ static void __init smdk6410_machine_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(SMDK6410, "SMDK6410")
|
MACHINE_START(SMDK6410, "SMDK6410")
|
||||||
/* Maintainer: Ben Dooks <ben@fluff.org> */
|
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
|
||||||
.phys_io = S3C_PA_UART & 0xfff00000,
|
.phys_io = S3C_PA_UART & 0xfff00000,
|
||||||
.io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
|
.io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
|
||||||
.boot_params = S3C64XX_PA_SDRAM + 0x100,
|
.boot_params = S3C64XX_PA_SDRAM + 0x100,
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
#include <linux/string.h>
|
||||||
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
#include <asm/mach/map.h>
|
#include <asm/mach/map.h>
|
||||||
|
@ -149,10 +150,14 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd)
|
||||||
{
|
{
|
||||||
struct s3c2410fb_mach_info *npd;
|
struct s3c2410fb_mach_info *npd;
|
||||||
|
|
||||||
npd = kmalloc(sizeof(*npd), GFP_KERNEL);
|
npd = kmemdup(pd, sizeof(*npd), GFP_KERNEL);
|
||||||
if (npd) {
|
if (npd) {
|
||||||
memcpy(npd, pd, sizeof(*npd));
|
|
||||||
s3c_device_lcd.dev.platform_data = npd;
|
s3c_device_lcd.dev.platform_data = npd;
|
||||||
|
npd->displays = kmemdup(pd->displays,
|
||||||
|
sizeof(struct s3c2410fb_display) * npd->num_displays,
|
||||||
|
GFP_KERNEL);
|
||||||
|
if (!npd->displays)
|
||||||
|
printk(KERN_ERR "no memory for LCD display data\n");
|
||||||
} else {
|
} else {
|
||||||
printk(KERN_ERR "no memory for LCD platform data\n");
|
printk(KERN_ERR "no memory for LCD platform data\n");
|
||||||
}
|
}
|
||||||
|
@ -371,7 +376,7 @@ struct platform_device s3c_device_sdi = {
|
||||||
|
|
||||||
EXPORT_SYMBOL(s3c_device_sdi);
|
EXPORT_SYMBOL(s3c_device_sdi);
|
||||||
|
|
||||||
void s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata)
|
void __init s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata)
|
||||||
{
|
{
|
||||||
struct s3c24xx_mci_pdata *npd;
|
struct s3c24xx_mci_pdata *npd;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue