Commit 5def00ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents ed77ac92 6fb605c4

Documentation/i2c/busses/i2c-i801.rst

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ Supported adapters: 
  * Intel Emmitsburg (PCH)

  * Intel Alder Lake (PCH)

  * Intel Raptor Lake (PCH)

  * Intel Meteor Lake (SOC)

  * Intel Meteor Lake (SOC and PCH)



   Datasheets: Publicly available at the Intel website

drivers/i2c/busses/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ config I2C_I801 
	    Emmitsburg (PCH)

	    Alder Lake (PCH)

	    Raptor Lake (PCH)

	    Meteor Lake (SOC)

	    Meteor Lake (SOC and PCH)



	  This driver can also be built as a module.  If so, the module

	  will be called i2c-i801.

drivers/i2c/busses/i2c-altera.c

+2 −4
Original line number Diff line number Diff line
@@ -465,14 +465,12 @@ static int altr_i2c_probe(struct platform_device *pdev) 
	return 0;

}



static int altr_i2c_remove(struct platform_device *pdev)

static void altr_i2c_remove(struct platform_device *pdev)

{

	struct altr_i2c_dev *idev = platform_get_drvdata(pdev);



	clk_disable_unprepare(idev->i2c_clk);

	i2c_del_adapter(&idev->adapter);



	return 0;

}



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


static struct platform_driver altr_i2c_driver = {

	.probe = altr_i2c_probe,

	.remove = altr_i2c_remove,

	.remove_new = altr_i2c_remove,

	.driver = {

		.name = "altera-i2c",

		.of_match_table = altr_i2c_of_match,

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

+2 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int i2c_amd_probe(struct platform_device *pdev) 
	return ret;

}



static int i2c_amd_remove(struct platform_device *pdev)

static void i2c_amd_remove(struct platform_device *pdev)

{

	struct amd_i2c_dev *i2c_dev = platform_get_drvdata(pdev);

	struct amd_i2c_common *i2c_common = &i2c_dev->common;
@@ -336,7 +336,6 @@ static int i2c_amd_remove(struct platform_device *pdev) 
	i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);



	i2c_del_adapter(&i2c_dev->adap);

	return 0;

}



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


static struct platform_driver i2c_amd_plat_driver = {

	.probe = i2c_amd_probe,

	.remove = i2c_amd_remove,

	.remove_new = i2c_amd_remove,

	.driver = {

		.name = "i2c_amd_mp2",

		.acpi_match_table = ACPI_PTR(i2c_amd_acpi_match),

drivers/i2c/busses/i2c-aspeed.c

+2 −4
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev) 
	return 0;

}



static int aspeed_i2c_remove_bus(struct platform_device *pdev)

static void aspeed_i2c_remove_bus(struct platform_device *pdev)

{

	struct aspeed_i2c_bus *bus = platform_get_drvdata(pdev);

	unsigned long flags;
@@ -1077,13 +1077,11 @@ static int aspeed_i2c_remove_bus(struct platform_device *pdev) 
	reset_control_assert(bus->rst);



	i2c_del_adapter(&bus->adap);



	return 0;

}



static struct platform_driver aspeed_i2c_bus_driver = {

	.probe		= aspeed_i2c_probe_bus,

	.remove		= aspeed_i2c_remove_bus,

	.remove_new	= aspeed_i2c_remove_bus,

	.driver		= {

		.name		= "aspeed-i2c-bus",

		.of_match_table	= aspeed_i2c_bus_of_table,