diff options
author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 15:15:35 +0200 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:42 +0200 |
commit | bd03fd41d313d0bf68a11e4f944ac455b8d6fa83 (patch) | |
tree | 7c604ec5985c7526dbb7f41aaff1088f3d064c3c /arch/arm/mach-ux500 | |
parent | b445b589af307429c0d42637ec41e40da6eb8b60 (diff) |
mach-ux500: Fix for gpio header move
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-mmio.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-msp.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-pins-sleep-force.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/clock-db8500.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/context.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/pm.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/suspend.c | 1 |
11 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mmio.c b/arch/arm/mach-ux500/board-mop500-mmio.c index 762ac2553bc..975db6f7af8 100644 --- a/arch/arm/mach-ux500/board-mop500-mmio.c +++ b/arch/arm/mach-ux500/board-mop500-mmio.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/err.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/regulator/consumer.h> diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 0a7d00b0265..631dbe30a40 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -8,6 +8,7 @@ #include <linux/i2s/i2s.h> #include <linux/init.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <plat/ste_dma40.h> #include <plat/pincfg.h> diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 0a79b58a8d1..e705dc34f4a 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -12,7 +12,7 @@ #include <asm/mach-types.h> #include <plat/pincfg.h> -#include <plat/gpio.h> +#include <linux/gpio/nomadik.h> #include <mach/hardware.h> #include <mach/suspend.h> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 12e0ed4a887..a06fbafd08e 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -35,8 +35,9 @@ #include <linux/spi/stm_msp.h> #include <linux/leds_pwm.h> #include <linux/pwm_backlight.h> - +#include <linux/gpio/nomadik.h> #include <linux/leds.h> + #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -876,7 +877,7 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, &snowball_sbnet_dev, -//EROBEMA &ab8500_device, + &ab8500_device, &snowball_gpio_wlan_vbat_regulator_device, &u8500_mcde_device, &u8500_b2r2_device, diff --git a/arch/arm/mach-ux500/board-pins-sleep-force.c b/arch/arm/mach-ux500/board-pins-sleep-force.c index e86d25c0a21..bef6f4e6df4 100644 --- a/arch/arm/mach-ux500/board-pins-sleep-force.c +++ b/arch/arm/mach-ux500/board-pins-sleep-force.c @@ -10,7 +10,7 @@ #include <linux/io.h> #include <linux/string.h> -#include <plat/gpio.h> +#include <linux/gpio/nomadik.h> #include <mach/hardware.h> #include "board-pins-sleep-force.h" diff --git a/arch/arm/mach-ux500/clock-db8500.c b/arch/arm/mach-ux500/clock-db8500.c index d3956b30386..bce3cdc8569 100644 --- a/arch/arm/mach-ux500/clock-db8500.c +++ b/arch/arm/mach-ux500/clock-db8500.c @@ -19,6 +19,7 @@ #include <linux/debugfs.h> #include <linux/module.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <linux/mfd/ab8500/sysctrl.h> #include <linux/workqueue.h> #include <linux/regulator/consumer.h> diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c index 5b8ecde7360..9580bbde792 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c @@ -14,6 +14,7 @@ #include <linux/amba/bus.h> #include <linux/pm.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <video/mcde_display.h> #include <video/mcde_display-av8100.h> @@ -147,7 +148,6 @@ void dbx500_add_gpios(resource_size_t *base, int num, int irq, pdata->first_gpio = first; pdata->first_irq = NOMADIK_GPIO_TO_IRQ(first); pdata->num_gpio = 32; - dbx500_add_gpio(i, base[i], irq, pdata); } } diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 2cb11006b7d..f497c6978f4 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -14,6 +14,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <linux/amba/bus.h> #include <linux/amba/pl022.h> #include <plat/pincfg.h> diff --git a/arch/arm/mach-ux500/pm/context.c b/arch/arm/mach-ux500/pm/context.c index 59b4a74d124..6a84a43626b 100644 --- a/arch/arm/mach-ux500/pm/context.c +++ b/arch/arm/mach-ux500/pm/context.c @@ -25,7 +25,8 @@ #include <mach/irqs.h> #include <mach/scu.h> -#include <plat/gpio.h> +#include <linux/gpio/nomadik.h> +#include <linux/gpio.h> #include "context.h" #include "pm.h" diff --git a/arch/arm/mach-ux500/pm/pm.c b/arch/arm/mach-ux500/pm/pm.c index 890058ca61a..5324d715274 100644 --- a/arch/arm/mach-ux500/pm/pm.c +++ b/arch/arm/mach-ux500/pm/pm.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <asm/processor.h> #include <asm/hardware/gic.h> diff --git a/arch/arm/mach-ux500/pm/suspend.c b/arch/arm/mach-ux500/pm/suspend.c index 9f4573b42e1..44cd2373cc4 100644 --- a/arch/arm/mach-ux500/pm/suspend.c +++ b/arch/arm/mach-ux500/pm/suspend.c @@ -12,6 +12,7 @@ #include <linux/suspend.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <linux/delay.h> #include <linux/regulator/ab8500-debug.h> |