diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 16:24:22 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 17:21:38 +0900 |
| commit | 22c810ab3e25d16e6f128384d107b933b6fd8fff (patch) | |
| tree | 6cc4c9112b86512d4093dde3e17ab5ec9fdefa90 /arch/arm/mach-s3c2410/mach-h1940.c | |
| parent | 3cd2fff59fc924752611301f4ca7e8484f5744a5 (diff) | |
| download | blackbird-op-linux-22c810ab3e25d16e6f128384d107b933b6fd8fff.tar.gz blackbird-op-linux-22c810ab3e25d16e6f128384d107b933b6fd8fff.zip | |
ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata().
Add a s3c24xx_mci_set_platdata() call for all the machine files that have
platform data for the MCI driver. This brings the MCI device into line with
the other devices with __initdata and a specific call to ensure the right
structure type is being passed.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-h1940.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 3f9217d0abf7..fbedd0760941 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@ -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, @@ -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. */ |
