summaryrefslogtreecommitdiff
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2010-11-10 20:40:48 +0300
committerThomas Gleixner <tglx@linutronix.de>2010-11-11 13:34:28 +0300
commit86071535f845fd054753122e564cee9406c84e70 (patch)
tree9525a1793d7b2b32e16f153ec6c0d12920f09e61 /arch/x86/platform
parent0146f26145af75d53e12dbf23a36996aff373680 (diff)
downloadlinux-86071535f845fd054753122e564cee9406c84e70.tar.xz
x86: mrst: Add audio driver bindings
This patch adds the sound card bindings for Moorestown (pmic_audio) and the Medfield platform (msic_audio) as IPC devices. This ensures they will be created at the right time. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> LKML-Reference: <20101110174044.11340.78008.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/mrst/mrst.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 42a0351f302c..237e28f0c122 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -499,6 +499,11 @@ static void __init *lis331dl_platform_data(void *info)
return &intr2nd_pdata;
}
+static void __init *no_platform_data(void *info)
+{
+ return NULL;
+}
+
static const struct devs_id __initconst device_ids[] = {
{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
{"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data},
@@ -506,6 +511,8 @@ static const struct devs_id __initconst device_ids[] = {
{"i2c_max7315_2", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},
{"emc1403", SFI_DEV_TYPE_I2C, 1, &emc1403_platform_data},
{"i2c_accel", SFI_DEV_TYPE_I2C, 0, &lis331dl_platform_data},
+ {"pmic_audio", SFI_DEV_TYPE_IPC, 1, &no_platform_data},
+ {"msic_audio", SFI_DEV_TYPE_IPC, 1, &no_platform_data},
{},
};