Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cc3026e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "We had various reports of problems with deferred probing in the I2C
  subsystem, so this pull requst is a little bigger than usual.

  Most issues should be addressed now so devices will be found
  correctly.  A few ususal driver bugfixes are in here, too"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: i2c-mux-pinctrl: use deferred probe when adapter not found
  i2c: i2c-arb-gpio-challenge: use deferred probe when adapter not found
  i2c: i2c-mux-gpio: use deferred probing
  i2c: i2c-mux-gpio: don't ignore of_get_named_gpio errors
  i2c: omap: Clear ARDY bit twice
  i2c: Not all adapters have a parent
  i2c: i2c-stu300: replace platform_driver_probe to support deferred probing
  i2c: i2c-mxs: replace platform_driver_probe to support deferred probing
  i2c: i2c-imx: replace platform_driver_probe to support deferred probing
  i2c: i2c-designware-platdrv: replace platform_driver_probe to support deferred probing
parents c786e90b 2737de46

drivers/i2c/busses/i2c-designware-platdrv.c

+3 −2
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static SIMPLE_DEV_PM_OPS(dw_i2c_dev_pm_ops, dw_i2c_suspend, dw_i2c_resume); 
MODULE_ALIAS("platform:i2c_designware");



static struct platform_driver dw_i2c_driver = {

	.probe = dw_i2c_probe,

	.remove = dw_i2c_remove,

	.driver		= {

		.name	= "i2c_designware",
@@ -282,7 +283,7 @@ static struct platform_driver dw_i2c_driver = { 


static int __init dw_i2c_init_driver(void)

{

	return platform_driver_probe(&dw_i2c_driver, dw_i2c_probe);

	return platform_driver_register(&dw_i2c_driver);

}

subsys_initcall(dw_i2c_init_driver);

drivers/i2c/busses/i2c-imx.c

+6 −5
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx) 
	clk_disable_unprepare(i2c_imx->clk);

}



static void __init i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,

static void i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx,

							unsigned int rate)

{

	struct imx_i2c_clk_pair *i2c_clk_div = i2c_imx->hwdata->clk_div;
@@ -589,7 +589,7 @@ static struct i2c_algorithm i2c_imx_algo = { 
	.functionality	= i2c_imx_func,

};



static int __init i2c_imx_probe(struct platform_device *pdev)

static int i2c_imx_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id = of_match_device(i2c_imx_dt_ids,

							   &pdev->dev);
@@ -697,7 +697,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
	return 0;   /* Return OK */

}



static int __exit i2c_imx_remove(struct platform_device *pdev)

static int i2c_imx_remove(struct platform_device *pdev)

{

	struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev);
@@ -715,7 +715,8 @@ static int __exit i2c_imx_remove(struct platform_device *pdev) 
}



static struct platform_driver i2c_imx_driver = {

	.remove		= __exit_p(i2c_imx_remove),

	.probe = i2c_imx_probe,

	.remove = i2c_imx_remove,

	.driver	= {

		.name	= DRIVER_NAME,

		.owner	= THIS_MODULE,
@@ -726,7 +727,7 @@ static struct platform_driver i2c_imx_driver = { 


static int __init i2c_adap_imx_init(void)

{

	return platform_driver_probe(&i2c_imx_driver, i2c_imx_probe);

	return platform_driver_register(&i2c_imx_driver);

}

subsys_initcall(i2c_adap_imx_init);

drivers/i2c/busses/i2c-mxs.c

+2 −1
Original line number Diff line number Diff line
@@ -780,12 +780,13 @@ static struct platform_driver mxs_i2c_driver = { 
		   .owner = THIS_MODULE,

		   .of_match_table = mxs_i2c_dt_ids,

		   },

	.probe = mxs_i2c_probe,

	.remove = mxs_i2c_remove,

};



static int __init mxs_i2c_init(void)

{

	return platform_driver_probe(&mxs_i2c_driver, mxs_i2c_probe);

	return platform_driver_register(&mxs_i2c_driver);

}

subsys_initcall(mxs_i2c_init);

drivers/i2c/busses/i2c-omap.c

+3 −0
Original line number Diff line number Diff line
@@ -939,6 +939,9 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) 
		/*

		 * ProDB0017052: Clear ARDY bit twice

		 */

		if (stat & OMAP_I2C_STAT_ARDY)

			omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ARDY);



		if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |

					OMAP_I2C_STAT_AL)) {

			omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_RRDY |

drivers/i2c/busses/i2c-stu300.c

+5 −6
Original line number Diff line number Diff line
@@ -859,8 +859,7 @@ static const struct i2c_algorithm stu300_algo = { 
	.functionality	= stu300_func,

};



static int __init

stu300_probe(struct platform_device *pdev)

static int stu300_probe(struct platform_device *pdev)

{

	struct stu300_dev *dev;

	struct i2c_adapter *adap;
@@ -966,8 +965,7 @@ static SIMPLE_DEV_PM_OPS(stu300_pm, stu300_suspend, stu300_resume); 
#define STU300_I2C_PM	NULL

#endif



static int __exit

stu300_remove(struct platform_device *pdev)

static int stu300_remove(struct platform_device *pdev)

{

	struct stu300_dev *dev = platform_get_drvdata(pdev);
@@ -989,13 +987,14 @@ static struct platform_driver stu300_i2c_driver = { 
		.pm	= STU300_I2C_PM,

		.of_match_table = stu300_dt_match,

	},

	.remove		= __exit_p(stu300_remove),

	.probe = stu300_probe,

	.remove = stu300_remove,



};



static int __init stu300_init(void)

{

	return platform_driver_probe(&stu300_i2c_driver, stu300_probe);

	return platform_driver_register(&stu300_i2c_driver);

}



static void __exit stu300_exit(void)