Commit 2bf147a836918b14aae7aba2e598fa18a73e4f19
1 parent
b6db6bfe71
pinctrl: sh-pfc: r8a7791: Add missing mmc_data8_b pin group
Pins D6 and D7 of the MMC interface can be muxed to two different sets of pins, but currently only one set is supported. Add a pin group for the alternative set to fix this. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Chris Paterson <chris.paterson2@renesas.com> Tested-by: Chris Paterson <chris.paterson2@renesas.com>
Showing 1 changed file with 14 additions and 1 deletions Side-by-side Diff
drivers/pinctrl/sh-pfc/pfc-r8a7791.c
| ... | ... | @@ -2589,6 +2589,17 @@ |
| 2589 | 2589 | MMC_D0_MARK, MMC_D1_MARK, MMC_D2_MARK, MMC_D3_MARK, |
| 2590 | 2590 | MMC_D4_MARK, MMC_D5_MARK, MMC_D6_MARK, MMC_D7_MARK, |
| 2591 | 2591 | }; |
| 2592 | +static const unsigned int mmc_data8_b_pins[] = { | |
| 2593 | + /* D[0:7] */ | |
| 2594 | + RCAR_GP_PIN(6, 18), RCAR_GP_PIN(6, 19), | |
| 2595 | + RCAR_GP_PIN(6, 20), RCAR_GP_PIN(6, 21), | |
| 2596 | + RCAR_GP_PIN(6, 22), RCAR_GP_PIN(6, 23), | |
| 2597 | + RCAR_GP_PIN(6, 6), RCAR_GP_PIN(6, 7), | |
| 2598 | +}; | |
| 2599 | +static const unsigned int mmc_data8_b_mux[] = { | |
| 2600 | + MMC_D0_MARK, MMC_D1_MARK, MMC_D2_MARK, MMC_D3_MARK, | |
| 2601 | + MMC_D4_MARK, MMC_D5_MARK, MMC_D6_B_MARK, MMC_D7_B_MARK, | |
| 2602 | +}; | |
| 2592 | 2603 | static const unsigned int mmc_ctrl_pins[] = { |
| 2593 | 2604 | /* CLK, CMD */ |
| 2594 | 2605 | RCAR_GP_PIN(6, 16), RCAR_GP_PIN(6, 17), |
| ... | ... | @@ -4420,7 +4431,7 @@ |
| 4420 | 4431 | }; |
| 4421 | 4432 | |
| 4422 | 4433 | static const struct { |
| 4423 | - struct sh_pfc_pin_group common[341]; | |
| 4434 | + struct sh_pfc_pin_group common[342]; | |
| 4424 | 4435 | struct sh_pfc_pin_group r8a779x[9]; |
| 4425 | 4436 | } pinmux_groups = { |
| 4426 | 4437 | .common = { |
| ... | ... | @@ -4523,6 +4534,7 @@ |
| 4523 | 4534 | SH_PFC_PIN_GROUP(mmc_data1), |
| 4524 | 4535 | SH_PFC_PIN_GROUP(mmc_data4), |
| 4525 | 4536 | SH_PFC_PIN_GROUP(mmc_data8), |
| 4537 | + SH_PFC_PIN_GROUP(mmc_data8_b), | |
| 4526 | 4538 | SH_PFC_PIN_GROUP(mmc_ctrl), |
| 4527 | 4539 | SH_PFC_PIN_GROUP(msiof0_clk), |
| 4528 | 4540 | SH_PFC_PIN_GROUP(msiof0_sync), |
| ... | ... | @@ -4955,6 +4967,7 @@ |
| 4955 | 4967 | "mmc_data1", |
| 4956 | 4968 | "mmc_data4", |
| 4957 | 4969 | "mmc_data8", |
| 4970 | + "mmc_data8_b", | |
| 4958 | 4971 | "mmc_ctrl", |
| 4959 | 4972 | }; |
| 4960 | 4973 |