diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2015-01-10 13:20:47 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-15 11:36:22 -0500 |
commit | e29a4c3a1c573b251723583ec396e5c9d5126ed2 (patch) | |
tree | 7377715c747fb39865d12f3df93210fbd68e7941 /drivers/pinctrl | |
parent | 8271ee96d1af4dfd9ef3a6c2bbb5cc14d7a73247 (diff) |
sh-pfc: r8a7790: add MLB+ pin group
Add MLB+ 3-pin mode pin group to R8A7790 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/pinctrl')
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 9a179c94b4dc..80c1843bb6ad 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c | |||
@@ -2241,6 +2241,13 @@ static const unsigned int intc_irq3_pins[] = { | |||
2241 | static const unsigned int intc_irq3_mux[] = { | 2241 | static const unsigned int intc_irq3_mux[] = { |
2242 | IRQ3_MARK, | 2242 | IRQ3_MARK, |
2243 | }; | 2243 | }; |
2244 | /* - MLB+ ------------------------------------------------------------------- */ | ||
2245 | static const unsigned int mlb_3pin_pins[] = { | ||
2246 | RCAR_GP_PIN(4, 0), RCAR_GP_PIN(4, 1), RCAR_GP_PIN(4, 2), | ||
2247 | }; | ||
2248 | static const unsigned int mlb_3pin_mux[] = { | ||
2249 | MLB_CLK_MARK, MLB_SIG_MARK, MLB_DAT_MARK, | ||
2250 | }; | ||
2244 | /* - MMCIF0 ----------------------------------------------------------------- */ | 2251 | /* - MMCIF0 ----------------------------------------------------------------- */ |
2245 | static const unsigned int mmc0_data1_pins[] = { | 2252 | static const unsigned int mmc0_data1_pins[] = { |
2246 | /* D[0] */ | 2253 | /* D[0] */ |
@@ -3873,6 +3880,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { | |||
3873 | SH_PFC_PIN_GROUP(intc_irq1), | 3880 | SH_PFC_PIN_GROUP(intc_irq1), |
3874 | SH_PFC_PIN_GROUP(intc_irq2), | 3881 | SH_PFC_PIN_GROUP(intc_irq2), |
3875 | SH_PFC_PIN_GROUP(intc_irq3), | 3882 | SH_PFC_PIN_GROUP(intc_irq3), |
3883 | SH_PFC_PIN_GROUP(mlb_3pin), | ||
3876 | SH_PFC_PIN_GROUP(mmc0_data1), | 3884 | SH_PFC_PIN_GROUP(mmc0_data1), |
3877 | SH_PFC_PIN_GROUP(mmc0_data4), | 3885 | SH_PFC_PIN_GROUP(mmc0_data4), |
3878 | SH_PFC_PIN_GROUP(mmc0_data8), | 3886 | SH_PFC_PIN_GROUP(mmc0_data8), |
@@ -4198,6 +4206,10 @@ static const char * const intc_groups[] = { | |||
4198 | "intc_irq3", | 4206 | "intc_irq3", |
4199 | }; | 4207 | }; |
4200 | 4208 | ||
4209 | static const char * const mlb_groups[] = { | ||
4210 | "mlb_3pin", | ||
4211 | }; | ||
4212 | |||
4201 | static const char * const mmc0_groups[] = { | 4213 | static const char * const mmc0_groups[] = { |
4202 | "mmc0_data1", | 4214 | "mmc0_data1", |
4203 | "mmc0_data4", | 4215 | "mmc0_data4", |
@@ -4511,6 +4523,7 @@ static const struct sh_pfc_function pinmux_functions[] = { | |||
4511 | SH_PFC_FUNCTION(iic2), | 4523 | SH_PFC_FUNCTION(iic2), |
4512 | SH_PFC_FUNCTION(iic3), | 4524 | SH_PFC_FUNCTION(iic3), |
4513 | SH_PFC_FUNCTION(intc), | 4525 | SH_PFC_FUNCTION(intc), |
4526 | SH_PFC_FUNCTION(mlb), | ||
4514 | SH_PFC_FUNCTION(mmc0), | 4527 | SH_PFC_FUNCTION(mmc0), |
4515 | SH_PFC_FUNCTION(mmc1), | 4528 | SH_PFC_FUNCTION(mmc1), |
4516 | SH_PFC_FUNCTION(msiof0), | 4529 | SH_PFC_FUNCTION(msiof0), |