diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-01-04 23:10:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-04 23:10:08 -0800 |
| commit | add49f7835ccd92b4b0759694fabfd04f685596f (patch) | |
| tree | 9c5c927eaac667c8940bf149d6596d0cd3595cca /drivers/i2c | |
| parent | Merge tag 'omap-for-v4.16/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
| parent | ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR register (diff) | |
| download | linux-dev-add49f7835ccd92b4b0759694fabfd04f685596f.tar.xz linux-dev-add49f7835ccd92b4b0759694fabfd04f685596f.zip | |
Merge tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux into next/soc
This is the pxa changes for v4.16 cycle.
It is :
- the conversion to the new parser sharpslpart parser
for the Sharp variants
- an I2C platform data cleanup for PXA
- a gpioreg switch of one register for lubbock
* tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux:
ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR register
ARM: pxa/poodle: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa/spitz: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa/tosa: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa/corgi: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa: move header file out of I2C realm
ARM: pxa: move declarations to proper place
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa-pci.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c index 004deb96afe3..72ea8f4c61aa 100644 --- a/drivers/i2c/busses/i2c-pxa-pci.c +++ b/drivers/i2c/busses/i2c-pxa-pci.c @@ -10,7 +10,7 @@ #include <linux/init.h> #include <linux/pci.h> #include <linux/platform_device.h> -#include <linux/i2c/pxa-i2c.h> +#include <linux/platform_data/i2c-pxa.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_address.h> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 600d264e080c..fbf91d383b40 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -36,7 +36,7 @@ #include <linux/clk.h> #include <linux/slab.h> #include <linux/io.h> -#include <linux/i2c/pxa-i2c.h> +#include <linux/platform_data/i2c-pxa.h> #include <asm/irq.h> |