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

Commit 67936a41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:
 "I2C has three driver fixes for the newly introduced drivers and one ID
  addition for the i801 driver"

* 'i2c/for-current-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: i2c-stm32f7: make structure stm32f7_setup static const
  i2c: ensure termination of *_device_id tables
  i2c: i801: Add support for Intel Cedar Fork
  i2c: stm32f7: fix setup structure
parents 031b8140 25f2f440

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Supported adapters: 
  * Intel Gemini Lake (SOC)

  * Intel Cannon Lake-H (PCH)

  * Intel Cannon Lake-LP (PCH)

  * Intel Cedar Fork (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

drivers/i2c/busses/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ config I2C_I801 
	    Gemini Lake (SOC)

	    Cannon Lake-H (PCH)

	    Cannon Lake-LP (PCH)

	    Cedar Fork (PCH)



	  This driver can also be built as a module.  If so, the module

	  will be called i2c-i801.

drivers/i2c/busses/i2c-i801.c

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
 * Gemini Lake (SOC)		0x31d4	32	hard	yes	yes	yes

 * Cannon Lake-H (PCH)		0xa323	32	hard	yes	yes	yes

 * Cannon Lake-LP (PCH)		0x9da3	32	hard	yes	yes	yes

 * Cedar Fork (PCH)		0x18df	32	hard	yes	yes	yes

 *

 * Features supported by this driver:

 * Software PEC				no
@@ -204,6 +205,7 @@ 


/* Older devices have their ID defined in <linux/pci_ids.h> */

#define PCI_DEVICE_ID_INTEL_BAYTRAIL_SMBUS		0x0f12

#define PCI_DEVICE_ID_INTEL_CDF_SMBUS			0x18df

#define PCI_DEVICE_ID_INTEL_DNV_SMBUS			0x19df

#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS		0x1c22

#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS		0x1d22
@@ -1025,6 +1027,7 @@ static const struct pci_device_id i801_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BRASWELL_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CDF_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DNV_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BROXTON_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS) },
@@ -1513,6 +1516,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	case PCI_DEVICE_ID_INTEL_CANNONLAKE_LP_SMBUS:

	case PCI_DEVICE_ID_INTEL_LEWISBURG_SMBUS:

	case PCI_DEVICE_ID_INTEL_LEWISBURG_SSKU_SMBUS:

	case PCI_DEVICE_ID_INTEL_CDF_SMBUS:

	case PCI_DEVICE_ID_INTEL_DNV_SMBUS:

	case PCI_DEVICE_ID_INTEL_KABYLAKE_PCH_H_SMBUS:

		priv->features |= FEATURE_I2C_BLOCK_READ;

drivers/i2c/busses/i2c-sprd.c

+1 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ static const struct dev_pm_ops sprd_i2c_pm_ops = { 


static const struct of_device_id sprd_i2c_of_match[] = {

	{ .compatible = "sprd,sc9860-i2c", },

	{},

};



static struct platform_driver sprd_i2c_driver = {

drivers/i2c/busses/i2c-stm32f7.c

+7 −10
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ struct stm32f7_i2c_dev { 
	unsigned int msg_num;

	unsigned int msg_id;

	struct stm32f7_i2c_msg f7_msg;

	struct stm32f7_i2c_setup *setup;

	struct stm32f7_i2c_setup setup;

	struct stm32f7_i2c_timings timing;

};
@@ -265,7 +265,7 @@ static struct stm32f7_i2c_spec i2c_specs[] = { 
	},

};



struct stm32f7_i2c_setup stm32f7_setup = {

static const struct stm32f7_i2c_setup stm32f7_setup = {

	.rise_time = STM32F7_I2C_RISE_TIME_DEFAULT,

	.fall_time = STM32F7_I2C_FALL_TIME_DEFAULT,

	.dnf = STM32F7_I2C_DNF_DEFAULT,
@@ -537,7 +537,7 @@ static void stm32f7_i2c_hw_config(struct stm32f7_i2c_dev *i2c_dev) 
	writel_relaxed(timing, i2c_dev->base + STM32F7_I2C_TIMINGR);



	/* Enable I2C */

	if (i2c_dev->setup->analog_filter)

	if (i2c_dev->setup.analog_filter)

		stm32f7_i2c_clr_bits(i2c_dev->base + STM32F7_I2C_CR1,

				     STM32F7_I2C_CR1_ANFOFF);

	else
@@ -887,22 +887,19 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) 
	}



	setup = of_device_get_match_data(&pdev->dev);

	i2c_dev->setup->rise_time = setup->rise_time;

	i2c_dev->setup->fall_time = setup->fall_time;

	i2c_dev->setup->dnf = setup->dnf;

	i2c_dev->setup->analog_filter = setup->analog_filter;

	i2c_dev->setup = *setup;



	ret = device_property_read_u32(i2c_dev->dev, "i2c-scl-rising-time-ns",

				       &rise_time);

	if (!ret)

		i2c_dev->setup->rise_time = rise_time;

		i2c_dev->setup.rise_time = rise_time;



	ret = device_property_read_u32(i2c_dev->dev, "i2c-scl-falling-time-ns",

				       &fall_time);

	if (!ret)

		i2c_dev->setup->fall_time = fall_time;

		i2c_dev->setup.fall_time = fall_time;



	ret = stm32f7_i2c_setup_timing(i2c_dev, i2c_dev->setup);

	ret = stm32f7_i2c_setup_timing(i2c_dev, &i2c_dev->setup);

	if (ret)

		goto clk_free;