Commit b90e90f4 authored May 29, 2021 by Linus Torvalds

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

Pull i2c fixes from Wolfram Sang:
 "This is a bit larger than usual at rc4 time. The reason is due to
  Lee's work of fixing newly reported build warnings.

  The rest is fixes as usual"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (22 commits)
  MAINTAINERS: adjust to removing i2c designware platform data
  i2c: s3c2410: fix possible NULL pointer deref on read message after write
  i2c: mediatek: Disable i2c start_en and clear intr_stat brfore reset
  i2c: i801: Don't generate an interrupt on bus reset
  i2c: mpc: implement erratum A-004447 workaround
  powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P1010 i2c controllers
  powerpc/fsl: set fsl,i2c-erratum-a004447 flag for P2041 i2c controllers
  dt-bindings: i2c: mpc: Add fsl,i2c-erratum-a004447 flag
  i2c: busses: i2c-stm32f4: Remove incorrectly placed ' ' from function name
  i2c: busses: i2c-st: Fix copy/paste function misnaming issues
  i2c: busses: i2c-pnx: Provide descriptions for 'alg_data' data structure
  i2c: busses: i2c-ocores: Place the expected function names into the documentation headers
  i2c: busses: i2c-eg20t: Fix 'bad line' issue and provide description for 'msgs' param
  i2c: busses: i2c-designware-master: Fix misnaming of 'i2c_dw_init_master()'
  i2c: busses: i2c-cadence: Fix incorrectly documented 'enum cdns_i2c_slave_mode'
  i2c: busses: i2c-ali1563: File headers are not good candidates for kernel-doc
  i2c: muxes: i2c-arb-gpio-challenge: Demote non-conformant kernel-doc headers
  i2c: busses: i2c-nomadik: Fix formatting issue pertaining to 'timeout'
  i2c: sh_mobile: Use new clock calculation formulas for RZ/G2E
  i2c: I2C_HISI should depend on ACPI
  ...

parents 9a76c0ee 8aa0ae43

Documentation/devicetree/bindings/i2c/i2c-mpc.yaml

+7 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,13 @@ properties:
		description: \|
		I2C bus timeout in microseconds

		fsl,i2c-erratum-a004447:
		$ref: /schemas/types.yaml#/definitions/flag
		description: \|
		Indicates the presence of QorIQ erratum A-004447, which
		says that the standard i2c recovery scheme mechanism does
		not work and an alternate implementation is needed.

		required:
		- compatible
		- reg

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -17678,7 +17678,6 @@ R: Mika Westerberg <mika.westerberg@linux.intel.com>
		L: linux-i2c@vger.kernel.org
		S: Maintained
		F: drivers/i2c/busses/i2c-designware-*
		F: include/linux/platform_data/i2c-designware.h

		SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
		M: Jaehoon Chung <jh80.chung@samsung.com>

arch/powerpc/boot/dts/fsl/p1010si-post.dtsi

+8 −0

Original line number	Diff line number	Diff line
		@@ -122,7 +122,15 @@
		};

		/include/ "pq3-i2c-0.dtsi"
		i2c@3000 {
		fsl,i2c-erratum-a004447;
		};

		/include/ "pq3-i2c-1.dtsi"
		i2c@3100 {
		fsl,i2c-erratum-a004447;
		};

		/include/ "pq3-duart-0.dtsi"
		/include/ "pq3-espi-0.dtsi"
		spi0: spi@7000 {

arch/powerpc/boot/dts/fsl/p2041si-post.dtsi

+16 −0

Original line number	Diff line number	Diff line
		@@ -371,7 +371,23 @@
		};

		/include/ "qoriq-i2c-0.dtsi"
		i2c@118000 {
		fsl,i2c-erratum-a004447;
		};

		i2c@118100 {
		fsl,i2c-erratum-a004447;
		};

		/include/ "qoriq-i2c-1.dtsi"
		i2c@119000 {
		fsl,i2c-erratum-a004447;
		};

		i2c@119100 {
		fsl,i2c-erratum-a004447;
		};

		/include/ "qoriq-duart-0.dtsi"
		/include/ "qoriq-duart-1.dtsi"
		/include/ "qoriq-gpio-0.dtsi"

drivers/i2c/busses/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -647,7 +647,7 @@ config I2C_HIGHLANDER

		config I2C_HISI
		tristate "HiSilicon I2C controller"
		depends on ARM64 \|\| COMPILE_TEST
		depends on (ARM64 && ACPI) \|\| COMPILE_TEST
		help
		Say Y here if you want to have Hisilicon I2C controller support
		available on the Kunpeng Server.