Skip to content

Commit 351c8a0

Browse files
torvaldstorvalds
committed
Merge branch 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang: - new driver for ICY, an Amiga Zorro card :) - axxia driver gained slave mode support, NXP driver gained ACPI - the slave EEPROM backend gained 16 bit address support - and lots of regular driver updates and reworks * 'i2c/for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (52 commits) i2c: tegra: Move suspend handling to NOIRQ phase i2c: imx: ACPI support for NXP i2c controller i2c: uniphier(-f): remove all dev_dbg() i2c: uniphier(-f): use devm_platform_ioremap_resource() i2c: slave-eeprom: Add comment about address handling i2c: exynos5: Remove IRQF_ONESHOT i2c: stm32f7: Make structure stm32f7_i2c_algo constant i2c: cht-wc: drop check because i2c_unregister_device() is NULL safe i2c-eeprom_slave: Add support for more eeprom models i2c: fsi: Add of_put_node() before break i2c: synquacer: Make synquacer_i2c_ops constant i2c: hix5hd2: Remove IRQF_ONESHOT i2c: i801: Use iTCO version 6 in Cannon Lake PCH and beyond watchdog: iTCO: Add support for Cannon Lake PCH iTCO i2c: iproc: Make bcm_iproc_i2c_quirks constant i2c: iproc: Add full name of devicetree node to adapter name i2c: piix4: Add ACPI support i2c: piix4: Fix probing of reserved ports on AMD Family 16h Model 30h i2c: ocores: use request_any_context_irq() to register IRQ handler i2c: designware: Fix optional reset error handling ...
2 parents 3cf7487 + 8ebf15e commit 351c8a0

Some content is hidden

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

42 files changed

+795
-267
lines changed

‎Documentation/devicetree/bindings/i2c/brcm,bcm2835-i2c.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Broadcom BCM2835 I2C controller
22

33
Required properties:
4-
- compatible : Should be "brcm,bcm2835-i2c".
4+
- compatible : Should be one of:
5+
"brcm,bcm2711-i2c"
6+
"brcm,bcm2835-i2c"
57
- reg: Should contain register location and length.
68
- interrupts: Should contain interrupt.
79
- clocks : The clock feeding the I2C controller.

‎Documentation/devicetree/bindings/i2c/i2c-rcar.txt‎ renamed to ‎Documentation/devicetree/bindings/i2c/renesas,i2c.txt‎

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-emev2.txt‎ renamed to ‎Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt‎

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt‎ renamed to ‎Documentation/devicetree/bindings/i2c/renesas,iic.txt‎

File renamed without changes.

‎Documentation/devicetree/bindings/i2c/i2c-riic.txt‎ renamed to ‎Documentation/devicetree/bindings/i2c/renesas,riic.txt‎

File renamed without changes.

‎MAINTAINERS‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7865,6 +7865,12 @@ S: Maintained
78657865
F: drivers/mfd/lpc_ich.c
78667866
F: drivers/gpio/gpio-ich.c
78677867

7868+
ICY I2C DRIVER
7869+
M: Max Staudt <[email protected]>
7870+
L: [email protected]
7871+
S: Maintained
7872+
F: drivers/i2c/busses/i2c-icy.c
7873+
78687874
IDE SUBSYSTEM
78697875
M: "David S. Miller" <[email protected]>
78707876
L: [email protected]
@@ -13791,7 +13797,7 @@ F: drivers/clk/renesas/
1379113797
RENESAS EMEV2 I2C DRIVER
1379213798
M: Wolfram Sang <[email protected]>
1379313799
S: Supported
13794-
F: Documentation/devicetree/bindings/i2c/i2c-emev2.txt
13800+
F: Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
1379513801
F: drivers/i2c/busses/i2c-emev2.c
1379613802

1379713803
RENESAS ETHERNET DRIVERS
@@ -13813,15 +13819,15 @@ F: drivers/iio/adc/rcar-gyroadc.c
1381313819
RENESAS R-CAR I2C DRIVERS
1381413820
M: Wolfram Sang <[email protected]>
1381513821
S: Supported
13816-
F: Documentation/devicetree/bindings/i2c/i2c-rcar.txt
13817-
F: Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
13822+
F: Documentation/devicetree/bindings/i2c/renesas,i2c.txt
13823+
F: Documentation/devicetree/bindings/i2c/renesas,iic.txt
1381813824
F: drivers/i2c/busses/i2c-rcar.c
1381913825
F: drivers/i2c/busses/i2c-sh_mobile.c
1382013826

1382113827
RENESAS RIIC DRIVER
1382213828
M: Chris Brandt <[email protected]>
1382313829
S: Supported
13824-
F: Documentation/devicetree/bindings/i2c/i2c-riic.txt
13830+
F: Documentation/devicetree/bindings/i2c/renesas,riic.txt
1382513831
F: drivers/i2c/busses/i2c-riic.c
1382613832

1382713833
RENESAS USB PHY DRIVER

‎drivers/acpi/acpi_apd.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,17 @@ static const struct apd_device_desc hip08_i2c_desc = {
160160
.setup = acpi_apd_setup,
161161
.fixed_clk_rate = 250000000,
162162
};
163+
163164
static const struct apd_device_desc thunderx2_i2c_desc = {
164165
.setup = acpi_apd_setup,
165166
.fixed_clk_rate = 125000000,
166167
};
167168

169+
static const struct apd_device_desc nxp_i2c_desc = {
170+
.setup = acpi_apd_setup,
171+
.fixed_clk_rate = 350000000,
172+
};
173+
168174
static const struct apd_device_desc hip08_spi_desc = {
169175
.setup = acpi_apd_setup,
170176
.fixed_clk_rate = 250000000,
@@ -238,6 +244,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
238244
{ "HISI02A1", APD_ADDR(hip07_i2c_desc) },
239245
{ "HISI02A2", APD_ADDR(hip08_i2c_desc) },
240246
{ "HISI0173", APD_ADDR(hip08_spi_desc) },
247+
{ "NXP0001", APD_ADDR(nxp_i2c_desc) },
241248
#endif
242249
{ }
243250
};

‎drivers/gpu/drm/bridge/adv7511/adv7511_drv.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -978,10 +978,10 @@ static int adv7511_init_cec_regmap(struct adv7511 *adv)
978978
{
979979
int ret;
980980

981-
adv->i2c_cec = i2c_new_secondary_device(adv->i2c_main, "cec",
981+
adv->i2c_cec = i2c_new_ancillary_device(adv->i2c_main, "cec",
982982
ADV7511_CEC_I2C_ADDR_DEFAULT);
983-
if (!adv->i2c_cec)
984-
return -EINVAL;
983+
if (IS_ERR(adv->i2c_cec))
984+
return PTR_ERR(adv->i2c_cec);
985985
i2c_set_clientdata(adv->i2c_cec, adv);
986986

987987
adv->regmap_cec = devm_regmap_init_i2c(adv->i2c_cec,
@@ -1162,20 +1162,20 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
11621162

11631163
adv7511_packet_disable(adv7511, 0xffff);
11641164

1165-
adv7511->i2c_edid = i2c_new_secondary_device(i2c, "edid",
1165+
adv7511->i2c_edid = i2c_new_ancillary_device(i2c, "edid",
11661166
ADV7511_EDID_I2C_ADDR_DEFAULT);
1167-
if (!adv7511->i2c_edid) {
1168-
ret = -EINVAL;
1167+
if (IS_ERR(adv7511->i2c_edid)) {
1168+
ret = PTR_ERR(adv7511->i2c_edid);
11691169
goto uninit_regulators;
11701170
}
11711171

11721172
regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR,
11731173
adv7511->i2c_edid->addr << 1);
11741174

1175-
adv7511->i2c_packet = i2c_new_secondary_device(i2c, "packet",
1175+
adv7511->i2c_packet = i2c_new_ancillary_device(i2c, "packet",
11761176
ADV7511_PACKET_I2C_ADDR_DEFAULT);
1177-
if (!adv7511->i2c_packet) {
1178-
ret = -EINVAL;
1177+
if (IS_ERR(adv7511->i2c_packet)) {
1178+
ret = PTR_ERR(adv7511->i2c_packet);
11791179
goto err_i2c_unregister_edid;
11801180
}
11811181

‎drivers/i2c/busses/Kconfig‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ config I2C_AXXIA
429429
tristate "Axxia I2C controller"
430430
depends on ARCH_AXXIA || COMPILE_TEST
431431
default ARCH_AXXIA
432+
select I2C_SLAVE
432433
help
433434
Say yes if you want to support the I2C bus on Axxia platforms.
434435

@@ -977,7 +978,7 @@ config I2C_SIRF
977978
will be called i2c-sirf.
978979

979980
config I2C_SPRD
980-
bool "Spreadtrum I2C interface"
981+
tristate "Spreadtrum I2C interface"
981982
depends on I2C=y && ARCH_SPRD
982983
help
983984
If you say yes to this option, support will be included for the
@@ -1309,6 +1310,20 @@ config I2C_ELEKTOR
13091310
This support is also available as a module. If so, the module
13101311
will be called i2c-elektor.
13111312

1313+
config I2C_ICY
1314+
tristate "ICY Zorro card"
1315+
depends on ZORRO
1316+
select I2C_ALGOPCF
1317+
help
1318+
This supports the PCF8584 Zorro bus I2C adapter, known as ICY.
1319+
Say Y if you own such an adapter.
1320+
1321+
This support is also available as a module. If so, the module
1322+
will be called i2c-icy.
1323+
1324+
If you have a 2019 edition board with an LTC2990 sensor at address
1325+
0x4c, loading the module 'ltc2990' is sufficient to enable it.
1326+
13121327
config I2C_MLXCPLD
13131328
tristate "Mellanox I2C driver"
13141329
depends on X86_64

‎drivers/i2c/busses/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ obj-$(CONFIG_I2C_BCM_KONA) += i2c-bcm-kona.o
140140
obj-$(CONFIG_I2C_BRCMSTB) += i2c-brcmstb.o
141141
obj-$(CONFIG_I2C_CROS_EC_TUNNEL) += i2c-cros-ec-tunnel.o
142142
obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o
143+
obj-$(CONFIG_I2C_ICY) += i2c-icy.o
143144
obj-$(CONFIG_I2C_MLXCPLD) += i2c-mlxcpld.o
144145
obj-$(CONFIG_I2C_OPAL) += i2c-opal.o
145146
obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o

0 commit comments

Comments
 (0)