S3C24XX device updates and machine fixes
Subsystems (4)
Initial work for the machine device updates, go through and fix some problems with currently merged code either using bad names, sorting out platform-data registering calls and other misc problems.
PATCH 1/4 H1940: Correct name of the local platform devices for LED and Bluetooth
The mach-h1940.c file was using s3c_device_ where it really should be calling these local definitions h1940_device to ensure they are not mistaken for real s3c_devices when the device change is done.
--- arch/arm/mach-s3c2410/mach-h1940.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-s3c2410/mach-h1940.c +4 -4
@@ -171,12 +171,12 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = { .gpdup_mask= 0xffffffff, }; -static struct platform_device s3c_device_leds = { +static struct platform_device h1940_device_leds = { .name ="h1940-leds" , .id =-1 , }; -static struct platform_device s3c_device_bluetooth = { +static struct platform_device h1940_device_bluetooth = { .name ="h1940-bt" , .id =-1 , };
@@ -188,8 +188,8 @@ static struct platform_device *h1940_devices[] __initdata = { &s3c_device_i2c0, &s3c_device_iis, &s3c_device_usbgadget, - &s3c_device_leds, - &s3c_device_bluetooth, + &h1940_device_leds, + &h1940_device_bluetooth, };static void __init h1940_map_io (void )
Signature · 1 line
1.6.5
PATCH 2/4 S3C: Add NAND device platform data set call
--- arch/arm/mach-s3c2410/mach-bast.c | 8 +- arch/arm/mach-s3c2410/mach-qt2410.c | 8 +- arch/arm/mach-s3c2412/mach-jive.c | 11 ++-- arch/arm/mach-s3c2412/mach-vstms.c | 10 ++-- arch/arm/mach-s3c2440/mach-anubis.c | 12 ++-- arch/arm/mach-s3c2440/mach-at2440evb.c | 8 +- arch/arm/mach-s3c2440/mach-mini2440.c | 4 +- arch/arm/mach-s3c2440/mach-osiris.c | 11 ++-- arch/arm/mach-s3c2440/mach-rx3715.c | 9 +-- arch/arm/mach-s3c2442/mach-gta02.c | 6 +- arch/arm/mach-s3c6410/mach-hmt.c | 2 +- arch/arm/plat-s3c/dev-nand.c | 97 ++++++++++++++++++++++++++++++++ arch/arm/plat-s3c/include/plat/nand.h | 8 +++ arch/arm/plat-s3c24xx/common-smdk.c | 2 +- 14 files changed, 151 insertions(+), 45 deletions(-)
arch/arm/mach-s3c2410/mach-bast.c +4 -4
@@ -247,7 +247,7 @@ static int chip0_map[] = { 1 };static int chip1_map[] = {2 };static int chip2_map[] = {3 }; -static struct mtd_partition bast_default_nand_part[] = { +static struct mtd_partition __initdata bast_default_nand_part[] = { [0 ] = { .name ="Boot Agent" , .size =SZ_16K ,
@@ -273,7 +273,7 @@ static struct mtd_partition bast_default_nand_part[] = {* socket. */ -static struct s3c2410_nand_set bast_nand_sets[] = { +static struct s3c2410_nand_set __initdata bast_nand_sets[] = { [0 ] = { .name ="SmartMedia" , .nr_chips =1 ,
@@ -323,7 +323,7 @@ static void bast_nand_select(struct s3c2410_nand_set *set, int slot)__raw_writeb (tmp,BAST_VA_CTRL2 ); } -static struct s3c2410_platform_nand bast_nand_info = { +static struct s3c2410_platform_nand __initdata bast_nand_info = { .tacls =30 , .twrph0 =60 , .twrph1 =60 ,
@@ -625,7 +625,6 @@ static void __init bast_map_io(void)s3c24xx_register_clocks (bast_clocks,ARRAY_SIZE (bast_clocks)); - s3c_device_nand.dev.platform_data = &bast_nand_info; s3c_device_hwmon.dev.platform_data = &bast_hwmon_info;s3c24xx_init_io (bast_iodesc,ARRAY_SIZE (bast_iodesc));
@@ -639,6 +638,7 @@ static void __init bast_init(void)sysdev_register (&bast_pm_sysdev);s3c_i2c0_set_platdata (&bast_i2c_info); +s3c_nand_set_platdata (&bast_nand_info);s3c24xx_fb_set_platdata (&bast_fb_info);platform_add_devices (bast_devices,ARRAY_SIZE (bast_devices));
arch/arm/mach-s3c2410/mach-qt2410.c +4 -4
@@ -258,7 +258,7 @@ static struct platform_device *qt2410_devices[] __initdata = { &qt2410_led, }; -static struct mtd_partition qt2410_nand_part[] = { +static struct mtd_partition __initdata qt2410_nand_part[] = { [0 ] = { .name ="U-Boot" , .size =0x30000 ,
@@ -286,7 +286,7 @@ static struct mtd_partition qt2410_nand_part[] = { }, }; -static struct s3c2410_nand_set qt2410_nand_sets[] = { +static struct s3c2410_nand_set __initdata qt2410_nand_sets[] = { [0 ] = { .name ="NAND" , .nr_chips =1 ,
@@ -299,7 +299,7 @@ static struct s3c2410_nand_set qt2410_nand_sets[] = {* chips and beyond. */ -static struct s3c2410_platform_nand qt2410_nand_info = { +static struct s3c2410_platform_nand __initdata qt2410_nand_info = { .tacls =20 , .twrph0 =60 , .twrph1 =20 ,
@@ -331,7 +331,7 @@ static void __init qt2410_map_io(void)static void __init qt2410_machine_init (void ) { - s3c_device_nand.dev.platform_data = &qt2410_nand_info; +s3c_nand_set_platdata (&qt2410_nand_info);switch (tft_type) {case 'p' :/* production */
arch/arm/mach-s3c2412/mach-jive.c +6 -5
@@ -96,7 +96,7 @@ static struct s3c2410_uartcfg jive_uartcfgs[] = {* 0x017d0000-0x02bd0000 : cramfs B * 0x02bd0000-0x03fd0000 : yaffs */ -static struct mtd_partition jive_imageA_nand_part[] = { +static struct mtd_partition __initdata jive_imageA_nand_part[] = { #ifdef CONFIG_MACH_JIVE_SHOW_BOOTLOADER /* Don't allow access to the bootloader from linux */
@@ -154,7 +154,7 @@ static struct mtd_partition jive_imageA_nand_part[] = { }, }; -static struct mtd_partition jive_imageB_nand_part[] = { +static struct mtd_partition __initdata jive_imageB_nand_part[] = { #ifdef CONFIG_MACH_JIVE_SHOW_BOOTLOADER /* Don't allow access to the bootloader from linux */
@@ -213,7 +213,7 @@ static struct mtd_partition jive_imageB_nand_part[] = { }, }; -static struct s3c2410_nand_set jive_nand_sets[] = { +static struct s3c2410_nand_set __initdata jive_nand_sets[] = { [0 ] = { .name ="flash" , .nr_chips =1 ,
@@ -222,7 +222,7 @@ static struct s3c2410_nand_set jive_nand_sets[] = { }, }; -static struct s3c2410_platform_nand jive_nand_info = { +static struct s3c2410_platform_nand __initdata jive_nand_info = {/* set taken from osiris nand timings, possibly still conservative */ .tacls =30 , .twrph0 =55 ,
@@ -631,7 +631,8 @@ static void __init jive_machine_init(void)s3c_pm_init (); - s3c_device_nand.dev.platform_data = &jive_nand_info; +/** TODO - check that this is after the cmdline option! */ +s3c_nand_set_platdata (&jive_nand_info);/* initialise the spi */
arch/arm/mach-s3c2412/mach-vstms.c +5 -5
@@ -76,7 +76,7 @@ static struct s3c2410_uartcfg vstms_uartcfgs[] __initdata = { } }; -static struct mtd_partition vstms_nand_part[] = { +static struct mtd_partition __initdata vstms_nand_part[] = { [0 ] = { .name ="Boot Agent" , .size =0x7C000 ,
@@ -99,7 +99,7 @@ static struct mtd_partition vstms_nand_part[] = { }, }; -static struct s3c2410_nand_set vstms_nand_sets[] = { +static struct s3c2410_nand_set __initdata vstms_nand_sets[] = { [0 ] = { .name ="NAND" , .nr_chips =1 ,
@@ -112,7 +112,7 @@ static struct s3c2410_nand_set vstms_nand_sets[] = {* chips and beyond. */ -static struct s3c2410_platform_nand vstms_nand_info = { +static struct s3c2410_platform_nand __initdata vstms_nand_info = { .tacls =20 , .twrph0 =60 , .twrph1 =20 ,
@@ -143,8 +143,6 @@ static void __init vstms_fixup(struct machine_desc *desc,static void __init vstms_map_io (void ) { - s3c_device_nand.dev.platform_data = &vstms_nand_info; -s3c24xx_init_io (vstms_iodesc,ARRAY_SIZE (vstms_iodesc));s3c24xx_init_clocks (12000000 );s3c24xx_init_uarts (vstms_uartcfgs,ARRAY_SIZE (vstms_uartcfgs));
@@ -153,6 +151,8 @@ static void __init vstms_map_io(void)static void __init vstms_init (void ) {s3c_i2c0_set_platdata (NULL ); +s3c_nand_set_platdata (&vstms_nand_info); +platform_add_devices (vstms_devices,ARRAY_SIZE (vstms_devices)); }
arch/arm/mach-s3c2440/mach-anubis.c +6 -6
@@ -138,7 +138,7 @@ static int external_map[] = { 2 };static int chip0_map[] = {0 };static int chip1_map[] = {1 }; -static struct mtd_partition anubis_default_nand_part[] = { +static struct mtd_partition __initdata anubis_default_nand_part[] = { [0 ] = { .name ="Boot Agent" , .size =SZ_16K ,
@@ -161,7 +161,7 @@ static struct mtd_partition anubis_default_nand_part[] = { } }; -static struct mtd_partition anubis_default_nand_part_large[] = { +static struct mtd_partition __initdata anubis_default_nand_part_large[] = { [0 ] = { .name ="Boot Agent" , .size =SZ_128K ,
@@ -191,7 +191,7 @@ static struct mtd_partition anubis_default_nand_part_large[] = {* socket. */ -static struct s3c2410_nand_set anubis_nand_sets[] = { +static struct s3c2410_nand_set __initdata anubis_nand_sets[] = { [1 ] = { .name ="External" , .nr_chips =1 ,
@@ -233,7 +233,7 @@ static void anubis_nand_select(struct s3c2410_nand_set *set, int slot)__raw_writeb (tmp,ANUBIS_VA_CTRL1 ); } -static struct s3c2410_platform_nand anubis_nand_info = { +static struct s3c2410_platform_nand __initdata anubis_nand_info = { .tacls =25 , .twrph0 =55 , .twrph1 =40 ,
@@ -454,8 +454,6 @@ static void __init anubis_map_io(void)s3c24xx_register_clocks (anubis_clocks,ARRAY_SIZE (anubis_clocks)); - s3c_device_nand.dev.platform_data = &anubis_nand_info; -s3c24xx_init_io (anubis_iodesc,ARRAY_SIZE (anubis_iodesc));s3c24xx_init_clocks (0 );s3c24xx_init_uarts (anubis_uartcfgs,ARRAY_SIZE (anubis_uartcfgs));
@@ -476,6 +474,8 @@ static void __init anubis_map_io(void)static void __init anubis_init (void ) {s3c_i2c0_set_platdata (NULL ); +s3c_nand_set_platdata (&anubis_nand_info); +platform_add_devices (anubis_devices,ARRAY_SIZE (anubis_devices)); i2c_register_board_info(0, anubis_i2c_devs,
arch/arm/mach-s3c2440/mach-at2440evb.c +4 -4
@@ -96,7 +96,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {/* NAND Flash on AT2440EVB board */ -static struct mtd_partition at2440evb_default_nand_part[] = { +static struct mtd_partition __initdata at2440evb_default_nand_part[] = { [0 ] = { .name ="Boot Agent" , .size =SZ_256K ,
@@ -114,7 +114,7 @@ static struct mtd_partition at2440evb_default_nand_part[] = { }, }; -static struct s3c2410_nand_set at2440evb_nand_sets[] = { +static struct s3c2410_nand_set __initdata at2440evb_nand_sets[] = { [0 ] = { .name ="nand" , .nr_chips =1 ,
@@ -123,7 +123,7 @@ static struct s3c2410_nand_set at2440evb_nand_sets[] = { }, }; -static struct s3c2410_platform_nand at2440evb_nand_info = { +static struct s3c2410_platform_nand __initdata at2440evb_nand_info = { .tacls =25 , .twrph0 =55 , .twrph1 =40 ,
@@ -216,7 +216,6 @@ static struct platform_device *at2440evb_devices[] __initdata = {static void __init at2440evb_map_io (void ) { - s3c_device_nand.dev.platform_data = &at2440evb_nand_info; s3c_device_sdi.name ="s3c2440-sdi" ; s3c_device_sdi.dev.platform_data = &at2440evb_mci_pdata;
@@ -228,6 +227,7 @@ static void __init at2440evb_map_io(void)static void __init at2440evb_init (void ) {s3c24xx_fb_set_platdata (&at2440evb_fb_info); +s3c_nand_set_platdata (&at2440evb_nand_info);s3c_i2c0_set_platdata (NULL );platform_add_devices (at2440evb_devices,ARRAY_SIZE (at2440evb_devices));
arch/arm/mach-s3c2440/mach-mini2440.c +3 -1
@@ -532,7 +532,6 @@ static void __init mini2440_map_io(void)s3c24xx_init_clocks (12000000 );s3c24xx_init_uarts (mini2440_uartcfgs,ARRAY_SIZE (mini2440_uartcfgs)); - s3c_device_nand.dev.platform_data = &mini2440_nand_info; s3c_device_sdi.dev.platform_data = &mini2440_mmc_cfg; }
@@ -677,8 +676,11 @@ static void __init mini2440_init(void)printk ("\n" );s3c24xx_fb_set_platdata (&mini2440_fb_info); } +s3c24xx_udc_set_platdata (&mini2440_udc_cfg); +s3c_nand_set_platdata (&mini2440_nand_info);s3c_i2c0_set_platdata (NULL ); +i2c_register_board_info (0 , mini2440_i2c_devs,ARRAY_SIZE (mini2440_i2c_devs));
arch/arm/mach-s3c2440/mach-osiris.c +5 -6
@@ -148,7 +148,7 @@ static int external_map[] = { 2 };static int chip0_map[] = {0 };static int chip1_map[] = {1 }; -static struct mtd_partition osiris_default_nand_part[] = { +static struct mtd_partition __initdata osiris_default_nand_part[] = { [0 ] = { .name ="Boot Agent" , .size =SZ_16K ,
@@ -171,7 +171,7 @@ static struct mtd_partition osiris_default_nand_part[] = { } }; -static struct mtd_partition osiris_default_nand_part_large[] = { +static struct mtd_partition __initdata osiris_default_nand_part_large[] = { [0 ] = { .name ="Boot Agent" , .size =SZ_128K ,
@@ -201,7 +201,7 @@ static struct mtd_partition osiris_default_nand_part_large[] = {* socket. */ -static struct s3c2410_nand_set osiris_nand_sets[] = { +static struct s3c2410_nand_set __initdata osiris_nand_sets[] = { [1 ] = { .name ="External" , .nr_chips =1 ,
@@ -243,7 +243,7 @@ static void osiris_nand_select(struct s3c2410_nand_set *set, int slot)__raw_writeb (tmp,OSIRIS_VA_CTRL0 ); } -static struct s3c2410_platform_nand osiris_nand_info = { +static struct s3c2410_platform_nand __initdata osiris_nand_info = { .tacls =25 , .twrph0 =60 , .twrph1 =60 ,
@@ -377,8 +377,6 @@ static void __init osiris_map_io(void)s3c24xx_register_clocks (osiris_clocks,ARRAY_SIZE (osiris_clocks)); - s3c_device_nand.dev.platform_data = &osiris_nand_info; -s3c24xx_init_io (osiris_iodesc,ARRAY_SIZE (osiris_iodesc));s3c24xx_init_clocks (0 );s3c24xx_init_uarts (osiris_uartcfgs,ARRAY_SIZE (osiris_uartcfgs));
@@ -408,6 +406,7 @@ static void __init osiris_init(void)sysdev_register (&osiris_pm_sysdev);s3c_i2c0_set_platdata (NULL ); +s3c_nand_set_platdata (&osiris_nand_info);s3c_cpufreq_setboard (&osiris_cpufreq);
arch/arm/mach-s3c2440/mach-rx3715.c +4 -5
@@ -149,7 +149,7 @@ static struct s3c2410fb_mach_info rx3715_fb_info __initdata = { .gpdup_mask = 0xffffffff, }; -static struct mtd_partition rx3715_nand_part[] = { +static struct mtd_partition __initdata rx3715_nand_part[] = { [0 ] = { .name ="Whole Flash" , .offset =0 ,
@@ -158,7 +158,7 @@ static struct mtd_partition rx3715_nand_part[] = { } }; -static struct s3c2410_nand_set rx3715_nand_sets[] = { +static struct s3c2410_nand_set __initdata rx3715_nand_sets[] = { [0 ] = { .name ="Internal" , .nr_chips =1 ,
@@ -167,7 +167,7 @@ static struct s3c2410_nand_set rx3715_nand_sets[] = { }, }; -static struct s3c2410_platform_nand rx3715_nand_info = { +static struct s3c2410_platform_nand __initdata rx3715_nand_info = { .tacls =25 , .twrph0 =50 , .twrph1 =15 ,
@@ -186,8 +186,6 @@ static struct platform_device *rx3715_devices[] __initdata = {static void __init rx3715_map_io (void ) { - s3c_device_nand.dev.platform_data = &rx3715_nand_info; -s3c24xx_init_io (rx3715_iodesc,ARRAY_SIZE (rx3715_iodesc));s3c24xx_init_clocks (16934000 );s3c24xx_init_uarts (rx3715_uartcfgs,ARRAY_SIZE (rx3715_uartcfgs));
@@ -205,6 +203,7 @@ static void __init rx3715_init_machine(void)#endif s3c_pm_init (); +s3c_nand_set_platdata (&rx3715_nand_info);s3c24xx_fb_set_platdata (&rx3715_fb_info);platform_add_devices (rx3715_devices,ARRAY_SIZE (rx3715_devices)); }
arch/arm/mach-s3c2442/mach-gta02.c +3 -3
@@ -423,7 +423,7 @@ static struct i2c_board_info gta02_i2c_devs[] __initdata = { }, }; -static struct s3c2410_nand_set gta02_nand_sets[] = { +static struct s3c2410_nand_set __initdata gta02_nand_sets[] = { [0 ] = {/* * This name is also hard-coded in the boot loaders, so
@@ -442,7 +442,7 @@ static struct s3c2410_nand_set gta02_nand_sets[] = {* data sheet (K5D2G13ACM-D075 MCP Memory). */ -static struct s3c2410_platform_nand gta02_nand_info = { +static struct s3c2410_platform_nand __initdata gta02_nand_info = { .tacls =0 , .twrph0 =25 , .twrph1 =15 ,
@@ -621,9 +621,9 @@ static void __init gta02_machine_init(void)#endif s3c_device_usb.dev.platform_data = >a02_usb_info; - s3c_device_nand.dev.platform_data = >a02_nand_info;s3c24xx_udc_set_platdata (>a02_udc_cfg); +s3c_nand_set_platdata (>a02_nand_info);s3c_i2c0_set_platdata (NULL );i2c_register_board_info (0 , gta02_i2c_devs,ARRAY_SIZE (gta02_i2c_devs));
arch/arm/mach-s3c6410/mach-hmt.c +1 -1
@@ -250,7 +250,7 @@ static void __init hmt_machine_init(void) {s3c_i2c0_set_platdata (NULL );s3c_fb_set_platdata (&hmt_lcd_pdata); - s3c_device_nand.dev.platform_data = &hmt_nand_info; +s3c_nand_set_platdata (&hmt_nand_info);gpio_request (S3C64XX_GPC (7 ),"usb power" );gpio_direction_output (S3C64XX_GPC (7 ),0 );
arch/arm/plat-s3c/dev-nand.c +97 -0
108 lines not on this page · raw message
arch/arm/plat-s3c/include/plat/nand.h +8 -0
@@ -55,3 +55,11 @@ struct s3c2410_platform_nand { int chip); }; +/** +* s3c_nand_set_platdata() - register NAND platform data. +* @nand: The NAND platform data to register with s3c_device_nand. +* +* This function copies the given NAND platform data, @nand and registers +* it with the s3c_device_nand. This allows @nand to be __initdata. +*/ +extern void s3c_nand_set_platdata (struct s3c2410_platform_nand *nand);
arch/arm/plat-s3c24xx/common-smdk.c +1 -1
@@ -198,7 +198,7 @@ void __init smdk_machine_init(void)if (machine_is_smdk2443 ()) smdk_nand_info.twrph0 =50 ; - s3c_device_nand.dev.platform_data = &smdk_nand_info; +s3c_nand_set_platdata (&smdk_nand_info);platform_add_devices (smdk_devs,ARRAY_SIZE (smdk_devs));
Signature · 1 line
1.6.5
PATCH 3/4 AT2440EVB: Remove duplicated s3c_device_sdi.name set
The AT2440EVB should not be changing the s3c_device_sdi.name as this is part of the initialisation process done by the CPU detection process and actually present in arch/arm/plat-s3c24xx/s3c24xx.c.
--- arch/arm/mach-s3c2440/mach-at2440evb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-s3c2440/mach-at2440evb.c +0 -1
@@ -216,7 +216,6 @@ static struct platform_device *at2440evb_devices[] __initdata = {static void __init at2440evb_map_io (void ) { - s3c_device_sdi.name ="s3c2440-sdi" ; s3c_device_sdi.dev.platform_data = &at2440evb_mci_pdata;s3c24xx_init_io (at2440evb_iodesc,ARRAY_SIZE (at2440evb_iodesc));
Signature · 1 line
1.6.5
PATCH 4/4 N30: Use s3c_i2c0_set_platdata() to set I2C platform data
Fix mach-n30.c to use the s3c_i2c0_set_platdata() call to register the platform data with the system to get rid of any reliance on having a real device structure available in memory.
Since s3c_i2c0_set_platdata() copies the data, mark the original as __initdata so it is thrown away.
--- arch/arm/mach-s3c2410/mach-n30.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-s3c2410/mach-n30.c +2 -2
@@ -338,7 +338,7 @@ static struct platform_device *n35_devices[] __initdata = { &n35_button_device, }; -static struct s3c2410_platform_i2c n30_i2ccfg = { +static struct s3c2410_platform_i2c __initdata n30_i2ccfg = { .flags =0 , .slave_addr =0x10 , .frequency =10 *1000 ,
@@ -500,8 +500,8 @@ static void __init n30_init_irq(void)static void __init n30_init (void ) {s3c24xx_fb_set_platdata (&n30_fb_info); - s3c_device_i2c0.dev.platform_data = &n30_i2ccfg;s3c24xx_udc_set_platdata (&n30_udc_cfg); +s3c_i2c0_set_platdata (&n30_i2ccfg);/* Turn off suspend on both USB ports, and switch the * selectable USB port to USB device mode. */
Signature · 1 line
1.6.5