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

Commit 85f2901b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fixes from Wolfram Sang:
 "This has a mixture of merge window cleanups and bugfixes"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: st: add include for pinctrl
  i2c: mux: use proper dev when removing "channel-X" symlinks
  i2c: digicolor: remove duplicate include
  i2c: Mark adapter devices with pm_runtime_no_callbacks
  i2c: pca-platform: fix broken email address
  i2c: mxs: fix broken email address
  i2c: rk3x: report number of messages transmitted
parents f583381f fcdd5f09

drivers/i2c/busses/i2c-digicolor.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -12,11 +12,10 @@ 




#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/completion.h>

#include <linux/completion.h>

#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of.h>

drivers/i2c/busses/i2c-mxs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -913,7 +913,7 @@ static void __exit mxs_i2c_exit(void) 
module_exit(mxs_i2c_exit);

module_exit(mxs_i2c_exit);





MODULE_AUTHOR("Marek Vasut <marex@denx.de>");

MODULE_AUTHOR("Marek Vasut <marex@denx.de>");

MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");

MODULE_AUTHOR("Wolfram Sang <kernel@pengutronix.de>");

MODULE_DESCRIPTION("MXS I2C Bus Driver");

MODULE_DESCRIPTION("MXS I2C Bus Driver");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:" DRIVER_NAME);
 
MODULE_ALIAS("platform:" DRIVER_NAME);

drivers/i2c/busses/i2c-pca-platform.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -285,6 +285,6 @@ static struct platform_driver i2c_pca_pf_driver = { 




module_platform_driver(i2c_pca_pf_driver);

module_platform_driver(i2c_pca_pf_driver);





MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");

MODULE_AUTHOR("Wolfram Sang <kernel@pengutronix.de>");

MODULE_DESCRIPTION("I2C-PCA9564/PCA9665 platform driver");

MODULE_DESCRIPTION("I2C-PCA9564/PCA9665 platform driver");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

drivers/i2c/busses/i2c-rk3x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -833,7 +833,7 @@ static int rk3x_i2c_xfer(struct i2c_adapter *adap, 
	clk_disable(i2c->clk);

	clk_disable(i2c->clk);

	spin_unlock_irqrestore(&i2c->lock, flags);

	spin_unlock_irqrestore(&i2c->lock, flags);





	return ret;

	return ret < 0 ? ret : num;

}

}





static u32 rk3x_i2c_func(struct i2c_adapter *adap)

static u32 rk3x_i2c_func(struct i2c_adapter *adap)

drivers/i2c/busses/i2c-st.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -10,17 +10,18 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/err.h>

#include <linux/err.h>

#include <linux/of.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/of.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_device.h>





/* SSC registers */

/* SSC registers */

#define SSC_BRG				0x000

#define SSC_BRG				0x000