Commit e155a366 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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()
parents a65615df 16d4f537 b270ae61 ad527ca8 893911e6

drivers/clk/clk-cdce706.c

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static struct i2c_driver cdce706_i2c_driver = { 
		.name	= "cdce706",

		.of_match_table = of_match_ptr(cdce706_dt_match),

	},

	.probe_new	= cdce706_probe,

	.probe		= cdce706_probe,

	.id_table	= cdce706_id,

};

module_i2c_driver(cdce706_i2c_driver);

drivers/clk/clk-cdce925.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ static struct i2c_driver cdce925_driver = { 
		.name = "cdce925",

		.of_match_table = of_match_ptr(clk_cdce925_of_match),

	},

	.probe_new	= cdce925_probe,

	.probe		= cdce925_probe,

	.id_table	= cdce925_id,

};

module_i2c_driver(cdce925_driver);

drivers/clk/clk-cs2000-cp.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static struct i2c_driver cs2000_driver = { 
		.pm	= &cs2000_pm_ops,

		.of_match_table = cs2000_of_match,

	},

	.probe_new	= cs2000_probe,

	.probe		= cs2000_probe,

	.remove		= cs2000_remove,

	.id_table	= cs2000_id,

};

drivers/clk/clk-max9485.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static struct i2c_driver max9485_driver = { 
		.pm		= &max9485_pm_ops,

		.of_match_table	= max9485_dt_ids,

	},

	.probe_new = max9485_i2c_probe,

	.probe = max9485_i2c_probe,

	.id_table = max9485_i2c_ids,

};

module_i2c_driver(max9485_driver);

drivers/clk/clk-renesas-pcie.c

+3 −3
Original line number Diff line number Diff line
@@ -392,8 +392,8 @@ static const struct rs9_chip_info renesas_9fgv0441_info = { 
};



static const struct i2c_device_id rs9_id[] = {

	{ "9fgv0241", .driver_data = RENESAS_9FGV0241 },

	{ "9fgv0441", .driver_data = RENESAS_9FGV0441 },

	{ "9fgv0241", .driver_data = (kernel_ulong_t)&renesas_9fgv0241_info },

	{ "9fgv0441", .driver_data = (kernel_ulong_t)&renesas_9fgv0441_info },

	{ }

};

MODULE_DEVICE_TABLE(i2c, rs9_id);
@@ -413,7 +413,7 @@ static struct i2c_driver rs9_driver = { 
		.pm	= &rs9_pm_ops,

		.of_match_table = clk_rs9_of_match,

	},

	.probe_new	= rs9_probe,

	.probe		= rs9_probe,

	.id_table	= rs9_id,

};

module_i2c_driver(rs9_driver);