S3C6410: Add platform data for S3C IDE controller driver
Subsystems (3)
PATCH 6/7 S3C6410: Add platform data for S3C IDE controller driver
This patch adds platform data for S3C IDE controller driver in S3C6410 platform.
--- arch/arm/mach-s3c6410/mach-smdk6410.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
arch/arm/mach-s3c6410/mach-smdk6410.c +13 -1
@@ -50,6 +50,7 @@#include <plat/regs-sys.h> #include <plat/iic.h> #include <plat/fb.h> +#include <plat/ide.h> #include <plat/gpio-cfg.h> #include <plat/s3c6410.h>
@@ -153,6 +154,12 @@ static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = { .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, }; +#ifdef CONFIG_BLK_DEV_IDE_S3C +static struct s3c_ide_platdata smdk6410_ide_pdata__initdata = { + .setup_gpio = s3c64xx_ide_setup_gpio, +}; +#endif +static struct resource smdk6410_smsc911x_resources[] = { [0 ] = { .start =0x18000000 ,
@@ -199,7 +204,9 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_usb, &s3c_device_usb_hsotg, &smdk6410_lcd_powerdev, - +#ifdef CONFIG_BLK_DEV_IDE_S3C + &s3c_device_cfcon, +#endif &smdk6410_smsc911x, };
@@ -377,6 +382,9 @@ static void __init smdk6410_machine_init(void)s3c_i2c0_set_platdata (NULL );s3c_i2c1_set_platdata (NULL );s3c_fb_set_platdata (&smdk6410_lcd_pdata); +#ifdef CONFIG_BLK_DEV_IDE_S3C +s3c_ide_set_platdata (&smdk6410_ide_pdata); +#endif gpio_request (S3C64XX_GPN (5 ),"LCD power" );gpio_request (S3C64XX_GPF (13 ),"LCD power" );
Signature · 1 line
1.5.3.4
PATCH 6/7 S3C6410: Add platform data for S3C IDE controller driver
Quoted 35 lines · Thomas Abraham
This patch adds platform data for S3C IDE controller driver in S3C6410 platform.
Signed-off-by Abhilash Kesavan <[email protected]>Signed-off-by Thomas Abraham <[email protected]>--- arch/arm/mach-s3c6410/mach-smdk6410.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)arch/arm/mach-s3c6410/mach-smdk6410.c +7
-0@@ -50,6 +50,7 @@#include <plat/regs-sys.h> #include <plat/iic.h> #include <plat/fb.h> +#include <plat/ide.h> #include <plat/gpio-cfg.h> #include <plat/s3c6410.h> @@ -153,6 +154,12 @@ static struct s3c_fb_platdata smdk6410_lcd_pdata __initdata = { .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, }; +#ifdef CONFIG_BLK_DEV_IDE_S3C +static struct s3c_ide_platdata smdk6410_ide_pdata__initdata = { + .setup_gpio = s3c64xx_ide_setup_gpio, +}; +#endif +static struct resource smdk6410_smsc911x_resources[] = { [0 ] = { .start =0x18000000 ,
arch/arm/mach-s3c6410/mach-smdk6410.c static struct platform_device *smdk6410_devices[] __initdata = { · line 211
Quoted 9 lines
arch/arm/mach-s3c6410/mach-smdk6410.c +3
-1@@ -199,7 +204,9 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_usb, &s3c_device_usb_hsotg, &smdk6410_lcd_powerdev, - +#ifdef CONFIG_BLK_DEV_IDE_S3C + &s3c_device_cfcon, +#endif &smdk6410_smsc911x, };
Firstly, doing stuff if the driver is enabled or not is not a good idea, as it means re-installing the kernel if you then go and build the driver as a module at a later date.
Two, since I guess that the IDE gpio setup should be the same across all s3c6410 based systems, then you should look at supplying a standard platform data that the board can use instead of having to duplicate this across all the boards.
Quoted 10 lines
arch/arm/mach-s3c6410/mach-smdk6410.c +3
-0@@ -377,6 +382,9 @@ static void __init smdk6410_machine_init(void)s3c_i2c0_set_platdata (NULL );s3c_i2c1_set_platdata (NULL );s3c_fb_set_platdata (&smdk6410_lcd_pdata); +#ifdef CONFIG_BLK_DEV_IDE_S3C +s3c_ide_set_platdata (&smdk6410_ide_pdata); +#endif gpio_request (S3C64XX_GPN (5 ),"LCD power" );gpio_request (S3C64XX_GPF (13 ),"LCD power" );
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH 6/7 S3C6410: Add platform data for S3C IDE controller driver
Quoted 20 lines · Ben Dooks
Quoted 12 lines · Thomas Abraham
This patch adds platform data for S3C IDE controller driver in S3C6410 platform.
Signed-off-by Abhilash Kesavan <[email protected]>Signed-off-by Thomas Abraham <[email protected]>---
arch/arm/mach-s3c6410/mach-smdk6410.c | 8 +++++++-1 files changed, 7 insertions(+), 1 deletions(-)arch/arm/mach-s3c6410/mach-smdk6410.c +3
-1- +#ifdef CONFIG_BLK_DEV_IDE_S3C + &s3c_device_cfcon, +#endif Quoted 2 lines
&smdk6410_smsc911x,
};Firstly, doing stuff if the driver is enabled or not is not a good idea, as it means re-installing the kernel if you then go and build the driver as a module at a later date.
Quoted 5 lines
Two, since I guess that the IDE gpio setup should be the same across all s3c6410 based systems, then you should look at supplying a standard platform data that the board can use instead of having to duplicate this across all the boards.
Ok. I will remove the conditional compilation and move the platform data from SMDK board file. Since the IDE driver is not accepted, these patches will be updated and resent again with the libata based driver.
Thanks Ben for reviewing the patches.
Thomas.