Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Here is the fixup for the 'lowlight' of my last pull request. I2C is
not selected anymore by I2C_ACPI. Instead, the code in question now
depends on I2C=y.
Also, Mika has agreed to support me and be the maintainer for I2C-ACPI
related patches. Finally, a new-ID-patch came along last week"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: add maintainer for ACPI parts of I2C
i2c: i801: Add PCI ID for Intel Braswell
i2c: rework kernel config I2C_ACPI
+26
-14
+7
MAINTAINERS
+7
MAINTAINERS
···
4446
4446
F: include/uapi/linux/i2c.h
4447
4447
F: include/uapi/linux/i2c-*.h
4448
4448
4449
+
I2C ACPI SUPPORT
4450
+
M: Mika Westerberg <mika.westerberg@linux.intel.com>
4451
+
L: linux-i2c@vger.kernel.org
4452
+
L: linux-acpi@vger.kernel.org
4453
+
S: Maintained
4454
+
F: drivers/i2c/i2c-acpi.c
4455
+
4449
4456
I2C-TAOS-EVM DRIVER
4450
4457
M: Jean Delvare <jdelvare@suse.de>
4451
4458
L: linux-i2c@vger.kernel.org
+6
-9
drivers/i2c/Kconfig
+6
-9
drivers/i2c/Kconfig
···
23
23
This I2C support can also be built as a module. If so, the module
24
24
will be called i2c-core.
25
25
26
-
config I2C_ACPI
27
-
bool "I2C ACPI support"
28
-
select I2C
29
-
depends on ACPI
26
+
config ACPI_I2C_OPREGION
27
+
bool "ACPI I2C Operation region support"
28
+
depends on I2C=y && ACPI
30
29
default y
31
30
help
32
-
Say Y here if you want to enable ACPI I2C support. This includes support
33
-
for automatic enumeration of I2C slave devices and support for ACPI I2C
34
-
Operation Regions. Operation Regions allow firmware (BIOS) code to
35
-
access I2C slave devices, such as smart batteries through an I2C host
36
-
controller driver.
31
+
Say Y here if you want to enable ACPI I2C operation region support.
32
+
Operation Regions allow firmware (BIOS) code to access I2C slave devices,
33
+
such as smart batteries through an I2C host controller driver.
37
34
38
35
if I2C
39
36
+1
-1
drivers/i2c/Makefile
+1
-1
drivers/i2c/Makefile
+2
drivers/i2c/busses/i2c-i801.c
+2
drivers/i2c/busses/i2c-i801.c
···
164
164
165
165
/* Older devices have their ID defined in <linux/pci_ids.h> */
166
166
#define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS 0x0f12
167
+
#define PCI_DEVICE_ID_INTEL_BRASWELL_SMBUS 0x2292
167
168
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
168
169
#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
169
170
/* Patsburg also has three 'Integrated Device Function' SMBus controllers */
···
829
828
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_SMBUS) },
830
829
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) },
831
830
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS) },
831
+
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BRASWELL_SMBUS) },
832
832
{ 0, }
833
833
};
834
834
+2
drivers/i2c/i2c-acpi.c
+2
drivers/i2c/i2c-acpi.c
···
126
126
dev_warn(&adap->dev, "failed to enumerate I2C slaves\n");
127
127
}
128
128
129
+
#ifdef CONFIG_ACPI_I2C_OPREGION
129
130
static int acpi_gsb_i2c_read_bytes(struct i2c_client *client,
130
131
u8 cmd, u8 *data, u8 data_len)
131
132
{
···
361
360
362
361
acpi_bus_detach_private_data(handle);
363
362
}
363
+
#endif
+8
-4
include/linux/i2c.h
+8
-4
include/linux/i2c.h
···
577
577
}
578
578
#endif /* CONFIG_OF */
579
579
580
-
#ifdef CONFIG_I2C_ACPI
581
-
int acpi_i2c_install_space_handler(struct i2c_adapter *adapter);
582
-
void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter);
580
+
#ifdef CONFIG_ACPI
583
581
void acpi_i2c_register_devices(struct i2c_adapter *adap);
584
582
#else
585
583
static inline void acpi_i2c_register_devices(struct i2c_adapter *adap) { }
584
+
#endif /* CONFIG_ACPI */
585
+
586
+
#ifdef CONFIG_ACPI_I2C_OPREGION
587
+
int acpi_i2c_install_space_handler(struct i2c_adapter *adapter);
588
+
void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter);
589
+
#else
586
590
static inline void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter)
587
591
{ }
588
592
static inline int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
589
593
{ return 0; }
590
-
#endif
594
+
#endif /* CONFIG_ACPI_I2C_OPREGION */
591
595
592
596
#endif /* _LINUX_I2C_H */