aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-01-10 13:22:36 -0500
committerLinus Walleij <linus.walleij@linaro.org>2015-01-15 11:10:56 -0500
commit8271ee96d1af4dfd9ef3a6c2bbb5cc14d7a73247 (patch)
tree6f78f61729083c64df7d771868c36d4fdfd369f6 /drivers
parent87f27fe1a72c0f1d021fb2fe897cc601708fd26b (diff)
sh-pfc: r8a7791: add MLB+ pin group
Add MLB+ 3-pin mode pin group to R8A7791 PFC driver. Based on original patch by Andrey Gusakov <andrey.gusakov@cogentembedded.com>. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7791.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
index 6f0cbfe777f6..fdd2c8729791 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
@@ -2391,6 +2391,13 @@ static const unsigned int intc_irq3_pins[] = {
2391static const unsigned int intc_irq3_mux[] = { 2391static const unsigned int intc_irq3_mux[] = {
2392 IRQ3_MARK, 2392 IRQ3_MARK,
2393}; 2393};
2394/* - MLB+ ------------------------------------------------------------------- */
2395static const unsigned int mlb_3pin_pins[] = {
2396 RCAR_GP_PIN(7, 7), RCAR_GP_PIN(7, 8), RCAR_GP_PIN(7, 9),
2397};
2398static const unsigned int mlb_3pin_mux[] = {
2399 MLB_CLK_MARK, MLB_SIG_MARK, MLB_DAT_MARK,
2400};
2394/* - MMCIF ------------------------------------------------------------------ */ 2401/* - MMCIF ------------------------------------------------------------------ */
2395static const unsigned int mmc_data1_pins[] = { 2402static const unsigned int mmc_data1_pins[] = {
2396 /* D[0] */ 2403 /* D[0] */
@@ -4267,6 +4274,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
4267 SH_PFC_PIN_GROUP(intc_irq1), 4274 SH_PFC_PIN_GROUP(intc_irq1),
4268 SH_PFC_PIN_GROUP(intc_irq2), 4275 SH_PFC_PIN_GROUP(intc_irq2),
4269 SH_PFC_PIN_GROUP(intc_irq3), 4276 SH_PFC_PIN_GROUP(intc_irq3),
4277 SH_PFC_PIN_GROUP(mlb_3pin),
4270 SH_PFC_PIN_GROUP(mmc_data1), 4278 SH_PFC_PIN_GROUP(mmc_data1),
4271 SH_PFC_PIN_GROUP(mmc_data4), 4279 SH_PFC_PIN_GROUP(mmc_data4),
4272 SH_PFC_PIN_GROUP(mmc_data8), 4280 SH_PFC_PIN_GROUP(mmc_data8),
@@ -4648,6 +4656,10 @@ static const char * const intc_groups[] = {
4648 "intc_irq3", 4656 "intc_irq3",
4649}; 4657};
4650 4658
4659static const char * const mlb_groups[] = {
4660 "mlb_3pin",
4661};
4662
4651static const char * const mmc_groups[] = { 4663static const char * const mmc_groups[] = {
4652 "mmc_data1", 4664 "mmc_data1",
4653 "mmc_data4", 4665 "mmc_data4",
@@ -4972,6 +4984,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
4972 SH_PFC_FUNCTION(i2c7), 4984 SH_PFC_FUNCTION(i2c7),
4973 SH_PFC_FUNCTION(i2c8), 4985 SH_PFC_FUNCTION(i2c8),
4974 SH_PFC_FUNCTION(intc), 4986 SH_PFC_FUNCTION(intc),
4987 SH_PFC_FUNCTION(mlb),
4975 SH_PFC_FUNCTION(mmc), 4988 SH_PFC_FUNCTION(mmc),
4976 SH_PFC_FUNCTION(msiof0), 4989 SH_PFC_FUNCTION(msiof0),
4977 SH_PFC_FUNCTION(msiof1), 4990 SH_PFC_FUNCTION(msiof1),