Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"One bugfix for the tegra driver. Two updates regarding email
addresses and MAINTAINERS which I like to have up-to-date so people
can be reached immediately. While we are here, there is on PCI_ID
addition."
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: add maintainer entry for atmel i2c driver
i2c: Fix my e-mail address in drivers and documentation
i2c: iSMT: add Intel Avoton DeviceIDs
i2c: tegra: check the clk_prepare_enable() return value
+21
-4
+1
-1
Documentation/i2c/busses/i2c-diolan-u2c
+1
-1
Documentation/i2c/busses/i2c-diolan-u2c
+6
MAINTAINERS
+6
MAINTAINERS
···
1461
1461
F: drivers/dma/at_hdmac_regs.h
1462
1462
F: include/linux/platform_data/dma-atmel.h
1463
1463
1464
+
ATMEL I2C DRIVER
1465
+
M: Ludovic Desroches <ludovic.desroches@atmel.com>
1466
+
L: linux-i2c@vger.kernel.org
1467
+
S: Supported
1468
+
F: drivers/i2c/busses/i2c-at91.c
1469
+
1464
1470
ATMEL ISI DRIVER
1465
1471
M: Josh Wu <josh.wu@atmel.com>
1466
1472
L: linux-media@vger.kernel.org
+2
drivers/i2c/busses/i2c-ismt.c
+2
drivers/i2c/busses/i2c-ismt.c
···
80
80
/* PCI DIDs for the Intel SMBus Message Transport (SMT) Devices */
81
81
#define PCI_DEVICE_ID_INTEL_S1200_SMT0 0x0c59
82
82
#define PCI_DEVICE_ID_INTEL_S1200_SMT1 0x0c5a
83
+
#define PCI_DEVICE_ID_INTEL_AVOTON_SMT 0x1f15
83
84
84
85
#define ISMT_DESC_ENTRIES 32 /* number of descriptor entries */
85
86
#define ISMT_MAX_RETRIES 3 /* number of SMBus retries to attempt */
···
186
185
static const DEFINE_PCI_DEVICE_TABLE(ismt_ids) = {
187
186
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) },
188
187
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) },
188
+
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
189
189
{ 0, }
190
190
};
191
191
+11
-2
drivers/i2c/busses/i2c-tegra.c
+11
-2
drivers/i2c/busses/i2c-tegra.c
···
411
411
int clk_multiplier = I2C_CLK_MULTIPLIER_STD_FAST_MODE;
412
412
u32 clk_divisor;
413
413
414
-
tegra_i2c_clock_enable(i2c_dev);
414
+
err = tegra_i2c_clock_enable(i2c_dev);
415
+
if (err < 0) {
416
+
dev_err(i2c_dev->dev, "Clock enable failed %d\n", err);
417
+
return err;
418
+
}
415
419
416
420
tegra_periph_reset_assert(i2c_dev->div_clk);
417
421
udelay(2);
···
632
628
if (i2c_dev->is_suspended)
633
629
return -EBUSY;
634
630
635
-
tegra_i2c_clock_enable(i2c_dev);
631
+
ret = tegra_i2c_clock_enable(i2c_dev);
632
+
if (ret < 0) {
633
+
dev_err(i2c_dev->dev, "Clock enable failed %d\n", ret);
634
+
return ret;
635
+
}
636
+
636
637
for (i = 0; i < num; i++) {
637
638
enum msg_end_type end_type = MSG_END_STOP;
638
639
if (i < (num - 1)) {