Commit d5335b3d 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 updates from Wolfram Sang:
 "I2C has one bugfix (qcom-geni driver), one arch enablement (i2c-omap
  driver, no code change), and a new driver (nvidia-gpu) this time"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  usb: typec: ucsi: add support for Cypress CCGx
  i2c: nvidia-gpu: make pm_ops static
  i2c: add i2c bus driver for NVIDIA GPU
  i2c: qcom-geni: Fix runtime PM mismatch with child devices
  MAINTAINERS: Add entry for i2c-omap driver
  i2c: omap: Enable for ARCH_K3
  dt-bindings: i2c: omap: Add new compatible for AM654 SoCs
parents aa4330e1 247c554a

Documentation/devicetree/bindings/i2c/i2c-omap.txt

+6 −2
Original line number Diff line number Diff line 
I2C for OMAP platforms



Required properties :

- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"

  or "ti,omap4-i2c"

- compatible : Must be

	"ti,omap2420-i2c" for OMAP2420 SoCs

	"ti,omap2430-i2c" for OMAP2430 SoCs

	"ti,omap3-i2c" for OMAP3 SoCs

	"ti,omap4-i2c" for OMAP4+ SoCs

	"ti,am654-i2c", "ti,omap4-i2c" for AM654 SoCs

- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)

- #address-cells = <1>;

- #size-cells = <0>;

Documentation/i2c/busses/i2c-nvidia-gpu

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Kernel driver i2c-nvidia-gpu



Datasheet: not publicly available.



Authors:

	Ajay Gupta <ajayg@nvidia.com>



Description

-----------



i2c-nvidia-gpu is a driver for I2C controller included in NVIDIA Turing

and later GPUs and it is used to communicate with Type-C controller on GPUs.



If your 'lspci -v' listing shows something like the following,



01:00.3 Serial bus controller [0c80]: NVIDIA Corporation Device 1ad9 (rev a1)



then this driver should support the I2C controller of your GPU.

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -6861,6 +6861,13 @@ L: linux-acpi@vger.kernel.org 
S:	Maintained

F:	drivers/i2c/i2c-core-acpi.c



I2C CONTROLLER DRIVER FOR NVIDIA GPU

M:	Ajay Gupta <ajayg@nvidia.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-nvidia-gpu

F:	drivers/i2c/busses/i2c-nvidia-gpu.c



I2C MUXES

M:	Peter Rosin <peda@axentia.se>

L:	linux-i2c@vger.kernel.org
@@ -10784,6 +10791,14 @@ L: linux-omap@vger.kernel.org 
S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP I2C DRIVER

M:	Vignesh R <vigneshr@ti.com>

L:	linux-omap@vger.kernel.org

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/i2c/i2c-omap.txt

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



OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	linux-media@vger.kernel.org

drivers/i2c/busses/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -224,6 +224,15 @@ config I2C_NFORCE2_S4985 
	  This driver can also be built as a module.  If so, the module

	  will be called i2c-nforce2-s4985.



config I2C_NVIDIA_GPU

	tristate "NVIDIA GPU I2C controller"

	depends on PCI

	help

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

	  NVIDIA GPU I2C controller which is used to communicate with the GPU's

	  Type-C controller. This driver can also be built as a module called

	  i2c-nvidia-gpu.



config I2C_SIS5595

	tristate "SiS 5595"

	depends on PCI
@@ -752,7 +761,7 @@ config I2C_OCORES 


config I2C_OMAP

	tristate "OMAP I2C adapter"

	depends on ARCH_OMAP

	depends on ARCH_OMAP || ARCH_K3

	default y if MACH_OMAP_H3 || MACH_OMAP_OSK

	help

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

drivers/i2c/busses/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-$(CONFIG_I2C_ISCH) += i2c-isch.o 
obj-$(CONFIG_I2C_ISMT)		+= i2c-ismt.o

obj-$(CONFIG_I2C_NFORCE2)	+= i2c-nforce2.o

obj-$(CONFIG_I2C_NFORCE2_S4985)	+= i2c-nforce2-s4985.o

obj-$(CONFIG_I2C_NVIDIA_GPU)	+= i2c-nvidia-gpu.o

obj-$(CONFIG_I2C_PIIX4)		+= i2c-piix4.o

obj-$(CONFIG_I2C_SIS5595)	+= i2c-sis5595.o

obj-$(CONFIG_I2C_SIS630)	+= i2c-sis630.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE