Skip to content

Commit 5def00c

Browse files
torvaldstorvalds
committed
Merge tag 'i2c-for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang: - I2C has now a co-maintainer taking care of the host drivers. Welcome Andi Shyti and have fun! - platform remove callback converted to return void in drivers - simplify drivers by using devm_clk_get_enabled() - introduce i2c_get_match_data() to avoid more boilerplate code (especially since the core stopped delivering an i2c_device_id) - and the usual bunch of driver updates * tag 'i2c-for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (38 commits) i2c: uniphier: Use devm_clk_get_enabled() i2c: uniphier-f: Use devm_clk_get_enabled() i2c: owl: Use devm_clk_get_enabled() i2c: lpc2k: Use devm_clk_get_enabled() i2c: hix5hd2: Use devm_clk_get_enabled() i2c: sun6i-p2wi: Use devm_clk_get_enabled() i2c: pasemi-platform: Use devm_clk_get_enabled() i2c: mt7621: Use devm_clk_get_enabled() i2c: xiic: Use devm_clk_get_enabled() i2c: davinci: Use platform table macro over module_alias i2c: ocores: use devm_ managed clks i2c: nomadik: Use dev_err_probe() whenever possible i2c: nomadik: Use devm_clk_get_enabled() i2c: nomadik: Remove unnecessary goto label usb: typec: ucsi: Mark dGPUs as DEVICE scope i2c: wmt: Use devm_platform_get_and_ioremap_resource() i2c: versatile: Use devm_platform_get_and_ioremap_resource() i2c: hix5hd2: Add I2C_M_STOP flag support for i2c-hix5hd2 driver. i2c: mpc: Use of_property_read_reg() to parse "reg" i2c: imx-lpi2c: Don't open-code DIV_ROUND_UP ...
2 parents ed77ac9 + 6fb605c commit 5def00c

File tree

103 files changed

+585
-727
lines changed

Some content is hidden

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

103 files changed

+585
-727
lines changed

‎Documentation/i2c/busses/i2c-i801.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Supported adapters:
4646
* Intel Emmitsburg (PCH)
4747
* Intel Alder Lake (PCH)
4848
* Intel Raptor Lake (PCH)
49-
* Intel Meteor Lake (SOC)
49+
* Intel Meteor Lake (SOC and PCH)
5050

5151
Datasheets: Publicly available at the Intel website
5252

‎drivers/i2c/busses/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ config I2C_I801
157157
Emmitsburg (PCH)
158158
Alder Lake (PCH)
159159
Raptor Lake (PCH)
160-
Meteor Lake (SOC)
160+
Meteor Lake (SOC and PCH)
161161

162162
This driver can also be built as a module. If so, the module
163163
will be called i2c-i801.
@@ -1025,7 +1025,7 @@ config I2C_RZV2M
10251025
depends on ARCH_RENESAS || COMPILE_TEST
10261026
help
10271027
If you say yes to this option, support will be included for the
1028-
Renesas RZ/V2M I2C interface.
1028+
Renesas RZ/V2M I2C interface.
10291029

10301030
This driver can also be built as a module. If so, the module
10311031
will be called i2c-rzv2m.

‎drivers/i2c/busses/i2c-altera.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,14 +465,12 @@ static int altr_i2c_probe(struct platform_device *pdev)
465465
return 0;
466466
}
467467

468-
static int altr_i2c_remove(struct platform_device *pdev)
468+
static void altr_i2c_remove(struct platform_device *pdev)
469469
{
470470
struct altr_i2c_dev *idev = platform_get_drvdata(pdev);
471471

472472
clk_disable_unprepare(idev->i2c_clk);
473473
i2c_del_adapter(&idev->adapter);
474-
475-
return 0;
476474
}
477475

478476
/* Match table for of_platform binding */
@@ -484,7 +482,7 @@ MODULE_DEVICE_TABLE(of, altr_i2c_of_match);
484482

