From f4c796bf6eac850c10efe3620006f594785360e9 Mon Sep 17 00:00:00 2001 From: Tuukka Toivonen Date: Thu, 5 Jan 2012 21:06:27 +0200 Subject: [PATCH] mrst: temporary: ignore SFI table definitions for legacy cameras BZ: 16972 20596 The SFI tables contains bogus definitions which allocate i2c addresses and prevent actual drivers from loading. Skip the definitions. The SFI table needs to be fixed after which this patch can be removed. Change-Id: I0e81131245f8e6236911796970bcaa990bc58ecf Signed-off-by: Tuukka Toivonen Reviewed-on: http://android.intel.com:8080/32619 Reviewed-by: Yang, Fei Reviewed-by: Koski, Anttu Tested-by: Koski, Anttu Reviewed-by: buildbot Tested-by: buildbot --- arch/x86/platform/mrst/mrst.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index 169528c..97df1cd 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c @@ -2148,6 +2148,18 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) for (i = 0; i < num; i++, pentry++) { int irq = pentry->irq; + if (mrst_identify_cpu() == MRST_CPU_CHIP_CLOVERVIEW && + (strcmp(pentry->name, "dis71430m") == 0 || + strcmp(pentry->name, "ov2720") == 0)) { + /* Skip legacy camera entries which do not exist on this + * hardware. FIXME: remove as soon as SFI table is + * fixed. + */ + printk(KERN_ERR "ignoring SFI entry %16.16s\n", + pentry->name); + continue; + } + if (irq != (u8)0xff) { /* native RTE case */ /* these SPI2 devices are not exposed to system as PCI * devices, but they have separate RTE entry in IOAPIC -- 2.7.4