aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-06-11 07:42:17 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-06-16 22:20:52 -0400
commit0a6ea54ff0fd1ac72223af44939fcd7197537b14 (patch)
tree3bf9c8beeb9b6785cdf5319b32075c1fde100cc5 /drivers/pinctrl/sh-pfc/pfc-r8a7790.c
parentfbd0ca3de1380cf1881e5e92fb8a97ad24171b4c (diff)
pinctrl: r8a7790: fix two pin numbers
Fix two erroneous MMCIF1 pin numbers on r8a7790. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pfc-r8a7790.c')
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7790.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
index 1e7a5eb70a00..14f3ec267e1f 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
@@ -2506,8 +2506,7 @@ static const unsigned int tpu0_to3_pins[] = {
2506static const unsigned int tpu0_to3_mux[] = { 2506static const unsigned int tpu0_to3_mux[] = {
2507 TPU0TO3_MARK, 2507 TPU0TO3_MARK,
2508}; 2508};
2509 2509/* - MMCIF0 ----------------------------------------------------------------- */
2510/* - MMCIF ------------------------------------------------------------------ */
2511static const unsigned int mmc0_data1_pins[] = { 2510static const unsigned int mmc0_data1_pins[] = {
2512 /* D[0] */ 2511 /* D[0] */
2513 RCAR_GP_PIN(3, 18), 2512 RCAR_GP_PIN(3, 18),
@@ -2541,7 +2540,7 @@ static const unsigned int mmc0_ctrl_pins[] = {
2541static const unsigned int mmc0_ctrl_mux[] = { 2540static const unsigned int mmc0_ctrl_mux[] = {
2542 MMC0_CLK_MARK, MMC0_CMD_MARK, 2541 MMC0_CLK_MARK, MMC0_CMD_MARK,
2543}; 2542};
2544 2543/* - MMCIF1 ----------------------------------------------------------------- */
2545static const unsigned int mmc1_data1_pins[] = { 2544static const unsigned int mmc1_data1_pins[] = {
2546 /* D[0] */ 2545 /* D[0] */
2547 RCAR_GP_PIN(3, 26), 2546 RCAR_GP_PIN(3, 26),
@@ -2562,7 +2561,7 @@ static const unsigned int mmc1_data8_pins[] = {
2562 RCAR_GP_PIN(3, 26), RCAR_GP_PIN(3, 27), 2561 RCAR_GP_PIN(3, 26), RCAR_GP_PIN(3, 27),
2563 RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 29), 2562 RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 29),
2564 RCAR_GP_PIN(3, 30), RCAR_GP_PIN(3, 31), 2563 RCAR_GP_PIN(3, 30), RCAR_GP_PIN(3, 31),
2565 RCAR_GP_PIN(3, 13), RCAR_GP_PIN(3, 14), 2564 RCAR_GP_PIN(3, 14), RCAR_GP_PIN(3, 15),
2566}; 2565};
2567static const unsigned int mmc1_data8_mux[] = { 2566static const unsigned int mmc1_data8_mux[] = {
2568 MMC1_D0_MARK, MMC1_D1_MARK, MMC1_D2_MARK, MMC1_D3_MARK, 2567 MMC1_D0_MARK, MMC1_D1_MARK, MMC1_D2_MARK, MMC1_D3_MARK,
@@ -2575,8 +2574,7 @@ static const unsigned int mmc1_ctrl_pins[] = {
2575static const unsigned int mmc1_ctrl_mux[] = { 2574static const unsigned int mmc1_ctrl_mux[] = {
2576 MMC1_CLK_MARK, MMC1_CMD_MARK, 2575 MMC1_CLK_MARK, MMC1_CMD_MARK,
2577}; 2576};
2578 2577/* - SDHI0 ------------------------------------------------------------------ */
2579/* - SDHI ------------------------------------------------------------------- */
2580static const unsigned int sdhi0_data1_pins[] = { 2578static const unsigned int sdhi0_data1_pins[] = {
2581 /* D0 */ 2579 /* D0 */
2582 RCAR_GP_PIN(3, 2), 2580 RCAR_GP_PIN(3, 2),
@@ -2612,7 +2610,7 @@ static const unsigned int sdhi0_wp_pins[] = {
2612static const unsigned int sdhi0_wp_mux[] = { 2610static const unsigned int sdhi0_wp_mux[] = {
2613 SD0_WP_MARK, 2611 SD0_WP_MARK,
2614}; 2612};
2615 2613/* - SDHI1 ------------------------------------------------------------------ */
2616static const unsigned int sdhi1_data1_pins[] = { 2614static const unsigned int sdhi1_data1_pins[] = {
2617 /* D0 */ 2615 /* D0 */
2618 RCAR_GP_PIN(3, 10), 2616 RCAR_GP_PIN(3, 10),
@@ -2648,7 +2646,7 @@ static const unsigned int sdhi1_wp_pins[] = {
2648static const unsigned int sdhi1_wp_mux[] = { 2646static const unsigned int sdhi1_wp_mux[] = {
2649 SD1_WP_MARK, 2647 SD1_WP_MARK,
2650}; 2648};
2651 2649/* - SDHI2 ------------------------------------------------------------------ */
2652static const unsigned int sdhi2_data1_pins[] = { 2650static const unsigned int sdhi2_data1_pins[] = {
2653 /* D0 */ 2651 /* D0 */
2654 RCAR_GP_PIN(3, 18), 2652 RCAR_GP_PIN(3, 18),
@@ -2684,7 +2682,7 @@ static const unsigned int sdhi2_wp_pins[] = {
2684static const unsigned int sdhi2_wp_mux[] = { 2682static const unsigned int sdhi2_wp_mux[] = {
2685 SD2_WP_MARK, 2683 SD2_WP_MARK,
2686}; 2684};
2687 2685/* - SDHI3 ------------------------------------------------------------------ */
2688static const unsigned int sdhi3_data1_pins[] = { 2686static const unsigned int sdhi3_data1_pins[] = {
2689 /* D0 */ 2687 /* D0 */
2690 RCAR_GP_PIN(3, 26), 2688 RCAR_GP_PIN(3, 26),