Commit 8ed5a41a authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'i2c-host-6.20' of... 

Merge tag 'i2c-host-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow

i2c-host for v6.20

- amd-mp2, designware, mlxbf, rtl9300, spacemit, tegra: cleanups
- designware: use a dedicated algorithm for AMD Navi
- designware: replace magic numbers with named constants
- designware: replace min_t() with min() to avoid u8 truncation
- designware: refactor core to enable mode switching
- imx-lpi2c: add runtime PM support for IRQ and clock handling
- lan9691-i2c: add new driver
- rtl9300: use OF helpers directly and avoid fwnode handling
- spacemit: add bus reset support
- units: add HZ_PER_GHZ and use it in several i2c drivers
parents 756b7b8d 51e8ce36

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
              - microchip,sam9x60-i2c

      - items:

          - enum:

              - microchip,lan9691-i2c

              - microchip,sama7d65-i2c

              - microchip,sama7g5-i2c

              - microchip,sam9x7-i2c

Documentation/devicetree/bindings/i2c/spacemit,k1-i2c.yaml

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ properties: 
    default: 400000

    maximum: 3300000



  resets:

    maxItems: 1



required:

  - compatible

  - reg

drivers/i2c/busses/Kconfig

+2 −9
Original line number Diff line number Diff line
@@ -569,24 +569,17 @@ config I2C_DESIGNWARE_CORE 
	help

	  This option enables support for the Synopsys DesignWare I2C adapter.

	  This driver includes support for the I2C host on the Synopsys

	  Designware I2C adapter.

	  Designware I2C adapter, and the I2C slave when enabled (select

	  I2C_SLAVE).



	  To compile the driver as a module, choose M here: the module will be

	  called i2c-designware-core.



if I2C_DESIGNWARE_CORE



config I2C_DESIGNWARE_SLAVE

	bool "Synopsys DesignWare Slave"

	select I2C_SLAVE

	help

	  If you say yes to this option, support will be included for the

	  Synopsys DesignWare I2C slave adapter.



config I2C_DESIGNWARE_PLATFORM

	tristate "Synopsys DesignWare Platform driver"

	depends on (ACPI && COMMON_CLK) || !ACPI

	select MFD_SYSCON if MIPS_BAIKAL_T1

	default I2C_DESIGNWARE_CORE

	help

	  If you say yes to this option, support will be included for the

drivers/i2c/busses/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o 
obj-$(CONFIG_I2C_DESIGNWARE_CORE)			+= i2c-designware-core.o

i2c-designware-core-y					:= i2c-designware-common.o

i2c-designware-core-y					+= i2c-designware-master.o

i2c-designware-core-$(CONFIG_I2C_DESIGNWARE_SLAVE) 	+= i2c-designware-slave.o

i2c-designware-core-$(CONFIG_I2C_SLAVE) 		+= i2c-designware-slave.o

obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM)			+= i2c-designware-platform.o

i2c-designware-platform-y 				:= i2c-designware-platdrv.o

i2c-designware-platform-$(CONFIG_I2C_DESIGNWARE_AMDPSP)	+= i2c-designware-amdpsp.o

drivers/i2c/busses/i2c-amd-mp2-pci.c

+5 −3
Original line number Diff line number Diff line
@@ -456,18 +456,20 @@ module_pci_driver(amd_mp2_pci_driver); 


struct amd_mp2_dev *amd_mp2_find_device(void)

{

	struct amd_mp2_dev *privdata;

	struct device *dev;

	struct pci_dev *pci_dev;

	struct amd_mp2_dev *mp2_dev;



	dev = driver_find_next_device(&amd_mp2_pci_driver.driver, NULL);

	if (!dev)

		return NULL;



	pci_dev = to_pci_dev(dev);

	mp2_dev = (struct amd_mp2_dev *)pci_get_drvdata(pci_dev);

	privdata = pci_get_drvdata(pci_dev);



	put_device(dev);

	return mp2_dev;



	return privdata;

}

EXPORT_SYMBOL_GPL(amd_mp2_find_device);