Commit 8bf98651 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:
 "This contains a 5.8 regression fix for the Designware driver, a
  register bitfield fix for the fsi driver, and a missing sanity check
  for the I2C core"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: check returned size of emulated smbus block read
  i2c: fsi: Fix the port number field in status register
  i2c: designware: Adjust bus speed independently of ACPI
parents 42afe7d1 40e05200

drivers/i2c/busses/i2c-designware-common.c

+17 −8
Original line number Diff line number Diff line
@@ -286,10 +286,8 @@ int i2c_dw_acpi_configure(struct device *device) 
}

EXPORT_SYMBOL_GPL(i2c_dw_acpi_configure);



void i2c_dw_acpi_adjust_bus_speed(struct device *device)

static u32 i2c_dw_acpi_round_bus_speed(struct device *device)

{

	struct dw_i2c_dev *dev = dev_get_drvdata(device);

	struct i2c_timings *t = &dev->timings;

	u32 acpi_speed;

	int i;
@@ -300,9 +298,22 @@ void i2c_dw_acpi_adjust_bus_speed(struct device *device) 
	 */

	for (i = 0; i < ARRAY_SIZE(supported_speeds); i++) {

		if (acpi_speed >= supported_speeds[i])

			break;

			return supported_speeds[i];

	}



	return 0;

}

	acpi_speed = i < ARRAY_SIZE(supported_speeds) ? supported_speeds[i] : 0;



#else	/* CONFIG_ACPI */



static inline u32 i2c_dw_acpi_round_bus_speed(struct device *device) { return 0; }



#endif	/* CONFIG_ACPI */



void i2c_dw_adjust_bus_speed(struct dw_i2c_dev *dev)

{

	u32 acpi_speed = i2c_dw_acpi_round_bus_speed(dev->dev);

	struct i2c_timings *t = &dev->timings;



	/*

	 * Find bus speed from the "clock-frequency" device property, ACPI
@@ -315,9 +326,7 @@ void i2c_dw_acpi_adjust_bus_speed(struct device *device) 
	else

		t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ;

}

EXPORT_SYMBOL_GPL(i2c_dw_acpi_adjust_bus_speed);



#endif	/* CONFIG_ACPI */

EXPORT_SYMBOL_GPL(i2c_dw_adjust_bus_speed);



u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset)

{

drivers/i2c/busses/i2c-designware-core.h

+1 −2
Original line number Diff line number Diff line
@@ -361,11 +361,10 @@ static inline int i2c_dw_probe_lock_support(struct dw_i2c_dev *dev) { return 0; 
#endif



int i2c_dw_validate_speed(struct dw_i2c_dev *dev);

void i2c_dw_adjust_bus_speed(struct dw_i2c_dev *dev);



#if IS_ENABLED(CONFIG_ACPI)

int i2c_dw_acpi_configure(struct device *device);

void i2c_dw_acpi_adjust_bus_speed(struct device *device);

#else

static inline int i2c_dw_acpi_configure(struct device *device) { return -ENODEV; }

static inline void i2c_dw_acpi_adjust_bus_speed(struct device *device) {}

#endif

drivers/i2c/busses/i2c-designware-pcidrv.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, 
		}

	}



	i2c_dw_acpi_adjust_bus_speed(&pdev->dev);

	i2c_dw_adjust_bus_speed(dev);



	if (has_acpi_companion(&pdev->dev))

		i2c_dw_acpi_configure(&pdev->dev);

drivers/i2c/busses/i2c-designware-platdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 
	else

		i2c_parse_fw_timings(&pdev->dev, t, false);



	i2c_dw_acpi_adjust_bus_speed(&pdev->dev);

	i2c_dw_adjust_bus_speed(dev);



	if (pdev->dev.of_node)

		dw_i2c_of_configure(pdev);

drivers/i2c/busses/i2c-fsi.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
#define I2C_STAT_DAT_REQ	BIT(25)

#define I2C_STAT_CMD_COMP	BIT(24)

#define I2C_STAT_STOP_ERR	BIT(23)

#define I2C_STAT_MAX_PORT	GENMASK(19, 16)

#define I2C_STAT_MAX_PORT	GENMASK(22, 16)

#define I2C_STAT_ANY_INT	BIT(15)

#define I2C_STAT_SCL_IN		BIT(11)

#define I2C_STAT_SDA_IN		BIT(10)

CRA Git | Maintained and supported by SUSTech CRA and CCSE