]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
i2c: designware: add new bindings
authorAlan Cox <alan@linux.intel.com>
Wed, 23 Jul 2014 12:06:57 +0000 (13:06 +0100)
committerWolfram Sang <wsa@the-dreams.de>
Sat, 2 Aug 2014 11:19:54 +0000 (13:19 +0200)
This may appear as PCI or ACPI depending upon the firmware so we
have to list both. All share the same ACPI identifier but not
the same PCI identifier.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-designware-pcidrv.c
drivers/i2c/busses/i2c-designware-platdrv.c

index 3356f7ab9f7958e870e2e182863a91e180f668b6..d31d313ab4f7694564012d3ad6d570a0c9f5f3a7 100644 (file)
@@ -188,6 +188,7 @@ static struct  dw_pci_controller  dw_pci_controllers[] = {
                .scl_sda_cfg = &hsw_config,
        },
 };
+
 static struct i2c_algorithm i2c_dw_algo = {
        .master_xfer    = i2c_dw_xfer,
        .functionality  = i2c_dw_func,
@@ -350,6 +351,14 @@ static const struct pci_device_id i2_designware_pci_ids[] = {
        /* Haswell */
        { PCI_VDEVICE(INTEL, 0x9c61), haswell },
        { PCI_VDEVICE(INTEL, 0x9c62), haswell },
+       /* Braswell / Cherrytrail */
+       { PCI_VDEVICE(INTEL, 0x22C1), baytrail,},
+       { PCI_VDEVICE(INTEL, 0x22C2), baytrail },
+       { PCI_VDEVICE(INTEL, 0x22C3), baytrail },
+       { PCI_VDEVICE(INTEL, 0x22C4), baytrail },
+       { PCI_VDEVICE(INTEL, 0x22C5), baytrail },
+       { PCI_VDEVICE(INTEL, 0x22C6), baytrail },
+       { PCI_VDEVICE(INTEL, 0x22C7), baytrail },
        { 0,}
 };
 MODULE_DEVICE_TABLE(pci, i2_designware_pci_ids);
index e4e1af9598754a1ba2e13653caed30ad655d3a3a..bc877333315586cc2a3051a8678c6fe7e7f41b68 100644 (file)
@@ -106,6 +106,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = {
        { "INT3432", 0 },
        { "INT3433", 0 },
        { "80860F41", 0 },
+       { "808622C1", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);