diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2013-08-29 15:24:14 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-29 15:33:52 -0400 |
commit | 5877457a96e5f89567d2eea092ec28db5d55fc06 (patch) | |
tree | 18af3e61586a794a10f884de8989035876340c81 /arch/arm/mach-pxa | |
parent | 8a75f0a07c7aa1e4454c077042ab2b56b72299b9 (diff) |
gpio: (gpio-pca953x) move header to linux/platform_data/
This patch moves the pca953x.h header from include/linux/i2c to
include/linux/platform_data and updates existing support accordingly.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/cm-x300.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pcm990-baseboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zeus.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa300.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index 8091aac89edf..f9423493ed36 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/pwm_backlight.h> | 29 | #include <linux/pwm_backlight.h> |
30 | 30 | ||
31 | #include <linux/i2c.h> | 31 | #include <linux/i2c.h> |
32 | #include <linux/i2c/pca953x.h> | 32 | #include <linux/platform_data/pca953x.h> |
33 | #include <linux/i2c/pxa-i2c.h> | 33 | #include <linux/i2c/pxa-i2c.h> |
34 | 34 | ||
35 | #include <linux/mfd/da903x.h> | 35 | #include <linux/mfd/da903x.h> |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 3a3362fa793e..8eb4e23c561d 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/power_supply.h> | 30 | #include <linux/power_supply.h> |
31 | #include <linux/apm-emulation.h> | 31 | #include <linux/apm-emulation.h> |
32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
33 | #include <linux/i2c/pca953x.h> | 33 | #include <linux/platform_data/pca953x.h> |
34 | #include <linux/i2c/pxa-i2c.h> | 34 | #include <linux/i2c/pxa-i2c.h> |
35 | #include <linux/regulator/userspace-consumer.h> | 35 | #include <linux/regulator/userspace-consumer.h> |
36 | 36 | ||
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 13e5b00eae90..3133ba82c508 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c | |||
@@ -408,7 +408,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = { | |||
408 | .mclk_10khz = 1000, | 408 | .mclk_10khz = 1000, |
409 | }; | 409 | }; |
410 | 410 | ||
411 | #include <linux/i2c/pca953x.h> | 411 | #include <linux/platform_data/pca953x.h> |
412 | 412 | ||
413 | static struct pca953x_platform_data pca9536_data = { | 413 | static struct pca953x_platform_data pca9536_data = { |
414 | .gpio_base = PXA_NR_BUILTIN_GPIO, | 414 | .gpio_base = PXA_NR_BUILTIN_GPIO, |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 4c29173026e8..0b11c1af51c4 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/leds.h> | 20 | #include <linux/leds.h> |
21 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
22 | #include <linux/i2c/pxa-i2c.h> | 22 | #include <linux/i2c/pxa-i2c.h> |
23 | #include <linux/i2c/pca953x.h> | 23 | #include <linux/platform_data/pca953x.h> |
24 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
25 | #include <linux/spi/ads7846.h> | 25 | #include <linux/spi/ads7846.h> |
26 | #include <linux/spi/corgi_lcd.h> | 26 | #include <linux/spi/corgi_lcd.h> |
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index f5d436434566..126e4a806a07 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/mtd/physmap.h> | 26 | #include <linux/mtd/physmap.h> |
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/i2c/pxa-i2c.h> | 28 | #include <linux/i2c/pxa-i2c.h> |
29 | #include <linux/i2c/pca953x.h> | 29 | #include <linux/platform_data/pca953x.h> |
30 | #include <linux/apm-emulation.h> | 30 | #include <linux/apm-emulation.h> |
31 | #include <linux/can/platform/mcp251x.h> | 31 | #include <linux/can/platform/mcp251x.h> |
32 | 32 | ||
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index 86e59c043de2..869bce7c3f24 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
20 | #include <linux/i2c/pxa-i2c.h> | 20 | #include <linux/i2c/pxa-i2c.h> |
21 | #include <linux/i2c/pca953x.h> | 21 | #include <linux/platform_data/pca953x.h> |
22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
23 | 23 | ||
24 | #include <mach/pxa300.h> | 24 | #include <mach/pxa300.h> |