Skip to content

Commit e155a36

Browse files
committed
Merge branches 'clk-platform', 'clk-i2c', 'clk-mediatek', 'clk-i2cid' and 'clk-vc5' into clk-next
- Migrate platform clk drivers to .remove_new() - Migrate i2c clk drivers to .probe() instead of .probe_new() - Remove CLK_SET_PARENT from all Mediatek MSDC core clocks - Add infra_ao reset support for Mediatek MT8188 SoCs - Align driver_data to i2c_device_id tables in some i2c clk drivers - Use device_get_match_data() in vc5 clk driver * clk-platform: clk: mediatek: Convert all remaining drivers to platform_driver's .remove_new() clk: mediatek: Make mtk_clk_pdev_remove() return void clk: mediatek: Make mtk_clk_simple_remove() return void * clk-i2c: clk: si521xx: Switch i2c driver back to use .probe() clk: Switch i2c drivers back to use .probe() * clk-mediatek: clk: mediatek: clk-mt8173-apmixedsys: Fix iomap not released issue clk: mediatek: clk-mt8173-apmixedsys: Fix return value for of_iomap() error clk: mediatek: clk-mtk: Grab iomem pointer for divider clocks clk: mediatek: fix of_iomap memory leak clk: mediatek: reset: add infra_ao reset support for MT8188 dt-bindings: reset: mt8188: add thermal reset control bit clk: mediatek: Remove CLK_SET_PARENT from all MSDC core clocks clk: mediatek: mux: Stop forcing CLK_SET_RATE_PARENT flag clk: mediatek: Enable all MT8192 clocks by default * clk-i2cid: clk: rs9: Fix .driver_data content in i2c_device_id clk: vc7: Fix .driver_data content in i2c_device_id clk: vc5: Fix .driver_data content in i2c_device_id * clk-vc5: clk: vc7: Use device_get_match_data() instead of of_device_get_match_data() clk: vc5: Use device_get_match_data() instead of of_device_get_match_data()
5 parents a65615d + 16d4f53 + b270ae6 + ad527ca + 893911e commit e155a36

30 files changed

+237
-165
lines changed

drivers/clk/clk-cdce706.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ static struct i2c_driver cdce706_i2c_driver = {
684684
.name = "cdce706",
685685
.of_match_table = of_match_ptr(cdce706_dt_match),
686686
},
687-
.probe_new = cdce706_probe,
687+
.probe = cdce706_probe,
688688
.id_table = cdce706_id,
689689
};
690690
module_i2c_driver(cdce706_i2c_driver);

drivers/clk/clk-cdce925.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ static struct i2c_driver cdce925_driver = {
824824
.name = "cdce925",
825825
.of_match_table = of_match_ptr(clk_cdce925_of_match),
826826
},
827-
.probe_new = cdce925_probe,
827+
.probe = cdce925_probe,
828828
.id_table = cdce925_id,
829829
};
830830
module_i2c_driver(cdce925_driver);

drivers/clk/clk-cs2000-cp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ static struct i2c_driver cs2000_driver = {
622622
.pm = &cs2000_pm_ops,
623623
.of_match_table = cs2000_of_match,
624624
},
625-
.probe_new = cs2000_probe,
625+
.probe = cs2000_probe,
626626
.remove = cs2000_remove,
627627
.id_table = cs2000_id,
628628
};

drivers/clk/clk-max9485.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static struct i2c_driver max9485_driver = {
376376
.pm = &max9485_pm_ops,
377377
.of_match_table = max9485_dt_ids,
378378
},
379-
.probe_new = max9485_i2c_probe,
379+
.probe = max9485_i2c_probe,
380380
.id_table = max9485_i2c_ids,
381381
};
382382
module_i2c_driver(max9485_driver);

drivers/clk/clk-renesas-pcie.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ static const struct rs9_chip_info renesas_9fgv0441_info = {
392392
};
393393

394394
static const struct i2c_device_id rs9_id[] = {
395-
{ "9fgv0241", .driver_data = RENESAS_9FGV0241 },
396-
{ "9fgv0441", .driver_data = RENESAS_9FGV0441 },
395+
{ "9fgv0241", .driver_data = (kernel_ulong_t)&renesas_9fgv0241_info },
396+
{ "9fgv0441", .driver_data = (kernel_ulong_t)&renesas_9fgv0441_info },
397397
{ }
398398
};
399399
MODULE_DEVICE_TABLE(i2c, rs9_id);
@@ -413,7 +413,7 @@ static struct i2c_driver rs9_driver = {
413413
.pm = &rs9_pm_ops,
414414
.of_match_table = clk_rs9_of_match,
415415
},
416-
.probe_new = rs9_probe,
416+
.probe = rs9_probe,
417417
.id_table = rs9_id,
418418
};
419419
module_i2c_driver(rs9_driver);

drivers/clk/clk-si514.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ static struct i2c_driver si514_driver = {
387387
.name = "si514",
388388
.of_match_table = clk_si514_of_match,
389389
},
390-
.probe_new = si514_probe,
390+
.probe = si514_probe,
391391
.id_table = si514_id,
392392
};
393393
module_i2c_driver(si514_driver);

drivers/clk/clk-si521xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static struct i2c_driver si521xx_driver = {
385385
.pm = &si521xx_pm_ops,
386386
.of_match_table = clk_si521xx_of_match,
387387
},
388-
.probe_new = si521xx_probe,
388+
.probe = si521xx_probe,
389389
.id_table = si521xx_id,
390390
};
391391
module_i2c_driver(si521xx_driver);

drivers/clk/clk-si5341.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ static struct i2c_driver si5341_driver = {
18341834
.name = "si5341",
18351835
.of_match_table = clk_si5341_of_match,
18361836
},
1837-
.probe_new = si5341_probe,
1837+
.probe = si5341_probe,
18381838
.remove = si5341_remove,
18391839
.id_table = si5341_id,
18401840
};

drivers/clk/clk-si5351.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1656,7 +1656,7 @@ static struct i2c_driver si5351_driver = {
16561656
.name = "si5351",
16571657
.of_match_table = of_match_ptr(si5351_dt_ids),
16581658
},
1659-
.probe_new = si5351_i2c_probe,
1659+
.probe = si5351_i2c_probe,
16601660
.id_table = si5351_i2c_ids,
16611661
};
16621662
module_i2c_driver(si5351_driver);

drivers/clk/clk-si544.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ static struct i2c_driver si544_driver = {
520520
.name = "si544",
521521
.of_match_table = clk_si544_of_match,
522522
},
523-
.probe_new = si544_probe,
523+
.probe = si544_probe,
524524
.id_table = si544_id,
525525
};
526526
module_i2c_driver(si544_driver);

0 commit comments

Comments
 (0)