Intel i2c patches added

5 files changed, 550 insertions, 0 deletions

diff --git a/patches.intel/i2c-i801-add-device-id-for-intel-wildcat-point-pch.patch b/patches.intel/i2c-i801-add-device-id-for-intel-wildcat-point-pch.patch
new file mode 100644
index 0000000000000..f2541a5399c58
--- /dev/null
+++ b/patches.intel/i2c-i801-add-device-id-for-intel-wildcat-point-pch.patch
@@ -0,0 +1,67 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Tue Nov  4 17:56:01 2014
+From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+Date: Tue,  4 Nov 2014 16:55:24 +0800
+Subject: [LTSI-dev] [PATCH 3/4] i2c: i801: Add device ID for Intel Wildcat Point PCH
+To: LTSI Mailing List <ltsi-dev@lists.linuxfoundation.org>
+Message-ID: <1415091325-27802-4-git-send-email-rebecca.swee.fun.chang@intel.com>
+
+
+From: Jean Delvare <jdelvare@suse.de>
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+(cherry picked from commit b299de839157852c563b9f133c8b7e630545a9c3)
+
+Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+---
+ Documentation/i2c/busses/i2c-i801 |    1 +
+ drivers/i2c/busses/Kconfig        |    1 +
+ drivers/i2c/busses/i2c-i801.c     |    3 +++
+ 3 files changed, 5 insertions(+)
+
+--- a/Documentation/i2c/busses/i2c-i801
++++ b/Documentation/i2c/busses/i2c-i801
+@@ -25,6 +25,7 @@ Supported adapters:
+   * Intel Avoton (SOC)
+   * Intel Wellsburg (PCH)
+   * Intel Coleto Creek (PCH)
++  * Intel Wildcat Point (PCH)
+   * Intel Wildcat Point-LP (PCH)
+   * Intel BayTrail (SOC)
+    Datasheets: Publicly available at the Intel website
+--- a/drivers/i2c/busses/Kconfig
++++ b/drivers/i2c/busses/Kconfig
+@@ -109,6 +109,7 @@ config I2C_I801
+ 	    Avoton (SOC)
+ 	    Wellsburg (PCH)
+ 	    Coleto Creek (PCH)
++	    Wildcat Point (PCH)
+ 	    Wildcat Point-LP (PCH)
+ 	    BayTrail (SOC)
+ 
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -59,6 +59,7 @@
+  * Wellsburg (PCH) MS		0x8d7e	32	hard	yes	yes	yes
+  * Wellsburg (PCH) MS		0x8d7f	32	hard	yes	yes	yes
+  * Coleto Creek (PCH)		0x23b0	32	hard	yes	yes	yes
++ * Wildcat Point (PCH)		0x8ca2	32	hard	yes	yes	yes
+  * Wildcat Point-LP (PCH)	0x9ca2	32	hard	yes	yes	yes
+  * BayTrail (SOC)		0x0f12	32	hard	yes	yes	yes
+  *
+@@ -175,6 +176,7 @@
+ #define PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS		0x23b0
+ #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS		0x3b30
+ #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
++#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS		0x8ca2
+ #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS		0x8d22
+ #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS0		0x8d7d
+ #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1		0x8d7e
+@@ -823,6 +825,7 @@ static const struct pci_device_id i801_i
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS) },
+ 	{ 0, }
diff --git a/patches.intel/i2c-i801-add-pci-id-for-intel-braswell.patch b/patches.intel/i2c-i801-add-pci-id-for-intel-braswell.patch
new file mode 100644
index 0000000000000..d06eceff0f9b2
--- /dev/null
+++ b/patches.intel/i2c-i801-add-pci-id-for-intel-braswell.patch
@@ -0,0 +1,41 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Tue Nov  4 17:56:06 2014
+From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+Date: Tue,  4 Nov 2014 16:55:25 +0800
+Subject: [LTSI-dev]  [PATCH 4/4] i2c: i801: Add PCI ID for Intel Braswell
+To: LTSI Mailing List <ltsi-dev@lists.linuxfoundation.org>
+Message-ID: <1415091325-27802-5-git-send-email-rebecca.swee.fun.chang@intel.com>
+
+
+From: Alan Cox <alan@linux.intel.com>
+
+The SMBus host controller is the same as used in Baytrail so add the new
+PCI ID to the driver's list of supported IDs.
+
+Signed-off-by: Alan Cox <alan@linux.intel.com>
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+(cherry picked from commit 39e8e30ee544a62c148033d64a979028b958ca05)
+
+Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+---
+ drivers/i2c/busses/i2c-i801.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -164,6 +164,7 @@
+ 
+ /* Older devices have their ID defined in <linux/pci_ids.h> */
+ #define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS		0x0f12
++#define PCI_DEVICE_ID_INTEL_BRASWELL_SMBUS		0x2292
+ #define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS		0x1c22
+ #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS		0x1d22
+ /* Patsburg also has three 'Integrated Device Function' SMBus controllers */
+@@ -828,6 +829,7 @@ static const struct pci_device_id i801_i
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BRASWELL_SMBUS) },
+ 	{ 0, }
+ };
+ 
diff --git a/patches.intel/i2c-i801-fix-the-alignment-of-the-device-table.patch b/patches.intel/i2c-i801-fix-the-alignment-of-the-device-table.patch
new file mode 100644
index 0000000000000..7a8f8c7035094
--- /dev/null
+++ b/patches.intel/i2c-i801-fix-the-alignment-of-the-device-table.patch
@@ -0,0 +1,177 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Tue Nov  4 17:55:57 2014
+From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+Date: Tue,  4 Nov 2014 16:55:23 +0800
+Subject: [LTSI-dev] [PATCH 2/4] i2c: i801: Fix the alignment of the device table
+To: LTSI Mailing List <ltsi-dev@lists.linuxfoundation.org>
+Message-ID: <1415091325-27802-3-git-send-email-rebecca.swee.fun.chang@intel.com>
+
+
+From: Jean Delvare <jdelvare@suse.de>
+
+A long name broke the alignment, shift the columns a bit to fix it and
+make the table look nice again. While we're here, switch to the
+standard comment style to make checkpatch happy, and use tabs instead
+of spaces for column alignment.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+(cherry picked from commit ce3161106ab57afbfbe1c33d95bf4a569405983a)
+
+Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+---
+ drivers/i2c/busses/i2c-i801.c |  136 +++++++++++++++++++++---------------------
+ 1 file changed, 68 insertions(+), 68 deletions(-)
+
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -22,57 +22,57 @@
+ */
+ 
+ /*
+-  Supports the following Intel I/O Controller Hubs (ICH):
+-
+-                                  I/O                     Block   I2C
+-                                  region  SMBus   Block   proc.   block
+-  Chip name             PCI ID    size    PEC     buffer  call    read
+-  ----------------------------------------------------------------------
+-  82801AA  (ICH)        0x2413     16      no      no      no      no
+-  82801AB  (ICH0)       0x2423     16      no      no      no      no
+-  82801BA  (ICH2)       0x2443     16      no      no      no      no
+-  82801CA  (ICH3)       0x2483     32     soft     no      no      no
+-  82801DB  (ICH4)       0x24c3     32     hard     yes     no      no
+-  82801E   (ICH5)       0x24d3     32     hard     yes     yes     yes
+-  6300ESB               0x25a4     32     hard     yes     yes     yes
+-  82801F   (ICH6)       0x266a     32     hard     yes     yes     yes
+-  6310ESB/6320ESB       0x269b     32     hard     yes     yes     yes
+-  82801G   (ICH7)       0x27da     32     hard     yes     yes     yes
+-  82801H   (ICH8)       0x283e     32     hard     yes     yes     yes
+-  82801I   (ICH9)       0x2930     32     hard     yes     yes     yes
+-  EP80579 (Tolapai)     0x5032     32     hard     yes     yes     yes
+-  ICH10                 0x3a30     32     hard     yes     yes     yes
+-  ICH10                 0x3a60     32     hard     yes     yes     yes
+-  5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
+-  6 Series (PCH)        0x1c22     32     hard     yes     yes     yes
+-  Patsburg (PCH)        0x1d22     32     hard     yes     yes     yes
+-  Patsburg (PCH) IDF    0x1d70     32     hard     yes     yes     yes
+-  Patsburg (PCH) IDF    0x1d71     32     hard     yes     yes     yes
+-  Patsburg (PCH) IDF    0x1d72     32     hard     yes     yes     yes
+-  DH89xxCC (PCH)        0x2330     32     hard     yes     yes     yes
+-  Panther Point (PCH)   0x1e22     32     hard     yes     yes     yes
+-  Lynx Point (PCH)      0x8c22     32     hard     yes     yes     yes
+-  Lynx Point-LP (PCH)   0x9c22     32     hard     yes     yes     yes
+-  Avoton (SOC)          0x1f3c     32     hard     yes     yes     yes
+-  Wellsburg (PCH)       0x8d22     32     hard     yes     yes     yes
+-  Wellsburg (PCH) MS    0x8d7d     32     hard     yes     yes     yes
+-  Wellsburg (PCH) MS    0x8d7e     32     hard     yes     yes     yes
+-  Wellsburg (PCH) MS    0x8d7f     32     hard     yes     yes     yes
+-  Coleto Creek (PCH)    0x23b0     32     hard     yes     yes     yes
+-  Wildcat Point-LP (PCH)   0x9ca2     32     hard     yes     yes     yes
+-  BayTrail (SOC)        0x0f12     32     hard     yes     yes     yes
+-
+-  Features supported by this driver:
+-  Software PEC                     no
+-  Hardware PEC                     yes
+-  Block buffer                     yes
+-  Block process call transaction   no
+-  I2C block read transaction       yes  (doesn't use the block buffer)
+-  Slave mode                       no
+-  Interrupt processing             yes
+-
+-  See the file Documentation/i2c/busses/i2c-i801 for details.
+-*/
++ * Supports the following Intel I/O Controller Hubs (ICH):
++ *
++ *					I/O			Block	I2C
++ *					region	SMBus	Block	proc.	block
++ * Chip name			PCI ID	size	PEC	buffer	call	read
++ * ---------------------------------------------------------------------------
++ * 82801AA (ICH)		0x2413	16	no	no	no	no
++ * 82801AB (ICH0)		0x2423	16	no	no	no	no
++ * 82801BA (ICH2)		0x2443	16	no	no	no	no
++ * 82801CA (ICH3)		0x2483	32	soft	no	no	no
++ * 82801DB (ICH4)		0x24c3	32	hard	yes	no	no
++ * 82801E (ICH5)		0x24d3	32	hard	yes	yes	yes
++ * 6300ESB			0x25a4	32	hard	yes	yes	yes
++ * 82801F (ICH6)		0x266a	32	hard	yes	yes	yes
++ * 6310ESB/6320ESB		0x269b	32	hard	yes	yes	yes
++ * 82801G (ICH7)		0x27da	32	hard	yes	yes	yes
++ * 82801H (ICH8)		0x283e	32	hard	yes	yes	yes
++ * 82801I (ICH9)		0x2930	32	hard	yes	yes	yes
++ * EP80579 (Tolapai)		0x5032	32	hard	yes	yes	yes
++ * ICH10			0x3a30	32	hard	yes	yes	yes
++ * ICH10			0x3a60	32	hard	yes	yes	yes
++ * 5/3400 Series (PCH)		0x3b30	32	hard	yes	yes	yes
++ * 6 Series (PCH)		0x1c22	32	hard	yes	yes	yes
++ * Patsburg (PCH)		0x1d22	32	hard	yes	yes	yes
++ * Patsburg (PCH) IDF		0x1d70	32	hard	yes	yes	yes
++ * Patsburg (PCH) IDF		0x1d71	32	hard	yes	yes	yes
++ * Patsburg (PCH) IDF		0x1d72	32	hard	yes	yes	yes
++ * DH89xxCC (PCH)		0x2330	32	hard	yes	yes	yes
++ * Panther Point (PCH)		0x1e22	32	hard	yes	yes	yes
++ * Lynx Point (PCH)		0x8c22	32	hard	yes	yes	yes
++ * Lynx Point-LP (PCH)		0x9c22	32	hard	yes	yes	yes
++ * Avoton (SOC)			0x1f3c	32	hard	yes	yes	yes
++ * Wellsburg (PCH)		0x8d22	32	hard	yes	yes	yes
++ * Wellsburg (PCH) MS		0x8d7d	32	hard	yes	yes	yes
++ * Wellsburg (PCH) MS		0x8d7e	32	hard	yes	yes	yes
++ * Wellsburg (PCH) MS		0x8d7f	32	hard	yes	yes	yes
++ * Coleto Creek (PCH)		0x23b0	32	hard	yes	yes	yes
++ * Wildcat Point-LP (PCH)	0x9ca2	32	hard	yes	yes	yes
++ * BayTrail (SOC)		0x0f12	32	hard	yes	yes	yes
++ *
++ * Features supported by this driver:
++ * Software PEC				no
++ * Hardware PEC				yes
++ * Block buffer				yes
++ * Block process call transaction	no
++ * I2C block read transaction		yes (doesn't use the block buffer)
++ * Slave mode				no
++ * Interrupt processing			yes
++ *
++ * See the file Documentation/i2c/busses/i2c-i801 for details.
++ */
+ 
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
+@@ -162,24 +162,24 @@
+ 				 STATUS_ERROR_FLAGS)
+ 
+ /* Older devices have their ID defined in <linux/pci_ids.h> */
+-#define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS	0x0f12
+-#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS	0x1c22
+-#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS	0x1d22
++#define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS		0x0f12
++#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS		0x1c22
++#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS		0x1d22
+ /* Patsburg also has three 'Integrated Device Function' SMBus controllers */
+-#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0	0x1d70
+-#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1	0x1d71
+-#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2	0x1d72
+-#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS	0x1e22
+-#define PCI_DEVICE_ID_INTEL_AVOTON_SMBUS	0x1f3c
+-#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS	0x2330
+-#define PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS	0x23b0
+-#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS	0x3b30
+-#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS	0x8c22
+-#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS	0x8d22
+-#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS0	0x8d7d
+-#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1	0x8d7e
+-#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2	0x8d7f
+-#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS	0x9c22
++#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0		0x1d70
++#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1		0x1d71
++#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2		0x1d72
++#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS		0x1e22
++#define PCI_DEVICE_ID_INTEL_AVOTON_SMBUS		0x1f3c
++#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS		0x2330
++#define PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS		0x23b0
++#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS		0x3b30
++#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS		0x8c22
++#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS		0x8d22
++#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS0		0x8d7d
++#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1		0x8d7e
++#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2		0x8d7f
++#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS		0x9c22
+ #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS	0x9ca2
+ 
+ struct i801_mux_config {
diff --git a/patches.intel/i2c-remove-define_pci_device_table-macro.patch b/patches.intel/i2c-remove-define_pci_device_table-macro.patch
new file mode 100644
index 0000000000000..b447d9b7f75ef
--- /dev/null
+++ b/patches.intel/i2c-remove-define_pci_device_table-macro.patch
@@ -0,0 +1,261 @@
+From ltsi-dev-bounces@lists.linuxfoundation.org Tue Nov  4 17:55:55 2014
+From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+Date: Tue,  4 Nov 2014 16:55:22 +0800
+Subject: [LTSI-dev]  [PATCH 1/4] i2c: remove DEFINE_PCI_DEVICE_TABLE macro
+To: LTSI Mailing List <ltsi-dev@lists.linuxfoundation.org>
+Message-ID: <1415091325-27802-2-git-send-email-rebecca.swee.fun.chang@intel.com>
+
+
+From: Jingoo Han <jg1.han@samsung.com>
+
+Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
+is not preferred.
+
+Signed-off-by: Jingoo Han <jg1.han@samsung.com>
+Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+(cherry picked from commit 392debf11656dedd79da44416747d5b2b1747f5e)
+
+Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
+---
+ drivers/i2c/busses/i2c-ali1535.c           |    2 +-
+ drivers/i2c/busses/i2c-ali1563.c           |    2 +-
+ drivers/i2c/busses/i2c-ali15x3.c           |    2 +-
+ drivers/i2c/busses/i2c-amd756.c            |    2 +-
+ drivers/i2c/busses/i2c-amd8111.c           |    2 +-
+ drivers/i2c/busses/i2c-designware-pcidrv.c |    2 +-
+ drivers/i2c/busses/i2c-eg20t.c             |    2 +-
+ drivers/i2c/busses/i2c-hydra.c             |    2 +-
+ drivers/i2c/busses/i2c-i801.c              |    2 +-
+ drivers/i2c/busses/i2c-ismt.c              |    2 +-
+ drivers/i2c/busses/i2c-nforce2.c           |    2 +-
+ drivers/i2c/busses/i2c-pasemi.c            |    2 +-
+ drivers/i2c/busses/i2c-piix4.c             |    2 +-
+ drivers/i2c/busses/i2c-pxa-pci.c           |    2 +-
+ drivers/i2c/busses/i2c-sis5595.c           |    2 +-
+ drivers/i2c/busses/i2c-sis630.c            |    2 +-
+ drivers/i2c/busses/i2c-sis96x.c            |    2 +-
+ drivers/i2c/busses/i2c-via.c               |    2 +-
+ drivers/i2c/busses/i2c-viapro.c            |    2 +-
+ drivers/i2c/busses/scx200_acb.c            |    2 +-
+ 20 files changed, 20 insertions(+), 20 deletions(-)
+
+--- a/drivers/i2c/busses/i2c-ali1535.c
++++ b/drivers/i2c/busses/i2c-ali1535.c
+@@ -494,7 +494,7 @@ static struct i2c_adapter ali1535_adapte
+ 	.algo		= &smbus_algorithm,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = {
++static const struct pci_device_id ali1535_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
+ 	{ },
+ };
+--- a/drivers/i2c/busses/i2c-ali1563.c
++++ b/drivers/i2c/busses/i2c-ali1563.c
+@@ -416,7 +416,7 @@ static void ali1563_remove(struct pci_de
+ 	ali1563_shutdown(dev);
+ }
+ 
+-static DEFINE_PCI_DEVICE_TABLE(ali1563_id_table) = {
++static const struct pci_device_id ali1563_id_table[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1563) },
+ 	{},
+ };
+--- a/drivers/i2c/busses/i2c-ali15x3.c
++++ b/drivers/i2c/busses/i2c-ali15x3.c
+@@ -476,7 +476,7 @@ static struct i2c_adapter ali15x3_adapte
+ 	.algo		= &smbus_algorithm,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(ali15x3_ids) = {
++static const struct pci_device_id ali15x3_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-amd756.c
++++ b/drivers/i2c/busses/i2c-amd756.c
+@@ -307,7 +307,7 @@ static const char* chipname[] = {
+ 	"nVidia nForce", "AMD8111",
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(amd756_ids) = {
++static const struct pci_device_id amd756_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_740B),
+ 	  .driver_data = AMD756 },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7413),
+--- a/drivers/i2c/busses/i2c-amd8111.c
++++ b/drivers/i2c/busses/i2c-amd8111.c
+@@ -414,7 +414,7 @@ static const struct i2c_algorithm smbus_
+ };
+ 
+ 
+-static DEFINE_PCI_DEVICE_TABLE(amd8111_ids) = {
++static const struct pci_device_id amd8111_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_SMBUS2) },
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
++++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
+@@ -309,7 +309,7 @@ static void i2c_dw_pci_remove(struct pci
+ /* work with hotplug and coldplug */
+ MODULE_ALIAS("i2c_designware-pci");
+ 
+-static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = {
++static const struct pci_device_id i2_designware_pci_ids[] = {
+ 	/* Moorestown */
+ 	{ PCI_VDEVICE(INTEL, 0x0802), moorestown_0 },
+ 	{ PCI_VDEVICE(INTEL, 0x0803), moorestown_1 },
+--- a/drivers/i2c/busses/i2c-eg20t.c
++++ b/drivers/i2c/busses/i2c-eg20t.c
+@@ -186,7 +186,7 @@ static DEFINE_MUTEX(pch_mutex);
+ #define PCI_DEVICE_ID_ML7223_I2C	0x8010
+ #define PCI_DEVICE_ID_ML7831_I2C	0x8817
+ 
+-static DEFINE_PCI_DEVICE_TABLE(pch_pcidev_id) = {
++static const struct pci_device_id pch_pcidev_id[] = {
+ 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PCH_I2C),   1, },
+ 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_I2C), 2, },
+ 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_I2C), 1, },
+--- a/drivers/i2c/busses/i2c-hydra.c
++++ b/drivers/i2c/busses/i2c-hydra.c
+@@ -104,7 +104,7 @@ static struct i2c_adapter hydra_adap = {
+ 	.algo_data	= &hydra_bit_data,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(hydra_ids) = {
++static const struct pci_device_id hydra_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-i801.c
++++ b/drivers/i2c/busses/i2c-i801.c
+@@ -791,7 +791,7 @@ static const struct i2c_algorithm smbus_
+ 	.functionality	= i801_func,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {
++static const struct pci_device_id i801_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_2) },
+--- a/drivers/i2c/busses/i2c-ismt.c
++++ b/drivers/i2c/busses/i2c-ismt.c
+@@ -182,7 +182,7 @@ struct ismt_priv {
+ /**
+  * ismt_ids - PCI device IDs supported by this driver
+  */
+-static DEFINE_PCI_DEVICE_TABLE(ismt_ids) = {
++static const struct pci_device_id ismt_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
+--- a/drivers/i2c/busses/i2c-nforce2.c
++++ b/drivers/i2c/busses/i2c-nforce2.c
+@@ -306,7 +306,7 @@ static struct i2c_algorithm smbus_algori
+ };
+ 
+ 
+-static DEFINE_PCI_DEVICE_TABLE(nforce2_ids) = {
++static const struct pci_device_id nforce2_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS) },
+--- a/drivers/i2c/busses/i2c-pasemi.c
++++ b/drivers/i2c/busses/i2c-pasemi.c
+@@ -401,7 +401,7 @@ static void pasemi_smb_remove(struct pci
+ 	kfree(smbus);
+ }
+ 
+-static DEFINE_PCI_DEVICE_TABLE(pasemi_smb_ids) = {
++static const struct pci_device_id pasemi_smb_ids[] = {
+ 	{ PCI_DEVICE(0x1959, 0xa003) },
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-piix4.c
++++ b/drivers/i2c/busses/i2c-piix4.c
+@@ -540,7 +540,7 @@ static const struct i2c_algorithm smbus_
+ 	.functionality	= piix4_func,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(piix4_ids) = {
++static const struct pci_device_id piix4_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },
+--- a/drivers/i2c/busses/i2c-pxa-pci.c
++++ b/drivers/i2c/busses/i2c-pxa-pci.c
+@@ -148,7 +148,7 @@ static void ce4100_i2c_remove(struct pci
+ 	kfree(sds);
+ }
+ 
+-static DEFINE_PCI_DEVICE_TABLE(ce4100_i2c_devices) = {
++static const struct pci_device_id ce4100_i2c_devices[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e68)},
+ 	{ },
+ };
+--- a/drivers/i2c/busses/i2c-sis5595.c
++++ b/drivers/i2c/busses/i2c-sis5595.c
+@@ -369,7 +369,7 @@ static struct i2c_adapter sis5595_adapte
+ 	.algo		= &smbus_algorithm,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(sis5595_ids) = {
++static const struct pci_device_id sis5595_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-sis630.c
++++ b/drivers/i2c/busses/i2c-sis630.c
+@@ -510,7 +510,7 @@ static struct i2c_adapter sis630_adapter
+ 	.retries	= 3
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(sis630_ids) = {
++static const struct pci_device_id sis630_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_964) },
+--- a/drivers/i2c/busses/i2c-sis96x.c
++++ b/drivers/i2c/busses/i2c-sis96x.c
+@@ -244,7 +244,7 @@ static struct i2c_adapter sis96x_adapter
+ 	.algo		= &smbus_algorithm,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(sis96x_ids) = {
++static const struct pci_device_id sis96x_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-via.c
++++ b/drivers/i2c/busses/i2c-via.c
+@@ -88,7 +88,7 @@ static struct i2c_adapter vt586b_adapter
+ };
+ 
+ 
+-static DEFINE_PCI_DEVICE_TABLE(vt586b_ids) = {
++static const struct pci_device_id vt586b_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3) },
+ 	{ 0, }
+ };
+--- a/drivers/i2c/busses/i2c-viapro.c
++++ b/drivers/i2c/busses/i2c-viapro.c
+@@ -442,7 +442,7 @@ release_region:
+ 	return error;
+ }
+ 
+-static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = {
++static const struct pci_device_id vt596_ids[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596_3),
+ 	  .driver_data = SMBBA1 },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C596B_3),
+--- a/drivers/i2c/busses/scx200_acb.c
++++ b/drivers/i2c/busses/scx200_acb.c
+@@ -554,7 +554,7 @@ static struct platform_driver scx200_pci
+ 	.remove = scx200_remove,
+ };
+ 
+-static DEFINE_PCI_DEVICE_TABLE(scx200_isa) = {
++static const struct pci_device_id scx200_isa[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
+ 	{ 0, }
diff --git a/series b/series
index f1daeae41f7ef..e3802ff187d10 100644
--- a/series
+++ b/series
@@ -1027,6 +1027,10 @@ patches.intel/pwm-lpss-add-acpi-and-pci-ids-for-intel-braswell.patch
 patches.intel/pwm-lpss-properly-split-driver-to-parts.patch
 patches.intel/pwm-lpss-fix-build-failure-on-powerpc.patch
 patches.intel/pwm-lpss-use-c99-initializers-in-structures.patch
+patches.intel/i2c-remove-define_pci_device_table-macro.patch
+patches.intel/i2c-i801-fix-the-alignment-of-the-device-table.patch
+patches.intel/i2c-i801-add-device-id-for-intel-wildcat-point-pch.patch
+patches.intel/i2c-i801-add-pci-id-for-intel-braswell.patch
 
 
 #############################################################################