summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Douglas <william.douglas@intel.com>2011-11-10 13:50:38 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-11 23:58:58 -0200
commit9f80d8b68fb244bbd69c55aced663b91098544fc (patch)
treed1d1cc147b6b005e1113f3e8834a2ab9124d686f
parent57e6319dd61d5ca10fe8dd57bcce8c0e2c480799 (diff)
downloadlinux-stable-9f80d8b68fb244bbd69c55aced663b91098544fc.tar.gz
linux-stable-9f80d8b68fb244bbd69c55aced663b91098544fc.tar.bz2
linux-stable-9f80d8b68fb244bbd69c55aced663b91098544fc.zip
bma023: Add SFI translation for this device
This needed the sfi IRQ 0xFF fix to go in first. It simply plumbs in the bma023 driver with the firmware naming of it. Signed-off-by: William Douglas <william.douglas@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/platform/mrst/mrst.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 6ed7afdaf4af..541020df0da6 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -608,6 +608,7 @@ static void *msic_ocd_platform_data(void *info)
}
static const struct devs_id __initconst device_ids[] = {
+ {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
{"spi_max3111", SFI_DEV_TYPE_SPI, 0, &max3111_platform_data},
{"i2c_max7315", SFI_DEV_TYPE_I2C, 1, &max7315_platform_data},