diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-11 00:32:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-11 00:32:20 -0700 |
| commit | 9ee73aec3570733dc3b9a6b4782db6b323abfa5e (patch) | |
| tree | 82626b8205e1f495878428e7bb5b49acf3d651ab /arch/arm/mach-shmobile/board-marzen.c | |
| parent | b52e79152f35379a6bb5b800dcf796209fdebd02 (diff) | |
| parent | 5fcf4a3c3a5bc08bf72a50ef1332501a3c1b96bb (diff) | |
| download | kernel_goldelico_gta04-9ee73aec3570733dc3b9a6b4782db6b323abfa5e.zip kernel_goldelico_gta04-9ee73aec3570733dc3b9a6b4782db6b323abfa5e.tar.gz kernel_goldelico_gta04-9ee73aec3570733dc3b9a6b4782db6b323abfa5e.tar.bz2 | |
Merge branch 'renesas/pinmux-gpio' into next/boards
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index b9594e9..9112fae 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -28,6 +28,7 @@ #include <linux/leds.h> #include <linux/dma-mapping.h> #include <linux/pinctrl/machine.h> +#include <linux/platform_data/gpio-rcar.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/smsc911x.h> @@ -173,15 +174,15 @@ static struct platform_device usb_phy_device = { static struct gpio_led marzen_leds[] = { { .name = "led2", - .gpio = 157, + .gpio = RCAR_GP_PIN(4, 29), .default_state = LEDS_GPIO_DEFSTATE_ON, }, { .name = "led3", - .gpio = 158, + .gpio = RCAR_GP_PIN(4, 30), .default_state = LEDS_GPIO_DEFSTATE_ON, }, { .name = "led4", - .gpio = 159, + .gpio = RCAR_GP_PIN(4, 31), .default_state = LEDS_GPIO_DEFSTATE_ON, }, }; |