tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-s3c2410: Correct use of ! and &
i2c: The i2c mailing list is moving
scx200_i2c: Add missing class parameter

Linus Torvalds 0fb7f4f0 cdcba02a

+13 -12
unified split
+1 -1
Documentation/i2c/busses/i2c-sis96x
··· 42 chipsets as well: 635, and 635T. If anyone owns a board with those chips 43 AND is willing to risk crashing & burning an otherwise well-behaved kernel 44 in the name of progress... please contact me at <mhoffman@lightlink.com> or 45 - via the project's mailing list: <i2c@lm-sensors.org>. Please send bug 46 reports and/or success stories as well. 47 48
··· 42 chipsets as well: 635, and 635T. If anyone owns a board with those chips 43 AND is willing to risk crashing & burning an otherwise well-behaved kernel 44 in the name of progress... please contact me at <mhoffman@lightlink.com> or 45 + via the linux-i2c mailing list: <linux-i2c@vger.kernel.org>. Please send bug 46 reports and/or success stories as well. 47 48
+10 -10
MAINTAINERS
··· 347 ALI1563 I2C DRIVER 348 P: Rudolf Marek 349 M: r.marek@assembler.cz 350 - L: i2c@lm-sensors.org 351 S: Maintained 352 353 ALPHA PORT ··· 1749 P: Jochen Friedrich 1750 M: jochen@scram.de 1751 L: linuxppc-dev@ozlabs.org 1752 - L: i2c@lm-sensors.org 1753 S: Maintained 1754 1755 FREESCALE SOC FS_ENET DRIVER ··· 2022 I2C/SMBUS STUB DRIVER 2023 P: Mark M. Hoffman 2024 M: mhoffman@lightlink.com 2025 - L: i2c@lm-sensors.org 2026 S: Maintained 2027 2028 I2C SUBSYSTEM ··· 2030 M: khali@linux-fr.org 2031 P: Ben Dooks (embedded platforms) 2032 M: ben-linux@fluff.org 2033 - L: i2c@lm-sensors.org 2034 T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ 2035 S: Maintained 2036 2037 I2C-TINY-USB DRIVER 2038 P: Till Harbaum 2039 M: till@harbaum.org 2040 - L: i2c@lm-sensors.org 2041 T: http://www.harbaum.org/till/i2c_tiny_usb 2042 S: Maintained 2043 ··· 3153 OPENCORES I2C BUS DRIVER 3154 P: Peter Korsgaard 3155 M: jacmet@sunsite.dk 3156 - L: i2c@lm-sensors.org 3157 S: Maintained 3158 3159 OPROFILE ··· 3200 PA SEMI SMBUS DRIVER 3201 P: Olof Johansson 3202 M: olof@lixom.net 3203 - L: i2c@lm-sensors.org 3204 S: Maintained 3205 3206 PANASONIC LAPTOP ACPI EXTRAS DRIVER ··· 3345 PNXxxxx I2C DRIVER 3346 P: Vitaly Wool 3347 M: vitalywool@gmail.com 3348 - L: i2c@lm-sensors.org 3349 S: Maintained 3350 3351 PPP PROTOCOL DRIVERS AND COMPRESSORS ··· 3809 SIS 96X I2C/SMBUS DRIVER 3810 P: Mark M. Hoffman 3811 M: mhoffman@lightlink.com 3812 - L: i2c@lm-sensors.org 3813 S: Maintained 3814 3815 SIS FRAMEBUFFER DRIVER ··· 4556 VIAPRO SMBUS DRIVER 4557 P: Jean Delvare 4558 M: khali@linux-fr.org 4559 - L: i2c@lm-sensors.org 4560 S: Maintained 4561 4562 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
··· 347 ALI1563 I2C DRIVER 348 P: Rudolf Marek 349 M: r.marek@assembler.cz 350 + L: linux-i2c@vger.kernel.org 351 S: Maintained 352 353 ALPHA PORT ··· 1749 P: Jochen Friedrich 1750 M: jochen@scram.de 1751 L: linuxppc-dev@ozlabs.org 1752 + L: linux-i2c@vger.kernel.org 1753 S: Maintained 1754 1755 FREESCALE SOC FS_ENET DRIVER ··· 2022 I2C/SMBUS STUB DRIVER 2023 P: Mark M. Hoffman 2024 M: mhoffman@lightlink.com 2025 + L: linux-i2c@vger.kernel.org 2026 S: Maintained 2027 2028 I2C SUBSYSTEM ··· 2030 M: khali@linux-fr.org 2031 P: Ben Dooks (embedded platforms) 2032 M: ben-linux@fluff.org 2033 + L: linux-i2c@vger.kernel.org 2034 T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ 2035 S: Maintained 2036 2037 I2C-TINY-USB DRIVER 2038 P: Till Harbaum 2039 M: till@harbaum.org 2040 + L: linux-i2c@vger.kernel.org 2041 T: http://www.harbaum.org/till/i2c_tiny_usb 2042 S: Maintained 2043 ··· 3153 OPENCORES I2C BUS DRIVER 3154 P: Peter Korsgaard 3155 M: jacmet@sunsite.dk 3156 + L: linux-i2c@vger.kernel.org 3157 S: Maintained 3158 3159 OPROFILE ··· 3200 PA SEMI SMBUS DRIVER 3201 P: Olof Johansson 3202 M: olof@lixom.net 3203 + L: linux-i2c@vger.kernel.org 3204 S: Maintained 3205 3206 PANASONIC LAPTOP ACPI EXTRAS DRIVER ··· 3345 PNXxxxx I2C DRIVER 3346 P: Vitaly Wool 3347 M: vitalywool@gmail.com 3348 + L: linux-i2c@vger.kernel.org 3349 S: Maintained 3350 3351 PPP PROTOCOL DRIVERS AND COMPRESSORS ··· 3809 SIS 96X I2C/SMBUS DRIVER 3810 P: Mark M. Hoffman 3811 M: mhoffman@lightlink.com 3812 + L: linux-i2c@vger.kernel.org 3813 S: Maintained 3814 3815 SIS FRAMEBUFFER DRIVER ··· 4556 VIAPRO SMBUS DRIVER 4557 P: Jean Delvare 4558 M: khali@linux-fr.org 4559 + L: linux-i2c@vger.kernel.org 4560 S: Maintained 4561 4562 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
+1 -1
drivers/i2c/busses/i2c-s3c2410.c
··· 507 unsigned long timeout; 508 int ret; 509 510 - if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN) 511 return -EIO; 512 513 ret = s3c24xx_i2c_set_master(i2c);
··· 507 unsigned long timeout; 508 int ret; 509 510 + if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)) 511 return -EIO; 512 513 ret = s3c24xx_i2c_set_master(i2c);
+1
drivers/i2c/busses/scx200_i2c.c
··· 81 82 static struct i2c_adapter scx200_i2c_ops = { 83 .owner = THIS_MODULE, 84 .id = I2C_HW_B_SCX200, 85 .algo_data = &scx200_i2c_data, 86 .name = "NatSemi SCx200 I2C",
··· 81 82 static struct i2c_adapter scx200_i2c_ops = { 83 .owner = THIS_MODULE, 84 + .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, 85 .id = I2C_HW_B_SCX200, 86 .algo_data = &scx200_i2c_data, 87 .name = "NatSemi SCx200 I2C",