diff options
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a73a4.h | 2 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/include/mach/r8a73a4.h index f0b1b4a962b3..2d4af4af3634 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a73a4.h +++ b/arch/arm/mach-shmobile/include/mach/r8a73a4.h | |||
@@ -86,7 +86,7 @@ enum { | |||
86 | GPIO_PORT325, GPIO_PORT326, GPIO_PORT327, GPIO_PORT328, GPIO_PORT329, | 86 | GPIO_PORT325, GPIO_PORT326, GPIO_PORT327, GPIO_PORT328, GPIO_PORT329, |
87 | 87 | ||
88 | /* Port0 */ | 88 | /* Port0 */ |
89 | GPIO_FN_LCDD0, | 89 | GPIO_FN_LCDD0 = 330, |
90 | GPIO_FN_PDM2_CLK_0, | 90 | GPIO_FN_PDM2_CLK_0, |
91 | GPIO_FN_DU0_DR0, | 91 | GPIO_FN_DU0_DR0, |
92 | GPIO_FN_IRQ0, | 92 | GPIO_FN_IRQ0, |
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c index 47d75d5548eb..5dd68fb96274 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | |||
@@ -1424,6 +1424,20 @@ static struct sh_pfc_pin pinmux_pins[] = { | |||
1424 | GPIO_PORT_ALL(), | 1424 | GPIO_PORT_ALL(), |
1425 | }; | 1425 | }; |
1426 | 1426 | ||
1427 | static const struct pinmux_range pinmux_ranges[] = { | ||
1428 | {.begin = 0, .end = 30,}, | ||
1429 | {.begin = 32, .end = 40,}, | ||
1430 | {.begin = 64, .end = 85,}, | ||
1431 | {.begin = 96, .end = 126,}, | ||
1432 | {.begin = 128, .end = 134,}, | ||
1433 | {.begin = 160, .end = 178,}, | ||
1434 | {.begin = 192, .end = 222,}, | ||
1435 | {.begin = 224, .end = 250,}, | ||
1436 | {.begin = 256, .end = 283,}, | ||
1437 | {.begin = 288, .end = 308,}, | ||
1438 | {.begin = 320, .end = 329,}, | ||
1439 | }; | ||
1440 | |||
1427 | #define PINMUX_FN_BASE ARRAY_SIZE(pinmux_pins) | 1441 | #define PINMUX_FN_BASE ARRAY_SIZE(pinmux_pins) |
1428 | 1442 | ||
1429 | static const struct pinmux_func pinmux_func_gpios[] = { | 1443 | static const struct pinmux_func pinmux_func_gpios[] = { |
@@ -2815,6 +2829,8 @@ const struct sh_pfc_soc_info r8a73a4_pinmux_info = { | |||
2815 | 2829 | ||
2816 | .pins = pinmux_pins, | 2830 | .pins = pinmux_pins, |
2817 | .nr_pins = ARRAY_SIZE(pinmux_pins), | 2831 | .nr_pins = ARRAY_SIZE(pinmux_pins), |
2832 | .ranges = pinmux_ranges, | ||
2833 | .nr_ranges = ARRAY_SIZE(pinmux_ranges), | ||
2818 | .func_gpios = pinmux_func_gpios, | 2834 | .func_gpios = pinmux_func_gpios, |
2819 | .nr_func_gpios = ARRAY_SIZE(pinmux_func_gpios), | 2835 | .nr_func_gpios = ARRAY_SIZE(pinmux_func_gpios), |
2820 | 2836 | ||