Skip to content

Commit d5335b3

Browse files
torvaldstorvalds
committed
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
2 parents aa4330e + 247c554 commit d5335b3

File tree

10 files changed

+745
-10
lines changed

10 files changed

+745
-10
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
I2C for OMAP platforms
22

33
Required properties :
4-
- compatible : Must be "ti,omap2420-i2c", "ti,omap2430-i2c", "ti,omap3-i2c"
5-
or "ti,omap4-i2c"
4+
- compatible : Must be
5+
"ti,omap2420-i2c" for OMAP2420 SoCs
6+
"ti,omap2430-i2c" for OMAP2430 SoCs
7+
"ti,omap3-i2c" for OMAP3 SoCs
8+
"ti,omap4-i2c" for OMAP4+ SoCs
9+
"ti,am654-i2c", "ti,omap4-i2c" for AM654 SoCs
610
- ti,hwmods : Must be "i2c<n>", n being the instance number (1-based)
711
- #address-cells = <1>;
812
- #size-cells = <0>;

‎Documentation/i2c/busses/i2c-nvidia-gpu

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Kernel driver i2c-nvidia-gpu
2+
3+
Datasheet: not publicly available.
4+
5+
Authors:
6+
Ajay Gupta <ajayg@nvidia.com>
7+
8+
Description
9+
-----------
10+
11+
i2c-nvidia-gpu is a driver for I2C controller included in NVIDIA Turing
12+
and later GPUs and it is used to communicate with Type-C controller on GPUs.
13+
14+
If your 'lspci -v' listing shows something like the following,
15+
16+
01:00.3 Serial bus controller [0c80]: NVIDIA Corporation Device 1ad9 (rev a1)
17+
18+
then this driver should support the I2C controller of your GPU.

‎MAINTAINERS

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6861,6 +6861,13 @@ L: linux-acpi@vger.kernel.org
68616861
S: Maintained
68626862
F: drivers/i2c/i2c-core-acpi.c
68636863

6864+
I2C CONTROLLER DRIVER FOR NVIDIA GPU
6865+
M: Ajay Gupta <ajayg@nvidia.com>
6866+
L: linux-i2c@vger.kernel.org
6867+
S: Maintained
6868+
F: Documentation/i2c/busses/i2c-nvidia-gpu
6869+
F: drivers/i2c/busses/i2c-nvidia-gpu.c
6870+
68646871
I2C MUXES
68656872
M: Peter Rosin <peda@axentia.se>
68666873
L: linux-i2c@vger.kernel.org
@@ -10784,6 +10791,14 @@ L: linux-omap@vger.kernel.org
1078410791
S: Maintained
1078510792
F: arch/arm/mach-omap2/omap_hwmod.*
1078610793

10794+
OMAP I2C DRIVER
10795+
M: Vignesh R <vigneshr@ti.com>
10796+
L: linux-omap@vger.kernel.org
10797+
L: linux-i2c@vger.kernel.org
10798+
S: Maintained
10799+
F: Documentation/devicetree/bindings/i2c/i2c-omap.txt
10800+
F: drivers/i2c/busses/i2c-omap.c
10801+
1078710802
OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
1078810803
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
1078910804
L: linux-media@vger.kernel.org

‎drivers/i2c/busses/Kconfig

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,15 @@ config I2C_NFORCE2_S4985
224224
This driver can also be built as a module. If so, the module
225225
will be called i2c-nforce2-s4985.
226226

227+
config I2C_NVIDIA_GPU
228+
tristate "NVIDIA GPU I2C controller"
229+
depends on PCI
230+
help
231+
If you say yes to this option, support will be included for the
232+
NVIDIA GPU I2C controller which is used to communicate with the GPU's
233+
Type-C controller. This driver can also be built as a module called
234+
i2c-nvidia-gpu.
235+
227236
config I2C_SIS5595
228237
tristate "SiS 5595"
229238
depends on PCI
@@ -752,7 +761,7 @@ config I2C_OCORES
752761

753762
config I2C_OMAP
754763
tristate "OMAP I2C adapter"
755-
depends on ARCH_OMAP
764+
depends on ARCH_OMAP || ARCH_K3
756765
default y if MACH_OMAP_H3 || MACH_OMAP_OSK
757766
help
758767
If you say yes to this option, support will be included for the

‎drivers/i2c/busses/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ obj-$(CONFIG_I2C_ISCH) += i2c-isch.o
1919
obj-$(CONFIG_I2C_ISMT) += i2c-ismt.o
2020
obj-$(CONFIG_I2C_NFORCE2) += i2c-nforce2.o
2121
obj-$(CONFIG_I2C_NFORCE2_S4985) += i2c-nforce2-s4985.o
22+
obj-$(CONFIG_I2C_NVIDIA_GPU) += i2c-nvidia-gpu.o
2223
obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o
2324
obj-$(CONFIG_I2C_SIS5595) += i2c-sis5595.o
2425
obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o

0 commit comments

Comments
 (0)