Commit d7b686eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:

 - bugfixes for uniphier, i801, and xiic drivers

 - ID removal (never produced) for imx

 - one MAINTAINER addition

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: xiic: Record xilinx i2c with Zynq fragment
  i2c: xiic: Make the start and the byte count write atomic
  i2c: i801: fix DNV's SMBCTRL register offset
  i2c: imx-lpi2c: Remove mx8dv compatible entry
  dt-bindings: imx-lpi2c: Remove mx8dv compatible entry
  i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP
  i2c: uniphier: issue STOP only for last message or I2C_M_STOP
parents 2c34a0e0 da4dfaf8

Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
Required properties:

- compatible :

  - "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc

  - "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc

- reg : address and length of the lpi2c master registers

- interrupts : lpi2c interrupt

- clocks : lpi2c clock specifier
@@ -11,7 +10,7 @@ Required properties: 
Examples:



lpi2c7: lpi2c7@40a50000 {

	compatible = "fsl,imx8dv-lpi2c";

	compatible = "fsl,imx7ulp-lpi2c";

	reg = <0x40A50000 0x10000>;

	interrupt-parent = <&intc>;

	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2311,6 +2311,7 @@ F: drivers/clocksource/cadence_ttc_timer.c 
F:	drivers/i2c/busses/i2c-cadence.c

F:	drivers/mmc/host/sdhci-of-arasan.c

F:	drivers/edac/synopsys_edac.c

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



ARM64 PORT (AARCH64 ARCHITECTURE)

M:	Catalin Marinas <catalin.marinas@arm.com>

drivers/i2c/busses/i2c-i801.c

+6 −1
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 


#define SBREG_BAR		0x10

#define SBREG_SMBCTRL		0xc6000c

#define SBREG_SMBCTRL_DNV	0xcf000c



/* Host status bits for SMBPCISTS */

#define SMBPCISTS_INTS		BIT(3)
@@ -1399,7 +1400,11 @@ static void i801_add_tco(struct i801_priv *priv) 
	spin_unlock(&p2sb_spinlock);



	res = &tco_res[ICH_RES_MEM_OFF];

	if (pci_dev->device == PCI_DEVICE_ID_INTEL_DNV_SMBUS)

		res->start = (resource_size_t)base64_addr + SBREG_SMBCTRL_DNV;

	else

		res->start = (resource_size_t)base64_addr + SBREG_SMBCTRL;



	res->end = res->start + 3;

	res->flags = IORESOURCE_MEM;

drivers/i2c/busses/i2c-imx-lpi2c.c

+0 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ static const struct i2c_algorithm lpi2c_imx_algo = { 


static const struct of_device_id lpi2c_imx_of_match[] = {

	{ .compatible = "fsl,imx7ulp-lpi2c" },

	{ .compatible = "fsl,imx8dv-lpi2c" },

	{ },

};

MODULE_DEVICE_TABLE(of, lpi2c_imx_of_match);

drivers/i2c/busses/i2c-uniphier-f.c

+2 −5
Original line number Diff line number Diff line
@@ -401,11 +401,8 @@ static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap, 
		return ret;



	for (msg = msgs; msg < emsg; msg++) {

		/* If next message is read, skip the stop condition */

		bool stop = !(msg + 1 < emsg && msg[1].flags & I2C_M_RD);

		/* but, force it if I2C_M_STOP is set */

		if (msg->flags & I2C_M_STOP)

			stop = true;

		/* Emit STOP if it is the last message or I2C_M_STOP is set. */

		bool stop = (msg + 1 == emsg) || (msg->flags & I2C_M_STOP);



		ret = uniphier_fi2c_master_xfer_one(adap, msg, stop);

		if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE