Skip to content

Commit 4ad5283

Browse files
torvaldstorvalds
committed
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "A new ID for the i801 driver and some Documentation fixes to make it easier for people to find the bindings (which is also a basis for further improvements in that area)" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: wmt: make bindings file name match the driver i2c: sun6i-p2wi: make bindings file name match the driver i2c: stu300: make bindings file name match the driver i2c: mt65xx: make bindings file name match the driver i2c: iop3xx: make bindings file name match the driver i2c: i801: Add support for Intel Comet Lake
2 parents 9a4a6f0 + 080a910 commit 4ad5283

File tree

8 files changed

+6
-0
lines changed

8 files changed

+6
-0
lines changed

‎Documentation/devicetree/bindings/i2c/i2c-xscale.txt renamed to ‎Documentation/devicetree/bindings/i2c/i2c-iop3xx.txt

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-mtk.txt renamed to ‎Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-st-ddci2c.txt renamed to ‎Documentation/devicetree/bindings/i2c/i2c-stu300.txt

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt renamed to ‎Documentation/devicetree/bindings/i2c/i2c-sun6i-p2wi.txt

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-vt8500.txt renamed to ‎Documentation/devicetree/bindings/i2c/i2c-wmt.txt

File renamed without changes.

‎Documentation/i2c/busses/i2c-i801

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Supported adapters:
3636
* Intel Cannon Lake (PCH)
3737
* Intel Cedar Fork (PCH)
3838
* Intel Ice Lake (PCH)
39+
* Intel Comet Lake (PCH)
3940
Datasheets: Publicly available at the Intel website
4041

4142
On Intel Patsburg and later chipsets, both the normal host SMBus controller

‎drivers/i2c/busses/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ config I2C_I801
131131
Cannon Lake (PCH)
132132
Cedar Fork (PCH)
133133
Ice Lake (PCH)
134+
Comet Lake (PCH)
134135

135136
This driver can also be built as a module. If so, the module
136137
will be called i2c-i801.

‎drivers/i2c/busses/i2c-i801.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
* Cannon Lake-LP (PCH) 0x9da3 32 hard yes yes yes
7272
* Cedar Fork (PCH) 0x18df 32 hard yes yes yes
7373
* Ice Lake-LP (PCH) 0x34a3 32 hard yes yes yes
74+
* Comet Lake (PCH) 0x02a3 32 hard yes yes yes
7475
*
7576
* Features supported by this driver:
7677
* Software PEC no
@@ -240,6 +241,7 @@
240241
#define PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS 0xa223
241242
#define PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS 0xa2a3
242243
#define PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS 0xa323
244+
#define PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS 0x02a3
243245

244246
struct i801_mux_config {
245247
char *gpio_chip;
@@ -1038,6 +1040,7 @@ static const struct pci_device_id i801_ids[] = {
10381040
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_H_SMBUS) },
10391041
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS) },
10401042
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS) },
1043+
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS) },
10411044
{ 0, }
10421045
};
10431046

@@ -1534,6 +1537,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
15341537
case PCI_DEVICE_ID_INTEL_DNV_SMBUS:
15351538
case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:
15361539
case PCI_DEVICE_ID_INTEL_ICELAKE_LP_SMBUS:
1540+
case PCI_DEVICE_ID_INTEL_COMETLAKE_SMBUS:
15371541
priv->features |= FEATURE_I2C_BLOCK_READ;
15381542
priv->features |= FEATURE_IRQ;
15391543
priv->features |= FEATURE_SMBUS_PEC;

0 commit comments

Comments
 (0)