Skip to content

Commit e764a1e

Browse files
committed
Merge branch 'i2c/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang: - bus recovery can now be given a pinctrl handle and the I2C core will do all the steps to switch to/from GPIO which can save quite some boilerplate code from drivers - "fallthrough" conversion - driver updates, mostly ID additions * 'i2c/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (32 commits) i2c: iproc: fix race between client unreg and isr i2c: eg20t: use generic power management i2c: eg20t: Drop PCI wakeup calls from .suspend/.resume i2c: mediatek: Fix i2c_spec_values description i2c: mediatek: Add i2c compatible for MediaTek MT8192 dt-bindings: i2c: update bindings for MT8192 SoC i2c: mediatek: Add access to more than 8GB dram in i2c driver i2c: mediatek: Add apdma sync in i2c driver i2c: i801: Add support for Intel Tiger Lake PCH-H i2c: i801: Add support for Intel Emmitsburg PCH i2c: bcm2835: Replace HTTP links with HTTPS ones Documentation: i2c: dev: 'block process call' is supported i2c: at91: Move to generic GPIO bus recovery i2c: core: treat EPROBE_DEFER when acquiring SCL/SDA GPIOs i2c: core: add generic I2C GPIO recovery dt-bindings: i2c: add generic properties for GPIO bus recovery i2c: rcar: avoid race when unregistering slave i2c: tegra: Avoid tegra_i2c_init_dma() for Tegra210 vi i2c i2c: tegra: Fix runtime resume to re-init VI I2C i2c: tegra: Fix the error path in tegra_i2c_runtime_resume ...
2 parents dddcbc1 + b1eef23 commit e764a1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+409
-250
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Required properties:
1414
"mediatek,mt7629-i2c", "mediatek,mt2712-i2c": for MediaTek MT7629
1515
"mediatek,mt8173-i2c": for MediaTek MT8173
1616
"mediatek,mt8183-i2c": for MediaTek MT8183
17+
"mediatek,mt8192-i2c": for MediaTek MT8192
1718
"mediatek,mt8516-i2c", "mediatek,mt2712-i2c": for MediaTek MT8516
1819
- reg: physical base address of the controller and dma base, length of memory
1920
mapped region.

Documentation/devicetree/bindings/i2c/i2c.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ wants to support one of the below features, it should adapt these bindings.
7272
this information to adapt power management to keep the arbitration awake
7373
all the time, for example. Can not be combined with 'single-master'.
7474

75+
- pinctrl
76+
add extra pinctrl to configure SCL/SDA pins to GPIO function for bus
77+
recovery, call it "gpio" or "recovery" (deprecated) state
78+
79+
- scl-gpios
80+
specify the gpio related to SCL pin. Used for GPIO bus recovery.
81+
82+
- sda-gpios
83+
specify the gpio related to SDA pin. Optional for GPIO bus recovery.
84+
7585
- single-master
7686
states that there is no other master active on this bus. The OS can use
7787
this information to detect a stalled bus more reliably, for example.

Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ properties:
2626
- items:
2727
- const: allwinner,sun50i-a64-i2c
2828
- const: allwinner,sun6i-a31-i2c
29+
- items:
30+
- const: allwinner,sun50i-a100-i2c
31+
- const: allwinner,sun6i-a31-i2c
2932
- items:
3033
- const: allwinner,sun50i-h6-i2c
3134
- const: allwinner,sun6i-a31-i2c

Documentation/devicetree/bindings/i2c/renesas,i2c.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Required properties:
1010
"renesas,i2c-r8a774a1" if the device is a part of a R8A774A1 SoC.
1111
"renesas,i2c-r8a774b1" if the device is a part of a R8A774B1 SoC.
1212
"renesas,i2c-r8a774c0" if the device is a part of a R8A774C0 SoC.
13+
"renesas,i2c-r8a774e1" if the device is a part of a R8A774E1 SoC.
1314
"renesas,i2c-r8a7778" if the device is a part of a R8A7778 SoC.
1415
"renesas,i2c-r8a7779" if the device is a part of a R8A7779 SoC.
1516
"renesas,i2c-r8a7790" if the device is a part of a R8A7790 SoC.

Documentation/devicetree/bindings/i2c/renesas,iic.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Required properties:
1111
- "renesas,iic-r8a774a1" (RZ/G2M)
1212
- "renesas,iic-r8a774b1" (RZ/G2N)
1313
- "renesas,iic-r8a774c0" (RZ/G2E)
14+
- "renesas,iic-r8a774e1" (RZ/G2H)
1415
- "renesas,iic-r8a7790" (R-Car H2)
1516
- "renesas,iic-r8a7791" (R-Car M2-W)
1617
- "renesas,iic-r8a7792" (R-Car V2H)

Documentation/i2c/busses/i2c-i801.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Supported adapters:
4343
* Intel Elkhart Lake (PCH)
4444
* Intel Tiger Lake (PCH)
4545
* Intel Jasper Lake (SOC)
46+
* Intel Emmitsburg (PCH)
4647

4748
Datasheets: Publicly available at the Intel website
4849

Documentation/i2c/dev-interface.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ for details) through the following functions::
159159
__s32 i2c_smbus_read_word_data(int file, __u8 command);
160160
__s32 i2c_smbus_write_word_data(int file, __u8 command, __u16 value);
161161
__s32 i2c_smbus_process_call(int file, __u8 command, __u16 value);
162+
__s32 i2c_smbus_block_process_call(int file, __u8 command, __u8 length,
163+
__u8 *values);
162164
__s32 i2c_smbus_read_block_data(int file, __u8 command, __u8 *values);
163165
__s32 i2c_smbus_write_block_data(int file, __u8 command, __u8 length,
164166
__u8 *values);

drivers/i2c/algos/i2c-algo-pca.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,8 @@ int i2c_pca_add_numbered_bus(struct i2c_adapter *adap)
542542
}
543543
EXPORT_SYMBOL(i2c_pca_add_numbered_bus);
544544

545-
MODULE_AUTHOR("Ian Campbell <[email protected]>, "
546-
"Wolfram Sang <[email protected]>");
545+
MODULE_AUTHOR("Ian Campbell <[email protected]>");
546+
MODULE_AUTHOR("Wolfram Sang <[email protected]>");
547547
MODULE_DESCRIPTION("I2C-Bus PCA9564/PCA9665 algorithm");
548548
MODULE_LICENSE("GPL");
549549

drivers/i2c/busses/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ config I2C_I801
146146
Elkhart Lake (PCH)
147147
Tiger Lake (PCH)
148148
Jasper Lake (SOC)
149+
Emmitsburg (PCH)
149150

150151
This driver can also be built as a module. If so, the module
151152
will be called i2c-i801.

drivers/i2c/busses/i2c-ali1535.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,9 @@ static struct pci_driver ali1535_driver = {
519519

520520
module_pci_driver(ali1535_driver);
521521

522-
MODULE_AUTHOR("Frodo Looijaard <[email protected]>, "
523-
"Philip Edelbrock <[email protected]>, "
524-
"Mark D. Studebaker <[email protected]> "
525-
"and Dan Eaton <[email protected]>");
522+
MODULE_AUTHOR("Frodo Looijaard <[email protected]>");
523+
MODULE_AUTHOR("Philip Edelbrock <[email protected]>");
524+
MODULE_AUTHOR("Mark D. Studebaker <[email protected]>");
525+
MODULE_AUTHOR("Dan Eaton <[email protected]>");
526526
MODULE_DESCRIPTION("ALI1535 SMBus driver");
527527
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)