From d0224de96e6b07be0caddd9c6cb20f56d4eaf955 Mon Sep 17 00:00:00 2001 From: San Mehat Date: Mon, 10 Nov 2008 16:30:27 -0800 Subject: [PATCH] --- yaml --- r: 192153 b: refs/heads/master c: 5d4f77ffefdcfbe9432db371126b74478964b4a0 h: refs/heads/master i: 192151: 5f4a917b24d236f24d65aa7dc577c0fab5c4777e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-msm/devices.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6b5cc91fc229..d3102107a93f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c68af41d2dbfaa054e5dd15a4df699429ee8a0ad +refs/heads/master: 5d4f77ffefdcfbe9432db371126b74478964b4a0 diff --git a/trunk/arch/arm/mach-msm/devices.c b/trunk/arch/arm/mach-msm/devices.c index 31b6b30e98bf..39bc474455c3 100644 --- a/trunk/arch/arm/mach-msm/devices.c +++ b/trunk/arch/arm/mach-msm/devices.c @@ -24,6 +24,8 @@ #include #include +#include + static struct resource resources_uart1[] = { { .start = INT_UART1, @@ -266,3 +268,23 @@ struct platform_device msm_device_sdc4 = { .coherent_dma_mask = 0xffffffff, }, }; + +static struct platform_device *msm_sdcc_devices[] __initdata = { + &msm_device_sdc1, + &msm_device_sdc2, + &msm_device_sdc3, + &msm_device_sdc4, +}; + +int __init msm_add_sdcc(unsigned int controller, struct mmc_platform_data *plat) +{ + struct platform_device *pdev; + + if (controller < 1 || controller > 4) + return -EINVAL; + + pdev = msm_sdcc_devices[controller-1]; + pdev->dev.platform_data = plat; + return platform_device_register(pdev); +} +