Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5b1bd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c updates from Wolfram Sang:

 -I2C core now reports proper OF style module alias. I'd like to repeat
  the note from the commit msg here (Thanks, Javier!):

      NOTE: This patch may break out-of-tree drivers that were relying
            on this behavior, and only had an I2C device ID table even
            when the device was registered via OF.

            There are no remaining drivers in mainline that do this, but
            out-of-tree drivers have to be fixed and define a proper OF
            device ID table to have module auto-loading working.

 - new driver for the SynQuacer I2C controller

 - major refactoring of the QUP driver

 - the piix4 driver now uses request_muxed_region which should fix a
   long standing resource conflict with the sp5100_tco watchdog

 - a bunch of small core & driver improvements

* 'i2c/for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (53 commits)
  i2c: add support for Socionext SynQuacer I2C controller
  dt-bindings: i2c: add binding for Socionext SynQuacer I2C
  i2c: Update i2c_trace_msg static key to modern api
  i2c: fix parameter of trace_i2c_result
  i2c: imx: avoid taking clk_prepare mutex in PM callbacks
  i2c: imx: use clk notifier for rate changes
  i2c: make i2c_check_addr_validity() static
  i2c: rcar: fix mask value of prohibited bit
  dt-bindings: i2c: document R8A77965 bindings
  i2c: pca-platform: drop gpio from platform data
  i2c: pca-platform: use device_property_read_u32
  i2c: pca-platform: unconditionally use devm_gpiod_get_optional
  sh: sh7785lcr: add GPIO lookup table for i2c controller reset
  i2c: qup: reorganization of driver code to remove polling for qup v2
  i2c: qup: reorganization of driver code to remove polling for qup v1
  i2c: qup: send NACK for last read sub transfers
  i2c: qup: fix buffer overflow for multiple msg of maximum xfer len
  i2c: qup: change completion timeout according to transfer length
  i2c: qup: use the complete transfer length to choose DMA mode
  i2c: qup: proper error handling for i2c error in BAM mode
  ...
parents 49a695ba 0d676a6c

Documentation/devicetree/bindings/eeprom/at24.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,12 +41,16 @@ Required properties: 
                "nxp",

                "ramtron",

                "renesas",

                "rohm",

                "st",



                Some vendors use different model names for chips which are just

                variants of the above. Known such exceptions are listed below:



                "nxp,se97b" - the fallback is "atmel,24c02",

                "renesas,r1ex24002" - the fallback is "atmel,24c02"

                "renesas,r1ex24128" - the fallback is "atmel,24c128"

                "rohm,br24t01" - the fallback is "atmel,24c01"



  - reg: The I2C address of the EEPROM.

Documentation/devicetree/bindings/i2c/i2c-rcar.txt

+2 −0
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ Required properties: 
	"renesas,i2c-r8a7794" if the device is a part of a R8A7794 SoC.

	"renesas,i2c-r8a7795" if the device is a part of a R8A7795 SoC.

	"renesas,i2c-r8a7796" if the device is a part of a R8A7796 SoC.

	"renesas,i2c-r8a77965" if the device is a part of a R8A77965 SoC.

	"renesas,i2c-r8a77970" if the device is a part of a R8A77970 SoC.

	"renesas,i2c-r8a77995" if the device is a part of a R8A77995 SoC.

	"renesas,rcar-gen1-i2c" for a generic R-Car Gen1 compatible device.

	"renesas,rcar-gen2-i2c" for a generic R-Car Gen2 or RZ/G1 compatible

				device.

Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
			- "renesas,iic-r8a7794" (R-Car E2)

			- "renesas,iic-r8a7795" (R-Car H3)

			- "renesas,iic-r8a7796" (R-Car M3-W)

			- "renesas,iic-r8a77965" (R-Car M3-N)

			- "renesas,iic-sh73a0" (SH-Mobile AG5)

			- "renesas,rcar-gen2-iic" (generic R-Car Gen2 or RZ/G1

							compatible device)

Documentation/devicetree/bindings/i2c/i2c-synquacer.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Socionext SynQuacer I2C



Required properties:

- compatible      : Must be "socionext,synquacer-i2c"

- reg             : Offset and length of the register set for the device

- interrupts      : A single interrupt specifier

- #address-cells  : Must be <1>;

- #size-cells     : Must be <0>;

- clock-names     : Must contain "pclk".

- clocks          : Must contain an entry for each name in clock-names.

                    (See the common clock bindings.)



Optional properties:

- clock-frequency : Desired I2C bus clock frequency in Hz. As only Normal and

                    Fast modes are supported, possible values are 100000 and

                    400000.



Example :



    i2c@51210000 {

        compatible = "socionext,synquacer-i2c";

        reg = <0x51210000 0x1000>;

        interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;

        #address-cells = <1>;

        #size-cells = <0>;

        clock-names = "pclk";

        clocks = <&clk_i2c>;

        clock-frequency = <400000>;

    };

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -6559,7 +6559,7 @@ F: drivers/i2c/muxes/ 
F:	include/linux/i2c-mux.h



I2C MV64XXX MARVELL AND ALLWINNER DRIVER

M:	Gregory CLEMENT <gregory.clement@free-electrons.com>

M:	Gregory CLEMENT <gregory.clement@bootlin.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-mv64xxx.c
@@ -12902,6 +12902,13 @@ F: include/media/soc* 
F:	drivers/media/i2c/soc_camera/

F:	drivers/media/platform/soc_camera/



SOCIONEXT SYNQUACER I2C DRIVER

M:	Ard Biesheuvel <ard.biesheuvel@linaro.org>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-synquacer.c

F:	Documentation/devicetree/bindings/i2c/i2c-synquacer.txt



SOCIONEXT UNIPHIER SOUND DRIVER

M:	Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)