485483
static struct platform_driver altr_i2c_driver = {
486484
.probe = altr_i2c_probe,
487-
.remove = altr_i2c_remove,
485+
.remove_new = altr_i2c_remove,
488486
.driver = {
489487
.name = "altera-i2c",
490488
.of_match_table = altr_i2c_of_match,

‎drivers/i2c/busses/i2c-amd-mp2-plat.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ static int i2c_amd_probe(struct platform_device *pdev)
322322
return ret;
323323
}
324324

325-
static int i2c_amd_remove(struct platform_device *pdev)
325+
static void i2c_amd_remove(struct platform_device *pdev)
326326
{
327327
struct amd_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
328328
struct amd_i2c_common *i2c_common = &i2c_dev->common;
@@ -336,7 +336,6 @@ static int i2c_amd_remove(struct platform_device *pdev)
336336
i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
337337

338338
i2c_del_adapter(&i2c_dev->adap);
339-
return 0;
340339
}
341340

342341
static const struct acpi_device_id i2c_amd_acpi_match[] = {
@@ -347,7 +346,7 @@ MODULE_DEVICE_TABLE(acpi, i2c_amd_acpi_match);
347346

348347
static struct platform_driver i2c_amd_plat_driver = {
349348
.probe = i2c_amd_probe,
350-
.remove = i2c_amd_remove,
349+
.remove_new = i2c_amd_remove,
351350
.driver = {
352351
.name = "i2c_amd_mp2",
353352
.acpi_match_table = ACPI_PTR(i2c_amd_acpi_match),

‎drivers/i2c/busses/i2c-aspeed.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev)
10611061
return 0;
10621062
}
10631063

1064-
static int aspeed_i2c_remove_bus(struct platform_device *pdev)
1064+
static void aspeed_i2c_remove_bus(struct platform_device *pdev)
10651065
{
10661066
struct aspeed_i2c_bus *bus = platform_get_drvdata(pdev);
10671067
unsigned long flags;
@@ -1077,13 +1077,11 @@ static int aspeed_i2c_remove_bus(struct platform_device *pdev)
10771077
reset_control_assert(bus->rst);
10781078

10791079
i2c_del_adapter(&bus->adap);
1080-
1081-
return 0;
10821080
}
10831081

10841082
static struct platform_driver aspeed_i2c_bus_driver = {
10851083
.probe = aspeed_i2c_probe_bus,
1086-
.remove = aspeed_i2c_remove_bus,
1084+
.remove_new = aspeed_i2c_remove_bus,
10871085
.driver = {
10881086
.name = "aspeed-i2c-bus",
10891087
.of_match_table = aspeed_i2c_bus_of_table,

‎drivers/i2c/busses/i2c-at91-core.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ static int at91_twi_probe(struct platform_device *pdev)
273273
return 0;
274274
}
275275

276-
static int at91_twi_remove(struct platform_device *pdev)
276+
static void at91_twi_remove(struct platform_device *pdev)
277277
{
278278
struct at91_twi_dev *dev = platform_get_drvdata(pdev);
279279

@@ -282,8 +282,6 @@ static int at91_twi_remove(struct platform_device *pdev)
282282

283283
pm_runtime_disable(dev->dev);
284284
pm_runtime_set_suspended(dev->dev);
285-
286-
return 0;
287285
}
288286

289287
static int __maybe_unused at91_twi_runtime_suspend(struct device *dev)
@@ -342,7 +340,7 @@ static const struct dev_pm_ops __maybe_unused at91_twi_pm = {
342340

343341
static struct platform_driver at91_twi_driver = {
344342
.probe = at91_twi_probe,
345-
.remove = at91_twi_remove,
343+
.remove_new = at91_twi_remove,
346344
.id_table = at91_twi_devtypes,
347345
.driver = {
348346
.name = "at91_i2c",

‎drivers/i2c/busses/i2c-au1550.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,12 @@ i2c_au1550_probe(struct platform_device *pdev)
334334
return 0;
335335
}
336336

337-
static int i2c_au1550_remove(struct platform_device *pdev)
337+
static void i2c_au1550_remove(struct platform_device *pdev)
338338
{
339339
struct i2c_au1550_data *priv = platform_get_drvdata(pdev);
340340

341341
i2c_del_adapter(&priv->adap);
342342
i2c_au1550_disable(priv);
343-
return 0;
344343
}
345344

346345
#ifdef CONFIG_PM
@@ -379,7 +378,7 @@ static struct platform_driver au1xpsc_smbus_driver = {
379378
.pm = AU1XPSC_SMBUS_PMOPS,
380379
},
381380
.probe = i2c_au1550_probe,
382-
.remove = i2c_au1550_remove,
381+
.remove_new = i2c_au1550_remove,
383382
};
384383

385384
module_platform_driver(au1xpsc_smbus_driver);

‎drivers/i2c/busses/i2c-axxia.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -804,14 +804,12 @@ static int axxia_i2c_probe(struct platform_device *pdev)
804804
return ret;
805805
}
806806

807-
static int axxia_i2c_remove(struct platform_device *pdev)
807+
static void axxia_i2c_remove(struct platform_device *pdev)
808808
{
809809
struct axxia_i2c_dev *idev = platform_get_drvdata(pdev);
810810

811811
clk_disable_unprepare(idev->i2c_clk);
812812
i2c_del_adapter(&idev->adapter);
813-
814-
return 0;
815813
}
816814

817815
/* Match table for of_platform binding */
@@ -824,7 +822,7 @@ MODULE_DEVICE_TABLE(of, axxia_i2c_of_match);
824822

825823
static struct platform_driver axxia_i2c_driver = {
826824
.probe = axxia_i2c_probe,
827-
.remove = axxia_i2c_remove,
825+
.remove_new = axxia_i2c_remove,
828826
.driver = {
829827
.name = "axxia-i2c",
830828
.of_match_table = axxia_i2c_of_match,

‎drivers/i2c/busses/i2c-bcm-iproc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
11071107
return i2c_add_adapter(adap);
11081108
}
11091109

1110-
static int bcm_iproc_i2c_remove(struct platform_device *pdev)
1110+
static void bcm_iproc_i2c_remove(struct platform_device *pdev)
11111111
{
11121112
struct bcm_iproc_i2c_dev *iproc_i2c = platform_get_drvdata(pdev);
11131113

@@ -1123,8 +1123,6 @@ static int bcm_iproc_i2c_remove(struct platform_device *pdev)
11231123

11241124
i2c_del_adapter(&iproc_i2c->adapter);
11251125
bcm_iproc_i2c_enable_disable(iproc_i2c, false);
1126-
1127-
return 0;
11281126
}
11291127

11301128
#ifdef CONFIG_PM_SLEEP
@@ -1260,7 +1258,7 @@ static struct platform_driver bcm_iproc_i2c_driver = {
12601258
.pm = BCM_IPROC_I2C_PM_OPS,
12611259
},
12621260
.probe = bcm_iproc_i2c_probe,
1263-
.remove = bcm_iproc_i2c_remove,
1261+
.remove_new = bcm_iproc_i2c_remove,
12641262
};
12651263
module_platform_driver(bcm_iproc_i2c_driver);
12661264

‎drivers/i2c/busses/i2c-bcm-kona.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -859,13 +859,11 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev)
859859
return rc;
860860
}
861861

862-
static int bcm_kona_i2c_remove(struct platform_device *pdev)
862+
static void bcm_kona_i2c_remove(struct platform_device *pdev)
863863
{
864864
struct bcm_kona_i2c_dev *dev = platform_get_drvdata(pdev);
865865

866866
i2c_del_adapter(&dev->adapter);
867-
868-
return 0;
869867
}
870868

871869
static const struct of_device_id bcm_kona_i2c_of_match[] = {
@@ -880,7 +878,7 @@ static struct platform_driver bcm_kona_i2c_driver = {
880878
.of_match_table = bcm_kona_i2c_of_match,
881879
},
882880
.probe = bcm_kona_i2c_probe,
883-
.remove = bcm_kona_i2c_remove,
881+
.remove_new = bcm_kona_i2c_remove,
884882
};
885883
module_platform_driver(bcm_kona_i2c_driver);
886884

0 commit comments

Comments
 (0)