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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
"A memleak fix for the core, two driver bugfixes, as well as fixing
missing file patterns to MAINTAINERS"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: add I2C DT bindings to ARM platforms
MAINTAINERS: add DT bindings to i2c drivers
i2c: synquacer: fix synquacer_i2c_doxfer() return value
i2c: mlxcpld: Fix wrong initialization order in probe
i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr

Linus Torvalds 38baf0bb 378e853f

+21 -2
+18
MAINTAINERS
··· 696 696 ALTERA I2C CONTROLLER DRIVER 697 697 M: Thor Thayer <thor.thayer@linux.intel.com> 698 698 S: Maintained 699 + F: Documentation/devicetree/bindings/i2c/i2c-altera.txt 699 700 F: drivers/i2c/busses/i2c-altera.c 700 701 701 702 ALTERA MAILBOX DRIVER ··· 1175 1174 F: Documentation/devicetree/bindings/arm/arm-boards 1176 1175 F: Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt 1177 1176 F: Documentation/devicetree/bindings/clock/arm-integrator.txt 1177 + F: Documentation/devicetree/bindings/i2c/i2c-versatile.txt 1178 1178 F: Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt 1179 1179 F: Documentation/devicetree/bindings/mtd/arm-versatile.txt 1180 1180 F: arch/arm/mach-integrator/ ··· 1783 1781 M: Vladimir Zapolskiy <vz@mleia.com> 1784 1782 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1785 1783 S: Maintained 1784 + F: Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt 1786 1785 F: arch/arm/boot/dts/lpc43* 1787 1786 F: drivers/i2c/busses/i2c-lpc2k.c 1788 1787 F: drivers/memory/pl172.c ··· 1797 1794 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1798 1795 T: git git://github.com/vzapolskiy/linux-lpc32xx.git 1799 1796 S: Maintained 1797 + F: Documentation/devicetree/bindings/i2c/i2c-pnx.txt 1800 1798 F: arch/arm/boot/dts/lpc32* 1801 1799 F: arch/arm/mach-lpc32xx/ 1802 1800 F: drivers/i2c/busses/i2c-pnx.c ··· 1922 1918 M: Linus Walleij <linus.walleij@linaro.org> 1923 1919 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1924 1920 S: Maintained 1921 + F: Documentation/devicetree/bindings/i2c/i2c-nomadik.txt 1922 + F: Documentation/devicetree/bindings/i2c/i2c-stu300.txt 1925 1923 F: arch/arm/mach-nomadik/ 1926 1924 F: arch/arm/mach-u300/ 1927 1925 F: arch/arm/mach-ux500/ ··· 2146 2140 L: linux-rockchip@lists.infradead.org 2147 2141 T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git 2148 2142 S: Maintained 2143 + F: Documentation/devicetree/bindings/i2c/i2c-rk3x.txt 2149 2144 F: arch/arm/boot/dts/rk3* 2150 2145 F: arch/arm/boot/dts/rv1108* 2151 2146 F: arch/arm/mach-rockchip/ ··· 2282 2275 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2283 2276 W: http://www.stlinux.com 2284 2277 S: Maintained 2278 + F: Documentation/devicetree/bindings/i2c/i2c-st.txt 2285 2279 F: arch/arm/mach-sti/ 2286 2280 F: arch/arm/boot/dts/sti* 2287 2281 F: drivers/char/hw_random/st-rng.c ··· 2474 2466 M: Tony Prisk <linux@prisktech.co.nz> 2475 2467 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2476 2468 S: Maintained 2469 + F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt 2477 2470 F: arch/arm/mach-vt8500/ 2478 2471 F: drivers/clocksource/timer-vt8500.c 2479 2472 F: drivers/i2c/busses/i2c-wmt.c ··· 2540 2531 F: drivers/block/xsysace.c 2541 2532 N: zynq 2542 2533 N: xilinx 2534 + F: Documentation/devicetree/bindings/i2c/i2c-cadence.txt 2535 + F: Documentation/devicetree/bindings/i2c/i2c-xiic.txt 2543 2536 F: drivers/clocksource/timer-cadence-ttc.c 2544 2537 F: drivers/i2c/busses/i2c-cadence.c 2545 2538 F: drivers/mmc/host/sdhci-of-arasan.c ··· 7353 7342 M: Gregory CLEMENT <gregory.clement@bootlin.com> 7354 7343 L: linux-i2c@vger.kernel.org 7355 7344 S: Maintained 7345 + F: Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt 7356 7346 F: drivers/i2c/busses/i2c-mv64xxx.c 7357 7347 7358 7348 I2C OVER PARALLEL PORT ··· 11737 11725 M: Andrew Lunn <andrew@lunn.ch> 11738 11726 L: linux-i2c@vger.kernel.org 11739 11727 S: Maintained 11728 + F: Documentation/devicetree/bindings/i2c/i2c-ocores.txt 11740 11729 F: Documentation/i2c/busses/i2c-ocores 11741 11730 F: drivers/i2c/busses/i2c-ocores.c 11742 11731 F: include/linux/platform_data/i2c-ocores.h ··· 13377 13364 RENESAS EMEV2 I2C DRIVER 13378 13365 M: Wolfram Sang <wsa+renesas@sang-engineering.com> 13379 13366 S: Supported 13367 + F: Documentation/devicetree/bindings/i2c/i2c-emev2.txt 13380 13368 F: drivers/i2c/busses/i2c-emev2.c 13381 13369 13382 13370 RENESAS ETHERNET DRIVERS ··· 13399 13385 RENESAS R-CAR I2C DRIVERS 13400 13386 M: Wolfram Sang <wsa+renesas@sang-engineering.com> 13401 13387 S: Supported 13388 + F: Documentation/devicetree/bindings/i2c/i2c-rcar.txt 13389 + F: Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt 13402 13390 F: drivers/i2c/busses/i2c-rcar.c 13403 13391 F: drivers/i2c/busses/i2c-sh_mobile.c 13404 13392 ··· 15690 15674 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 15691 15675 T: git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git 15692 15676 S: Supported 15677 + F: Documentation/devicetree/bindings/i2c/i2c-davinci.txt 15693 15678 F: arch/arm/mach-davinci/ 15694 15679 F: drivers/i2c/busses/i2c-davinci.c 15695 15680 F: arch/arm/boot/dts/da850* ··· 17394 17377 L: linux-i2c@vger.kernel.org 17395 17378 W: http://www.cavium.com 17396 17379 S: Supported 17380 + F: Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt 17397 17381 F: drivers/i2c/busses/i2c-xlp9xx.c 17398 17382 17399 17383 XRA1403 GPIO EXPANDER
+1 -1
drivers/i2c/busses/i2c-mlxcpld.c
··· 503 503 platform_set_drvdata(pdev, priv); 504 504 505 505 priv->dev = &pdev->dev; 506 + priv->base_addr = MLXPLAT_CPLD_LPC_I2C_BASE_ADDR; 506 507 507 508 /* Register with i2c layer */ 508 509 mlxcpld_i2c_adapter.timeout = usecs_to_jiffies(MLXCPLD_I2C_XFER_TO); ··· 519 518 mlxcpld_i2c_adapter.nr = pdev->id; 520 519 priv->adap = mlxcpld_i2c_adapter; 521 520 priv->adap.dev.parent = &pdev->dev; 522 - priv->base_addr = MLXPLAT_CPLD_LPC_I2C_BASE_ADDR; 523 521 i2c_set_adapdata(&priv->adap, priv); 524 522 525 523 err = i2c_add_numbered_adapter(&priv->adap);
+1 -1
drivers/i2c/busses/i2c-synquacer.c
··· 351 351 /* wait 2 clock periods to ensure the stop has been through the bus */ 352 352 udelay(DIV_ROUND_UP(2 * 1000, i2c->speed_khz)); 353 353 354 - return 0; 354 + return ret; 355 355 } 356 356 357 357 static irqreturn_t synquacer_i2c_isr(int irq, void *dev_id)
+1
drivers/i2c/i2c-dev.c
··· 275 275 msgs[i].len < 1 || msgs[i].buf[0] < 1 || 276 276 msgs[i].len < msgs[i].buf[0] + 277 277 I2C_SMBUS_BLOCK_MAX) { 278 + i++; 278 279 res = -EINVAL; 279 280 break; 280 281 }