* [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups @ 2014-02-20 19:53 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2014-02-20 19:53 UTC (permalink / raw) To: Linus Walleij, Laurent Pinchart Cc: linux-sh, linux-kernel, Geert Uytterhoeven From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> --- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 129 ++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 2ca319f15d31..2d1a0a158682 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c @@ -2260,6 +2260,42 @@ static const unsigned int msiof0_tx_pins[] = { static const unsigned int msiof0_tx_mux[] = { MSIOF0_TXD_MARK, }; + +static const unsigned int msiof0_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(1, 23), +}; +static const unsigned int msiof0_clk_b_mux[] = { + MSIOF0_SCK_B_MARK, +}; +static const unsigned int msiof0_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(1, 12), +}; +static const unsigned int msiof0_ss1_b_mux[] = { + MSIOF0_SS1_B_MARK, +}; +static const unsigned int msiof0_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(1, 10), +}; +static const unsigned int msiof0_ss2_b_mux[] = { + MSIOF0_SS2_B_MARK, +}; +static const unsigned int msiof0_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(1, 29), +}; +static const unsigned int msiof0_rx_b_mux[] = { + MSIOF0_RXD_B_MARK, +}; +static const unsigned int msiof0_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(1, 28), +}; +static const unsigned int msiof0_tx_b_mux[] = { + MSIOF0_TXD_B_MARK, +}; /* - MSIOF1 ----------------------------------------------------------------- */ static const unsigned int msiof1_clk_pins[] = { /* SCK */ @@ -2303,6 +2339,42 @@ static const unsigned int msiof1_tx_pins[] = { static const unsigned int msiof1_tx_mux[] = { MSIOF1_TXD_MARK, }; + +static const unsigned int msiof1_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(1, 16), +}; +static const unsigned int msiof1_clk_b_mux[] = { + MSIOF1_SCK_B_MARK, +}; +static const unsigned int msiof1_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(0, 18), +}; +static const unsigned int msiof1_ss1_b_mux[] = { + MSIOF1_SS1_B_MARK, +}; +static const unsigned int msiof1_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(0, 19), +}; +static const unsigned int msiof1_ss2_b_mux[] = { + MSIOF1_SS2_B_MARK, +}; +static const unsigned int msiof1_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(1, 17), +}; +static const unsigned int msiof1_rx_b_mux[] = { + MSIOF1_RXD_B_MARK, +}; +static const unsigned int msiof1_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 20), +}; +static const unsigned int msiof1_tx_b_mux[] = { + MSIOF1_TXD_B_MARK, +}; /* - MSIOF2 ----------------------------------------------------------------- */ static const unsigned int msiof2_clk_pins[] = { /* SCK */ @@ -2389,6 +2461,35 @@ static const unsigned int msiof3_tx_pins[] = { static const unsigned int msiof3_tx_mux[] = { MSIOF3_TXD_MARK, }; + +static const unsigned int msiof3_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(0, 0), +}; +static const unsigned int msiof3_clk_b_mux[] = { + MSIOF3_SCK_B_MARK, +}; +static const unsigned int msiof3_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(0, 1), +}; +static const unsigned int msiof3_sync_b_mux[] = { + MSIOF3_SYNC_B_MARK, +}; +static const unsigned int msiof3_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(0, 2), +}; +static const unsigned int msiof3_rx_b_mux[] = { + MSIOF3_RXD_B_MARK, +}; +static const unsigned int msiof3_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 3), +}; +static const unsigned int msiof3_tx_b_mux[] = { + MSIOF3_TXD_B_MARK, +}; /* - QSPI ------------------------------------------------------------------- */ static const unsigned int qspi_ctrl_pins[] = { /* SPCLK, SSL */ @@ -3676,12 +3777,22 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof0_ss2), SH_PFC_PIN_GROUP(msiof0_rx), SH_PFC_PIN_GROUP(msiof0_tx), + SH_PFC_PIN_GROUP(msiof0_clk_b), + SH_PFC_PIN_GROUP(msiof0_ss1_b), + SH_PFC_PIN_GROUP(msiof0_ss2_b), + SH_PFC_PIN_GROUP(msiof0_rx_b), + SH_PFC_PIN_GROUP(msiof0_tx_b), SH_PFC_PIN_GROUP(msiof1_clk), SH_PFC_PIN_GROUP(msiof1_sync), SH_PFC_PIN_GROUP(msiof1_ss1), SH_PFC_PIN_GROUP(msiof1_ss2), SH_PFC_PIN_GROUP(msiof1_rx), SH_PFC_PIN_GROUP(msiof1_tx), + SH_PFC_PIN_GROUP(msiof1_clk_b), + SH_PFC_PIN_GROUP(msiof1_ss1_b), + SH_PFC_PIN_GROUP(msiof1_ss2_b), + SH_PFC_PIN_GROUP(msiof1_rx_b), + SH_PFC_PIN_GROUP(msiof1_tx_b), SH_PFC_PIN_GROUP(msiof2_clk), SH_PFC_PIN_GROUP(msiof2_sync), SH_PFC_PIN_GROUP(msiof2_ss1), @@ -3694,6 +3805,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof3_ss2), SH_PFC_PIN_GROUP(msiof3_rx), SH_PFC_PIN_GROUP(msiof3_tx), + SH_PFC_PIN_GROUP(msiof3_clk_b), + SH_PFC_PIN_GROUP(msiof3_sync_b), + SH_PFC_PIN_GROUP(msiof3_rx_b), + SH_PFC_PIN_GROUP(msiof3_tx_b), SH_PFC_PIN_GROUP(qspi_ctrl), SH_PFC_PIN_GROUP(qspi_data2), SH_PFC_PIN_GROUP(qspi_data4), @@ -3967,6 +4082,11 @@ static const char * const msiof0_groups[] = { "msiof0_ss2", "msiof0_rx", "msiof0_tx", + "msiof0_clk_b", + "msiof0_ss1_b", + "msiof0_ss2_b", + "msiof0_rx_b", + "msiof0_tx_b", }; static const char * const msiof1_groups[] = { @@ -3976,6 +4096,11 @@ static const char * const msiof1_groups[] = { "msiof1_ss2", "msiof1_rx", "msiof1_tx", + "msiof1_clk_b", + "msiof1_ss1_b", + "msiof1_ss2_b", + "msiof1_rx_b", + "msiof1_tx_b", }; static const char * const msiof2_groups[] = { @@ -3994,6 +4119,10 @@ static const char * const msiof3_groups[] = { "msiof3_ss2", "msiof3_rx", "msiof3_tx", + "msiof3_clk_b", + "msiof3_sync_b", + "msiof3_rx_b", + "msiof3_tx_b", }; static const char * const qspi_groups[] = { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups @ 2014-02-20 19:53 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2014-02-20 19:53 UTC (permalink / raw) To: Linus Walleij, Laurent Pinchart Cc: linux-sh, linux-kernel, Geert Uytterhoeven From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> --- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 129 ++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 2ca319f15d31..2d1a0a158682 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c @@ -2260,6 +2260,42 @@ static const unsigned int msiof0_tx_pins[] = { static const unsigned int msiof0_tx_mux[] = { MSIOF0_TXD_MARK, }; + +static const unsigned int msiof0_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(1, 23), +}; +static const unsigned int msiof0_clk_b_mux[] = { + MSIOF0_SCK_B_MARK, +}; +static const unsigned int msiof0_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(1, 12), +}; +static const unsigned int msiof0_ss1_b_mux[] = { + MSIOF0_SS1_B_MARK, +}; +static const unsigned int msiof0_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(1, 10), +}; +static const unsigned int msiof0_ss2_b_mux[] = { + MSIOF0_SS2_B_MARK, +}; +static const unsigned int msiof0_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(1, 29), +}; +static const unsigned int msiof0_rx_b_mux[] = { + MSIOF0_RXD_B_MARK, +}; +static const unsigned int msiof0_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(1, 28), +}; +static const unsigned int msiof0_tx_b_mux[] = { + MSIOF0_TXD_B_MARK, +}; /* - MSIOF1 ----------------------------------------------------------------- */ static const unsigned int msiof1_clk_pins[] = { /* SCK */ @@ -2303,6 +2339,42 @@ static const unsigned int msiof1_tx_pins[] = { static const unsigned int msiof1_tx_mux[] = { MSIOF1_TXD_MARK, }; + +static const unsigned int msiof1_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(1, 16), +}; +static const unsigned int msiof1_clk_b_mux[] = { + MSIOF1_SCK_B_MARK, +}; +static const unsigned int msiof1_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(0, 18), +}; +static const unsigned int msiof1_ss1_b_mux[] = { + MSIOF1_SS1_B_MARK, +}; +static const unsigned int msiof1_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(0, 19), +}; +static const unsigned int msiof1_ss2_b_mux[] = { + MSIOF1_SS2_B_MARK, +}; +static const unsigned int msiof1_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(1, 17), +}; +static const unsigned int msiof1_rx_b_mux[] = { + MSIOF1_RXD_B_MARK, +}; +static const unsigned int msiof1_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 20), +}; +static const unsigned int msiof1_tx_b_mux[] = { + MSIOF1_TXD_B_MARK, +}; /* - MSIOF2 ----------------------------------------------------------------- */ static const unsigned int msiof2_clk_pins[] = { /* SCK */ @@ -2389,6 +2461,35 @@ static const unsigned int msiof3_tx_pins[] = { static const unsigned int msiof3_tx_mux[] = { MSIOF3_TXD_MARK, }; + +static const unsigned int msiof3_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(0, 0), +}; +static const unsigned int msiof3_clk_b_mux[] = { + MSIOF3_SCK_B_MARK, +}; +static const unsigned int msiof3_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(0, 1), +}; +static const unsigned int msiof3_sync_b_mux[] = { + MSIOF3_SYNC_B_MARK, +}; +static const unsigned int msiof3_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(0, 2), +}; +static const unsigned int msiof3_rx_b_mux[] = { + MSIOF3_RXD_B_MARK, +}; +static const unsigned int msiof3_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 3), +}; +static const unsigned int msiof3_tx_b_mux[] = { + MSIOF3_TXD_B_MARK, +}; /* - QSPI ------------------------------------------------------------------- */ static const unsigned int qspi_ctrl_pins[] = { /* SPCLK, SSL */ @@ -3676,12 +3777,22 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof0_ss2), SH_PFC_PIN_GROUP(msiof0_rx), SH_PFC_PIN_GROUP(msiof0_tx), + SH_PFC_PIN_GROUP(msiof0_clk_b), + SH_PFC_PIN_GROUP(msiof0_ss1_b), + SH_PFC_PIN_GROUP(msiof0_ss2_b), + SH_PFC_PIN_GROUP(msiof0_rx_b), + SH_PFC_PIN_GROUP(msiof0_tx_b), SH_PFC_PIN_GROUP(msiof1_clk), SH_PFC_PIN_GROUP(msiof1_sync), SH_PFC_PIN_GROUP(msiof1_ss1), SH_PFC_PIN_GROUP(msiof1_ss2), SH_PFC_PIN_GROUP(msiof1_rx), SH_PFC_PIN_GROUP(msiof1_tx), + SH_PFC_PIN_GROUP(msiof1_clk_b), + SH_PFC_PIN_GROUP(msiof1_ss1_b), + SH_PFC_PIN_GROUP(msiof1_ss2_b), + SH_PFC_PIN_GROUP(msiof1_rx_b), + SH_PFC_PIN_GROUP(msiof1_tx_b), SH_PFC_PIN_GROUP(msiof2_clk), SH_PFC_PIN_GROUP(msiof2_sync), SH_PFC_PIN_GROUP(msiof2_ss1), @@ -3694,6 +3805,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof3_ss2), SH_PFC_PIN_GROUP(msiof3_rx), SH_PFC_PIN_GROUP(msiof3_tx), + SH_PFC_PIN_GROUP(msiof3_clk_b), + SH_PFC_PIN_GROUP(msiof3_sync_b), + SH_PFC_PIN_GROUP(msiof3_rx_b), + SH_PFC_PIN_GROUP(msiof3_tx_b), SH_PFC_PIN_GROUP(qspi_ctrl), SH_PFC_PIN_GROUP(qspi_data2), SH_PFC_PIN_GROUP(qspi_data4), @@ -3967,6 +4082,11 @@ static const char * const msiof0_groups[] = { "msiof0_ss2", "msiof0_rx", "msiof0_tx", + "msiof0_clk_b", + "msiof0_ss1_b", + "msiof0_ss2_b", + "msiof0_rx_b", + "msiof0_tx_b", }; static const char * const msiof1_groups[] = { @@ -3976,6 +4096,11 @@ static const char * const msiof1_groups[] = { "msiof1_ss2", "msiof1_rx", "msiof1_tx", + "msiof1_clk_b", + "msiof1_ss1_b", + "msiof1_ss2_b", + "msiof1_rx_b", + "msiof1_tx_b", }; static const char * const msiof2_groups[] = { @@ -3994,6 +4119,10 @@ static const char * const msiof3_groups[] = { "msiof3_ss2", "msiof3_rx", "msiof3_tx", + "msiof3_clk_b", + "msiof3_sync_b", + "msiof3_rx_b", + "msiof3_tx_b", }; static const char * const qspi_groups[] = { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups 2014-02-20 19:53 ` Geert Uytterhoeven @ 2014-02-20 19:53 ` Geert Uytterhoeven -1 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2014-02-20 19:53 UTC (permalink / raw) To: Linus Walleij, Laurent Pinchart Cc: linux-sh, linux-kernel, Geert Uytterhoeven From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> --- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 469 ++++++++++++++++++++++++++++++++++ 1 file changed, 469 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index 2a64589b5dc4..682ce5d51244 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -2049,6 +2049,92 @@ static const unsigned int msiof0_tx_pins[] = { static const unsigned int msiof0_tx_mux[] = { MSIOF0_TXD_MARK, }; + +static const unsigned int msiof0_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(0, 16), +}; +static const unsigned int msiof0_clk_b_mux[] = { + MSIOF0_SCK_B_MARK, +}; +static const unsigned int msiof0_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(0, 17), +}; +static const unsigned int msiof0_sync_b_mux[] = { + MSIOF0_SYNC_B_MARK, +}; +static const unsigned int msiof0_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(0, 18), +}; +static const unsigned int msiof0_ss1_b_mux[] = { + MSIOF0_SS1_B_MARK, +}; +static const unsigned int msiof0_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(0, 19), +}; +static const unsigned int msiof0_ss2_b_mux[] = { + MSIOF0_SS2_B_MARK, +}; +static const unsigned int msiof0_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(0, 21), +}; +static const unsigned int msiof0_rx_b_mux[] = { + MSIOF0_RXD_B_MARK, +}; +static const unsigned int msiof0_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 20), +}; +static const unsigned int msiof0_tx_b_mux[] = { + MSIOF0_TXD_B_MARK, +}; + +static const unsigned int msiof0_clk_c_pins[] = { + /* SCK */ + RCAR_GP_PIN(5, 26), +}; +static const unsigned int msiof0_clk_c_mux[] = { + MSIOF0_SCK_C_MARK, +}; +static const unsigned int msiof0_sync_c_pins[] = { + /* SYNC */ + RCAR_GP_PIN(5, 25), +}; +static const unsigned int msiof0_sync_c_mux[] = { + MSIOF0_SYNC_C_MARK, +}; +static const unsigned int msiof0_ss1_c_pins[] = { + /* SS1 */ + RCAR_GP_PIN(5, 27), +}; +static const unsigned int msiof0_ss1_c_mux[] = { + MSIOF0_SS1_C_MARK, +}; +static const unsigned int msiof0_ss2_c_pins[] = { + /* SS2 */ + RCAR_GP_PIN(5, 28), +}; +static const unsigned int msiof0_ss2_c_mux[] = { + MSIOF0_SS2_C_MARK, +}; +static const unsigned int msiof0_rx_c_pins[] = { + /* RXD */ + RCAR_GP_PIN(5, 29), +}; +static const unsigned int msiof0_rx_c_mux[] = { + MSIOF0_RXD_C_MARK, +}; +static const unsigned int msiof0_tx_c_pins[] = { + /* TXD */ + RCAR_GP_PIN(5, 30), +}; +static const unsigned int msiof0_tx_c_mux[] = { + MSIOF0_TXD_C_MARK, +}; /* - MSIOF1 ----------------------------------------------------------------- */ static const unsigned int msiof1_clk_pins[] = { /* SCK */ @@ -2092,6 +2178,143 @@ static const unsigned int msiof1_tx_pins[] = { static const unsigned int msiof1_tx_mux[] = { MSIOF1_TXD_MARK, }; + +static const unsigned int msiof1_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 29), +}; +static const unsigned int msiof1_clk_b_mux[] = { + MSIOF1_SCK_B_MARK, +}; +static const unsigned int msiof1_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 30), +}; +static const unsigned int msiof1_sync_b_mux[] = { + MSIOF1_SYNC_B_MARK, +}; +static const unsigned int msiof1_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(2, 31), +}; +static const unsigned int msiof1_ss1_b_mux[] = { + MSIOF1_SS1_B_MARK, +}; +static const unsigned int msiof1_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(7, 16), +}; +static const unsigned int msiof1_ss2_b_mux[] = { + MSIOF1_SS2_B_MARK, +}; +static const unsigned int msiof1_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(7, 18), +}; +static const unsigned int msiof1_rx_b_mux[] = { + MSIOF1_RXD_B_MARK, +}; +static const unsigned int msiof1_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(7, 17), +}; +static const unsigned int msiof1_tx_b_mux[] = { + MSIOF1_TXD_B_MARK, +}; + +static const unsigned int msiof1_clk_c_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 15), +}; +static const unsigned int msiof1_clk_c_mux[] = { + MSIOF1_SCK_C_MARK, +}; +static const unsigned int msiof1_sync_c_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 16), +}; +static const unsigned int msiof1_sync_c_mux[] = { + MSIOF1_SYNC_C_MARK, +}; +static const unsigned int msiof1_rx_c_pins[] = { + /* RXD */ + RCAR_GP_PIN(2, 18), +}; +static const unsigned int msiof1_rx_c_mux[] = { + MSIOF1_RXD_C_MARK, +}; +static const unsigned int msiof1_tx_c_pins[] = { + /* TXD */ + RCAR_GP_PIN(2, 17), +}; +static const unsigned int msiof1_tx_c_mux[] = { + MSIOF1_TXD_C_MARK, +}; + +static const unsigned int msiof1_clk_d_pins[] = { + /* SCK */ + RCAR_GP_PIN(0, 28), +}; +static const unsigned int msiof1_clk_d_mux[] = { + MSIOF1_SCK_D_MARK, +}; +static const unsigned int msiof1_sync_d_pins[] = { + /* SYNC */ + RCAR_GP_PIN(0, 30), +}; +static const unsigned int msiof1_sync_d_mux[] = { + MSIOF1_SYNC_D_MARK, +}; +static const unsigned int msiof1_ss1_d_pins[] = { + /* SS1 */ + RCAR_GP_PIN(0, 29), +}; +static const unsigned int msiof1_ss1_d_mux[] = { + MSIOF1_SS1_D_MARK, +}; +static const unsigned int msiof1_rx_d_pins[] = { + /* RXD */ + RCAR_GP_PIN(0, 26), +}; +static const unsigned int msiof1_rx_d_mux[] = { + MSIOF1_RXD_D_MARK, +}; +static const unsigned int msiof1_tx_d_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 26), +}; +static const unsigned int msiof1_tx_d_mux[] = { + MSIOF1_TXD_D_MARK, +}; + +static const unsigned int msiof1_clk_e_pins[] = { + /* SCK */ + RCAR_GP_PIN(5, 18), +}; +static const unsigned int msiof1_clk_e_mux[] = { + MSIOF1_SCK_E_MARK, +}; +static const unsigned int msiof1_sync_e_pins[] = { + /* SYNC */ + RCAR_GP_PIN(5, 19), +}; +static const unsigned int msiof1_sync_e_mux[] = { + MSIOF1_SYNC_E_MARK, +}; +static const unsigned int msiof1_rx_e_pins[] = { + /* RXD */ + RCAR_GP_PIN(5, 17), +}; +static const unsigned int msiof1_rx_e_mux[] = { + MSIOF1_RXD_E_MARK, +}; +static const unsigned int msiof1_tx_e_pins[] = { + /* TXD */ + RCAR_GP_PIN(5, 20), +}; +static const unsigned int msiof1_tx_e_mux[] = { + MSIOF1_TXD_E_MARK, +}; /* - MSIOF2 ----------------------------------------------------------------- */ static const unsigned int msiof2_clk_pins[] = { /* SCK */ @@ -2135,6 +2358,150 @@ static const unsigned int msiof2_tx_pins[] = { static const unsigned int msiof2_tx_mux[] = { MSIOF2_TXD_MARK, }; + +static const unsigned int msiof2_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(3, 0), +}; +static const unsigned int msiof2_clk_b_mux[] = { + MSIOF2_SCK_B_MARK, +}; +static const unsigned int msiof2_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(3, 1), +}; +static const unsigned int msiof2_sync_b_mux[] = { + MSIOF2_SYNC_B_MARK, +}; +static const unsigned int msiof2_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(3, 8), +}; +static const unsigned int msiof2_ss1_b_mux[] = { + MSIOF2_SS1_B_MARK, +}; +static const unsigned int msiof2_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(3, 9), +}; +static const unsigned int msiof2_ss2_b_mux[] = { + MSIOF2_SS2_B_MARK, +}; +static const unsigned int msiof2_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(3, 17), +}; +static const unsigned int msiof2_rx_b_mux[] = { + MSIOF2_RXD_B_MARK, +}; +static const unsigned int msiof2_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(3, 16), +}; +static const unsigned int msiof2_tx_b_mux[] = { + MSIOF2_TXD_B_MARK, +}; + +static const unsigned int msiof2_clk_c_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 2), +}; +static const unsigned int msiof2_clk_c_mux[] = { + MSIOF2_SCK_C_MARK, +}; +static const unsigned int msiof2_sync_c_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 3), +}; +static const unsigned int msiof2_sync_c_mux[] = { + MSIOF2_SYNC_C_MARK, +}; +static const unsigned int msiof2_rx_c_pins[] = { + /* RXD */ + RCAR_GP_PIN(2, 5), +}; +static const unsigned int msiof2_rx_c_mux[] = { + MSIOF2_RXD_C_MARK, +}; +static const unsigned int msiof2_tx_c_pins[] = { + /* TXD */ + RCAR_GP_PIN(2, 4), +}; +static const unsigned int msiof2_tx_c_mux[] = { + MSIOF2_TXD_C_MARK, +}; + +static const unsigned int msiof2_clk_d_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 14), +}; +static const unsigned int msiof2_clk_d_mux[] = { + MSIOF2_SCK_D_MARK, +}; +static const unsigned int msiof2_sync_d_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 15), +}; +static const unsigned int msiof2_sync_d_mux[] = { + MSIOF2_SYNC_D_MARK, +}; +static const unsigned int msiof2_ss1_d_pins[] = { + /* SS1 */ + RCAR_GP_PIN(2, 17), +}; +static const unsigned int msiof2_ss1_d_mux[] = { + MSIOF2_SS1_D_MARK, +}; +static const unsigned int msiof2_ss2_d_pins[] = { + /* SS2 */ + RCAR_GP_PIN(2, 18), +}; +static const unsigned int msiof2_ss2_d_mux[] = { + MSIOF2_SS2_D_MARK, +}; +static const unsigned int msiof2_rx_d_pins[] = { + /* RXD */ + RCAR_GP_PIN(2, 18), +}; +static const unsigned int msiof2_rx_d_mux[] = { + MSIOF2_RXD_D_MARK, +}; +static const unsigned int msiof2_tx_d_pins[] = { + /* TXD */ + RCAR_GP_PIN(2, 16), +}; +static const unsigned int msiof2_tx_d_mux[] = { + MSIOF2_TXD_D_MARK, +}; + +static const unsigned int msiof2_clk_e_pins[] = { + /* SCK */ + RCAR_GP_PIN(7, 15), +}; +static const unsigned int msiof2_clk_e_mux[] = { + MSIOF2_SCK_E_MARK, +}; +static const unsigned int msiof2_sync_e_pins[] = { + /* SYNC */ + RCAR_GP_PIN(7, 16), +}; +static const unsigned int msiof2_sync_e_mux[] = { + MSIOF2_SYNC_E_MARK, +}; +static const unsigned int msiof2_rx_e_pins[] = { + /* RXD */ + RCAR_GP_PIN(7, 14), +}; +static const unsigned int msiof2_rx_e_mux[] = { + MSIOF2_RXD_E_MARK, +}; +static const unsigned int msiof2_tx_e_pins[] = { + /* TXD */ + RCAR_GP_PIN(7, 13), +}; +static const unsigned int msiof2_tx_e_mux[] = { + MSIOF2_TXD_E_MARK, +}; /* - QSPI ------------------------------------------------------------------- */ static const unsigned int qspi_ctrl_pins[] = { /* SPCLK, SSL */ @@ -3184,18 +3551,69 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof0_ss2), SH_PFC_PIN_GROUP(msiof0_rx), SH_PFC_PIN_GROUP(msiof0_tx), + SH_PFC_PIN_GROUP(msiof0_clk_b), + SH_PFC_PIN_GROUP(msiof0_sync_b), + SH_PFC_PIN_GROUP(msiof0_ss1_b), + SH_PFC_PIN_GROUP(msiof0_ss2_b), + SH_PFC_PIN_GROUP(msiof0_rx_b), + SH_PFC_PIN_GROUP(msiof0_tx_b), + SH_PFC_PIN_GROUP(msiof0_clk_c), + SH_PFC_PIN_GROUP(msiof0_sync_c), + SH_PFC_PIN_GROUP(msiof0_ss1_c), + SH_PFC_PIN_GROUP(msiof0_ss2_c), + SH_PFC_PIN_GROUP(msiof0_rx_c), + SH_PFC_PIN_GROUP(msiof0_tx_c), SH_PFC_PIN_GROUP(msiof1_clk), SH_PFC_PIN_GROUP(msiof1_sync), SH_PFC_PIN_GROUP(msiof1_ss1), SH_PFC_PIN_GROUP(msiof1_ss2), SH_PFC_PIN_GROUP(msiof1_rx), SH_PFC_PIN_GROUP(msiof1_tx), + SH_PFC_PIN_GROUP(msiof1_clk_b), + SH_PFC_PIN_GROUP(msiof1_sync_b), + SH_PFC_PIN_GROUP(msiof1_ss1_b), + SH_PFC_PIN_GROUP(msiof1_ss2_b), + SH_PFC_PIN_GROUP(msiof1_rx_b), + SH_PFC_PIN_GROUP(msiof1_tx_b), + SH_PFC_PIN_GROUP(msiof1_clk_c), + SH_PFC_PIN_GROUP(msiof1_sync_c), + SH_PFC_PIN_GROUP(msiof1_rx_c), + SH_PFC_PIN_GROUP(msiof1_tx_c), + SH_PFC_PIN_GROUP(msiof1_clk_d), + SH_PFC_PIN_GROUP(msiof1_sync_d), + SH_PFC_PIN_GROUP(msiof1_ss1_d), + SH_PFC_PIN_GROUP(msiof1_rx_d), + SH_PFC_PIN_GROUP(msiof1_tx_d), + SH_PFC_PIN_GROUP(msiof1_clk_e), + SH_PFC_PIN_GROUP(msiof1_sync_e), + SH_PFC_PIN_GROUP(msiof1_rx_e), + SH_PFC_PIN_GROUP(msiof1_tx_e), SH_PFC_PIN_GROUP(msiof2_clk), SH_PFC_PIN_GROUP(msiof2_sync), SH_PFC_PIN_GROUP(msiof2_ss1), SH_PFC_PIN_GROUP(msiof2_ss2), SH_PFC_PIN_GROUP(msiof2_rx), SH_PFC_PIN_GROUP(msiof2_tx), + SH_PFC_PIN_GROUP(msiof2_clk_b), + SH_PFC_PIN_GROUP(msiof2_sync_b), + SH_PFC_PIN_GROUP(msiof2_ss1_b), + SH_PFC_PIN_GROUP(msiof2_ss2_b), + SH_PFC_PIN_GROUP(msiof2_rx_b), + SH_PFC_PIN_GROUP(msiof2_tx_b), + SH_PFC_PIN_GROUP(msiof2_clk_c), + SH_PFC_PIN_GROUP(msiof2_sync_c), + SH_PFC_PIN_GROUP(msiof2_rx_c), + SH_PFC_PIN_GROUP(msiof2_tx_c), + SH_PFC_PIN_GROUP(msiof2_clk_d), + SH_PFC_PIN_GROUP(msiof2_sync_d), + SH_PFC_PIN_GROUP(msiof2_ss1_d), + SH_PFC_PIN_GROUP(msiof2_ss2_d), + SH_PFC_PIN_GROUP(msiof2_rx_d), + SH_PFC_PIN_GROUP(msiof2_tx_d), + SH_PFC_PIN_GROUP(msiof2_clk_e), + SH_PFC_PIN_GROUP(msiof2_sync_e), + SH_PFC_PIN_GROUP(msiof2_rx_e), + SH_PFC_PIN_GROUP(msiof2_tx_e), SH_PFC_PIN_GROUP(qspi_ctrl), SH_PFC_PIN_GROUP(qspi_data2), SH_PFC_PIN_GROUP(qspi_data4), @@ -3409,6 +3827,18 @@ static const char * const msiof0_groups[] = { "msiof0_ss2", "msiof0_rx", "msiof0_tx", + "msiof0_clk_b", + "msiof0_sync_b", + "msiof0_ss1_b", + "msiof0_ss2_b", + "msiof0_rx_b", + "msiof0_tx_b", + "msiof0_clk_c", + "msiof0_sync_c", + "msiof0_ss1_c", + "msiof0_ss2_c", + "msiof0_rx_c", + "msiof0_tx_c", }; static const char * const msiof1_groups[] = { @@ -3418,6 +3848,25 @@ static const char * const msiof1_groups[] = { "msiof1_ss2", "msiof1_rx", "msiof1_tx", + "msiof1_clk_b", + "msiof1_sync_b", + "msiof1_ss1_b", + "msiof1_ss2_b", + "msiof1_rx_b", + "msiof1_tx_b", + "msiof1_clk_c", + "msiof1_sync_c", + "msiof1_rx_c", + "msiof1_tx_c", + "msiof1_clk_d", + "msiof1_sync_d", + "msiof1_ss1_d", + "msiof1_rx_d", + "msiof1_tx_d", + "msiof1_clk_e", + "msiof1_sync_e", + "msiof1_rx_e", + "msiof1_tx_e", }; static const char * const msiof2_groups[] = { @@ -3427,6 +3876,26 @@ static const char * const msiof2_groups[] = { "msiof2_ss2", "msiof2_rx", "msiof2_tx", + "msiof2_clk_b", + "msiof2_sync_b", + "msiof2_ss1_b", + "msiof2_ss2_b", + "msiof2_rx_b", + "msiof2_tx_b", + "msiof2_clk_c", + "msiof2_sync_c", + "msiof2_rx_c", + "msiof2_tx_c", + "msiof2_clk_d", + "msiof2_sync_d", + "msiof2_ss1_d", + "msiof2_ss2_d", + "msiof2_rx_d", + "msiof2_tx_d", + "msiof2_clk_e", + "msiof2_sync_e", + "msiof2_rx_e", + "msiof2_tx_e", }; static const char * const qspi_groups[] = { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups @ 2014-02-20 19:53 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2014-02-20 19:53 UTC (permalink / raw) To: Linus Walleij, Laurent Pinchart Cc: linux-sh, linux-kernel, Geert Uytterhoeven From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> --- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 469 ++++++++++++++++++++++++++++++++++ 1 file changed, 469 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index 2a64589b5dc4..682ce5d51244 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -2049,6 +2049,92 @@ static const unsigned int msiof0_tx_pins[] = { static const unsigned int msiof0_tx_mux[] = { MSIOF0_TXD_MARK, }; + +static const unsigned int msiof0_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(0, 16), +}; +static const unsigned int msiof0_clk_b_mux[] = { + MSIOF0_SCK_B_MARK, +}; +static const unsigned int msiof0_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(0, 17), +}; +static const unsigned int msiof0_sync_b_mux[] = { + MSIOF0_SYNC_B_MARK, +}; +static const unsigned int msiof0_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(0, 18), +}; +static const unsigned int msiof0_ss1_b_mux[] = { + MSIOF0_SS1_B_MARK, +}; +static const unsigned int msiof0_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(0, 19), +}; +static const unsigned int msiof0_ss2_b_mux[] = { + MSIOF0_SS2_B_MARK, +}; +static const unsigned int msiof0_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(0, 21), +}; +static const unsigned int msiof0_rx_b_mux[] = { + MSIOF0_RXD_B_MARK, +}; +static const unsigned int msiof0_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 20), +}; +static const unsigned int msiof0_tx_b_mux[] = { + MSIOF0_TXD_B_MARK, +}; + +static const unsigned int msiof0_clk_c_pins[] = { + /* SCK */ + RCAR_GP_PIN(5, 26), +}; +static const unsigned int msiof0_clk_c_mux[] = { + MSIOF0_SCK_C_MARK, +}; +static const unsigned int msiof0_sync_c_pins[] = { + /* SYNC */ + RCAR_GP_PIN(5, 25), +}; +static const unsigned int msiof0_sync_c_mux[] = { + MSIOF0_SYNC_C_MARK, +}; +static const unsigned int msiof0_ss1_c_pins[] = { + /* SS1 */ + RCAR_GP_PIN(5, 27), +}; +static const unsigned int msiof0_ss1_c_mux[] = { + MSIOF0_SS1_C_MARK, +}; +static const unsigned int msiof0_ss2_c_pins[] = { + /* SS2 */ + RCAR_GP_PIN(5, 28), +}; +static const unsigned int msiof0_ss2_c_mux[] = { + MSIOF0_SS2_C_MARK, +}; +static const unsigned int msiof0_rx_c_pins[] = { + /* RXD */ + RCAR_GP_PIN(5, 29), +}; +static const unsigned int msiof0_rx_c_mux[] = { + MSIOF0_RXD_C_MARK, +}; +static const unsigned int msiof0_tx_c_pins[] = { + /* TXD */ + RCAR_GP_PIN(5, 30), +}; +static const unsigned int msiof0_tx_c_mux[] = { + MSIOF0_TXD_C_MARK, +}; /* - MSIOF1 ----------------------------------------------------------------- */ static const unsigned int msiof1_clk_pins[] = { /* SCK */ @@ -2092,6 +2178,143 @@ static const unsigned int msiof1_tx_pins[] = { static const unsigned int msiof1_tx_mux[] = { MSIOF1_TXD_MARK, }; + +static const unsigned int msiof1_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 29), +}; +static const unsigned int msiof1_clk_b_mux[] = { + MSIOF1_SCK_B_MARK, +}; +static const unsigned int msiof1_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 30), +}; +static const unsigned int msiof1_sync_b_mux[] = { + MSIOF1_SYNC_B_MARK, +}; +static const unsigned int msiof1_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(2, 31), +}; +static const unsigned int msiof1_ss1_b_mux[] = { + MSIOF1_SS1_B_MARK, +}; +static const unsigned int msiof1_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(7, 16), +}; +static const unsigned int msiof1_ss2_b_mux[] = { + MSIOF1_SS2_B_MARK, +}; +static const unsigned int msiof1_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(7, 18), +}; +static const unsigned int msiof1_rx_b_mux[] = { + MSIOF1_RXD_B_MARK, +}; +static const unsigned int msiof1_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(7, 17), +}; +static const unsigned int msiof1_tx_b_mux[] = { + MSIOF1_TXD_B_MARK, +}; + +static const unsigned int msiof1_clk_c_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 15), +}; +static const unsigned int msiof1_clk_c_mux[] = { + MSIOF1_SCK_C_MARK, +}; +static const unsigned int msiof1_sync_c_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 16), +}; +static const unsigned int msiof1_sync_c_mux[] = { + MSIOF1_SYNC_C_MARK, +}; +static const unsigned int msiof1_rx_c_pins[] = { + /* RXD */ + RCAR_GP_PIN(2, 18), +}; +static const unsigned int msiof1_rx_c_mux[] = { + MSIOF1_RXD_C_MARK, +}; +static const unsigned int msiof1_tx_c_pins[] = { + /* TXD */ + RCAR_GP_PIN(2, 17), +}; +static const unsigned int msiof1_tx_c_mux[] = { + MSIOF1_TXD_C_MARK, +}; + +static const unsigned int msiof1_clk_d_pins[] = { + /* SCK */ + RCAR_GP_PIN(0, 28), +}; +static const unsigned int msiof1_clk_d_mux[] = { + MSIOF1_SCK_D_MARK, +}; +static const unsigned int msiof1_sync_d_pins[] = { + /* SYNC */ + RCAR_GP_PIN(0, 30), +}; +static const unsigned int msiof1_sync_d_mux[] = { + MSIOF1_SYNC_D_MARK, +}; +static const unsigned int msiof1_ss1_d_pins[] = { + /* SS1 */ + RCAR_GP_PIN(0, 29), +}; +static const unsigned int msiof1_ss1_d_mux[] = { + MSIOF1_SS1_D_MARK, +}; +static const unsigned int msiof1_rx_d_pins[] = { + /* RXD */ + RCAR_GP_PIN(0, 26), +}; +static const unsigned int msiof1_rx_d_mux[] = { + MSIOF1_RXD_D_MARK, +}; +static const unsigned int msiof1_tx_d_pins[] = { + /* TXD */ + RCAR_GP_PIN(0, 26), +}; +static const unsigned int msiof1_tx_d_mux[] = { + MSIOF1_TXD_D_MARK, +}; + +static const unsigned int msiof1_clk_e_pins[] = { + /* SCK */ + RCAR_GP_PIN(5, 18), +}; +static const unsigned int msiof1_clk_e_mux[] = { + MSIOF1_SCK_E_MARK, +}; +static const unsigned int msiof1_sync_e_pins[] = { + /* SYNC */ + RCAR_GP_PIN(5, 19), +}; +static const unsigned int msiof1_sync_e_mux[] = { + MSIOF1_SYNC_E_MARK, +}; +static const unsigned int msiof1_rx_e_pins[] = { + /* RXD */ + RCAR_GP_PIN(5, 17), +}; +static const unsigned int msiof1_rx_e_mux[] = { + MSIOF1_RXD_E_MARK, +}; +static const unsigned int msiof1_tx_e_pins[] = { + /* TXD */ + RCAR_GP_PIN(5, 20), +}; +static const unsigned int msiof1_tx_e_mux[] = { + MSIOF1_TXD_E_MARK, +}; /* - MSIOF2 ----------------------------------------------------------------- */ static const unsigned int msiof2_clk_pins[] = { /* SCK */ @@ -2135,6 +2358,150 @@ static const unsigned int msiof2_tx_pins[] = { static const unsigned int msiof2_tx_mux[] = { MSIOF2_TXD_MARK, }; + +static const unsigned int msiof2_clk_b_pins[] = { + /* SCK */ + RCAR_GP_PIN(3, 0), +}; +static const unsigned int msiof2_clk_b_mux[] = { + MSIOF2_SCK_B_MARK, +}; +static const unsigned int msiof2_sync_b_pins[] = { + /* SYNC */ + RCAR_GP_PIN(3, 1), +}; +static const unsigned int msiof2_sync_b_mux[] = { + MSIOF2_SYNC_B_MARK, +}; +static const unsigned int msiof2_ss1_b_pins[] = { + /* SS1 */ + RCAR_GP_PIN(3, 8), +}; +static const unsigned int msiof2_ss1_b_mux[] = { + MSIOF2_SS1_B_MARK, +}; +static const unsigned int msiof2_ss2_b_pins[] = { + /* SS2 */ + RCAR_GP_PIN(3, 9), +}; +static const unsigned int msiof2_ss2_b_mux[] = { + MSIOF2_SS2_B_MARK, +}; +static const unsigned int msiof2_rx_b_pins[] = { + /* RXD */ + RCAR_GP_PIN(3, 17), +}; +static const unsigned int msiof2_rx_b_mux[] = { + MSIOF2_RXD_B_MARK, +}; +static const unsigned int msiof2_tx_b_pins[] = { + /* TXD */ + RCAR_GP_PIN(3, 16), +}; +static const unsigned int msiof2_tx_b_mux[] = { + MSIOF2_TXD_B_MARK, +}; + +static const unsigned int msiof2_clk_c_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 2), +}; +static const unsigned int msiof2_clk_c_mux[] = { + MSIOF2_SCK_C_MARK, +}; +static const unsigned int msiof2_sync_c_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 3), +}; +static const unsigned int msiof2_sync_c_mux[] = { + MSIOF2_SYNC_C_MARK, +}; +static const unsigned int msiof2_rx_c_pins[] = { + /* RXD */ + RCAR_GP_PIN(2, 5), +}; +static const unsigned int msiof2_rx_c_mux[] = { + MSIOF2_RXD_C_MARK, +}; +static const unsigned int msiof2_tx_c_pins[] = { + /* TXD */ + RCAR_GP_PIN(2, 4), +}; +static const unsigned int msiof2_tx_c_mux[] = { + MSIOF2_TXD_C_MARK, +}; + +static const unsigned int msiof2_clk_d_pins[] = { + /* SCK */ + RCAR_GP_PIN(2, 14), +}; +static const unsigned int msiof2_clk_d_mux[] = { + MSIOF2_SCK_D_MARK, +}; +static const unsigned int msiof2_sync_d_pins[] = { + /* SYNC */ + RCAR_GP_PIN(2, 15), +}; +static const unsigned int msiof2_sync_d_mux[] = { + MSIOF2_SYNC_D_MARK, +}; +static const unsigned int msiof2_ss1_d_pins[] = { + /* SS1 */ + RCAR_GP_PIN(2, 17), +}; +static const unsigned int msiof2_ss1_d_mux[] = { + MSIOF2_SS1_D_MARK, +}; +static const unsigned int msiof2_ss2_d_pins[] = { + /* SS2 */ + RCAR_GP_PIN(2, 18), +}; +static const unsigned int msiof2_ss2_d_mux[] = { + MSIOF2_SS2_D_MARK, +}; +static const unsigned int msiof2_rx_d_pins[] = { + /* RXD */ + RCAR_GP_PIN(2, 18), +}; +static const unsigned int msiof2_rx_d_mux[] = { + MSIOF2_RXD_D_MARK, +}; +static const unsigned int msiof2_tx_d_pins[] = { + /* TXD */ + RCAR_GP_PIN(2, 16), +}; +static const unsigned int msiof2_tx_d_mux[] = { + MSIOF2_TXD_D_MARK, +}; + +static const unsigned int msiof2_clk_e_pins[] = { + /* SCK */ + RCAR_GP_PIN(7, 15), +}; +static const unsigned int msiof2_clk_e_mux[] = { + MSIOF2_SCK_E_MARK, +}; +static const unsigned int msiof2_sync_e_pins[] = { + /* SYNC */ + RCAR_GP_PIN(7, 16), +}; +static const unsigned int msiof2_sync_e_mux[] = { + MSIOF2_SYNC_E_MARK, +}; +static const unsigned int msiof2_rx_e_pins[] = { + /* RXD */ + RCAR_GP_PIN(7, 14), +}; +static const unsigned int msiof2_rx_e_mux[] = { + MSIOF2_RXD_E_MARK, +}; +static const unsigned int msiof2_tx_e_pins[] = { + /* TXD */ + RCAR_GP_PIN(7, 13), +}; +static const unsigned int msiof2_tx_e_mux[] = { + MSIOF2_TXD_E_MARK, +}; /* - QSPI ------------------------------------------------------------------- */ static const unsigned int qspi_ctrl_pins[] = { /* SPCLK, SSL */ @@ -3184,18 +3551,69 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof0_ss2), SH_PFC_PIN_GROUP(msiof0_rx), SH_PFC_PIN_GROUP(msiof0_tx), + SH_PFC_PIN_GROUP(msiof0_clk_b), + SH_PFC_PIN_GROUP(msiof0_sync_b), + SH_PFC_PIN_GROUP(msiof0_ss1_b), + SH_PFC_PIN_GROUP(msiof0_ss2_b), + SH_PFC_PIN_GROUP(msiof0_rx_b), + SH_PFC_PIN_GROUP(msiof0_tx_b), + SH_PFC_PIN_GROUP(msiof0_clk_c), + SH_PFC_PIN_GROUP(msiof0_sync_c), + SH_PFC_PIN_GROUP(msiof0_ss1_c), + SH_PFC_PIN_GROUP(msiof0_ss2_c), + SH_PFC_PIN_GROUP(msiof0_rx_c), + SH_PFC_PIN_GROUP(msiof0_tx_c), SH_PFC_PIN_GROUP(msiof1_clk), SH_PFC_PIN_GROUP(msiof1_sync), SH_PFC_PIN_GROUP(msiof1_ss1), SH_PFC_PIN_GROUP(msiof1_ss2), SH_PFC_PIN_GROUP(msiof1_rx), SH_PFC_PIN_GROUP(msiof1_tx), + SH_PFC_PIN_GROUP(msiof1_clk_b), + SH_PFC_PIN_GROUP(msiof1_sync_b), + SH_PFC_PIN_GROUP(msiof1_ss1_b), + SH_PFC_PIN_GROUP(msiof1_ss2_b), + SH_PFC_PIN_GROUP(msiof1_rx_b), + SH_PFC_PIN_GROUP(msiof1_tx_b), + SH_PFC_PIN_GROUP(msiof1_clk_c), + SH_PFC_PIN_GROUP(msiof1_sync_c), + SH_PFC_PIN_GROUP(msiof1_rx_c), + SH_PFC_PIN_GROUP(msiof1_tx_c), + SH_PFC_PIN_GROUP(msiof1_clk_d), + SH_PFC_PIN_GROUP(msiof1_sync_d), + SH_PFC_PIN_GROUP(msiof1_ss1_d), + SH_PFC_PIN_GROUP(msiof1_rx_d), + SH_PFC_PIN_GROUP(msiof1_tx_d), + SH_PFC_PIN_GROUP(msiof1_clk_e), + SH_PFC_PIN_GROUP(msiof1_sync_e), + SH_PFC_PIN_GROUP(msiof1_rx_e), + SH_PFC_PIN_GROUP(msiof1_tx_e), SH_PFC_PIN_GROUP(msiof2_clk), SH_PFC_PIN_GROUP(msiof2_sync), SH_PFC_PIN_GROUP(msiof2_ss1), SH_PFC_PIN_GROUP(msiof2_ss2), SH_PFC_PIN_GROUP(msiof2_rx), SH_PFC_PIN_GROUP(msiof2_tx), + SH_PFC_PIN_GROUP(msiof2_clk_b), + SH_PFC_PIN_GROUP(msiof2_sync_b), + SH_PFC_PIN_GROUP(msiof2_ss1_b), + SH_PFC_PIN_GROUP(msiof2_ss2_b), + SH_PFC_PIN_GROUP(msiof2_rx_b), + SH_PFC_PIN_GROUP(msiof2_tx_b), + SH_PFC_PIN_GROUP(msiof2_clk_c), + SH_PFC_PIN_GROUP(msiof2_sync_c), + SH_PFC_PIN_GROUP(msiof2_rx_c), + SH_PFC_PIN_GROUP(msiof2_tx_c), + SH_PFC_PIN_GROUP(msiof2_clk_d), + SH_PFC_PIN_GROUP(msiof2_sync_d), + SH_PFC_PIN_GROUP(msiof2_ss1_d), + SH_PFC_PIN_GROUP(msiof2_ss2_d), + SH_PFC_PIN_GROUP(msiof2_rx_d), + SH_PFC_PIN_GROUP(msiof2_tx_d), + SH_PFC_PIN_GROUP(msiof2_clk_e), + SH_PFC_PIN_GROUP(msiof2_sync_e), + SH_PFC_PIN_GROUP(msiof2_rx_e), + SH_PFC_PIN_GROUP(msiof2_tx_e), SH_PFC_PIN_GROUP(qspi_ctrl), SH_PFC_PIN_GROUP(qspi_data2), SH_PFC_PIN_GROUP(qspi_data4), @@ -3409,6 +3827,18 @@ static const char * const msiof0_groups[] = { "msiof0_ss2", "msiof0_rx", "msiof0_tx", + "msiof0_clk_b", + "msiof0_sync_b", + "msiof0_ss1_b", + "msiof0_ss2_b", + "msiof0_rx_b", + "msiof0_tx_b", + "msiof0_clk_c", + "msiof0_sync_c", + "msiof0_ss1_c", + "msiof0_ss2_c", + "msiof0_rx_c", + "msiof0_tx_c", }; static const char * const msiof1_groups[] = { @@ -3418,6 +3848,25 @@ static const char * const msiof1_groups[] = { "msiof1_ss2", "msiof1_rx", "msiof1_tx", + "msiof1_clk_b", + "msiof1_sync_b", + "msiof1_ss1_b", + "msiof1_ss2_b", + "msiof1_rx_b", + "msiof1_tx_b", + "msiof1_clk_c", + "msiof1_sync_c", + "msiof1_rx_c", + "msiof1_tx_c", + "msiof1_clk_d", + "msiof1_sync_d", + "msiof1_ss1_d", + "msiof1_rx_d", + "msiof1_tx_d", + "msiof1_clk_e", + "msiof1_sync_e", + "msiof1_rx_e", + "msiof1_tx_e", }; static const char * const msiof2_groups[] = { @@ -3427,6 +3876,26 @@ static const char * const msiof2_groups[] = { "msiof2_ss2", "msiof2_rx", "msiof2_tx", + "msiof2_clk_b", + "msiof2_sync_b", + "msiof2_ss1_b", + "msiof2_ss2_b", + "msiof2_rx_b", + "msiof2_tx_b", + "msiof2_clk_c", + "msiof2_sync_c", + "msiof2_rx_c", + "msiof2_tx_c", + "msiof2_clk_d", + "msiof2_sync_d", + "msiof2_ss1_d", + "msiof2_ss2_d", + "msiof2_rx_d", + "msiof2_tx_d", + "msiof2_clk_e", + "msiof2_sync_e", + "msiof2_rx_e", + "msiof2_tx_e", }; static const char * const qspi_groups[] = { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups 2014-02-20 19:53 ` Geert Uytterhoeven @ 2014-02-25 17:19 ` Laurent Pinchart -1 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 17:19 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Linus Walleij, linux-sh, linux-kernel, Geert Uytterhoeven Hi Geert, Thank you for the patch. On Thursday 20 February 2014 20:53:41 Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Please see below for two small issues. After fixing them, Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 469 +++++++++++++++++++++++++++++++ > 1 file changed, 469 insertions(+) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index 2a64589b5dc4..682ce5d51244 > 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c > @@ -2049,6 +2049,92 @@ static const unsigned int msiof0_tx_pins[] = { > static const unsigned int msiof0_tx_mux[] = { > MSIOF0_TXD_MARK, > }; > + > +static const unsigned int msiof0_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(0, 16), > +}; > +static const unsigned int msiof0_clk_b_mux[] = { > + MSIOF0_SCK_B_MARK, > +}; > +static const unsigned int msiof0_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(0, 17), > +}; > +static const unsigned int msiof0_sync_b_mux[] = { > + MSIOF0_SYNC_B_MARK, > +}; > +static const unsigned int msiof0_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(0, 18), > +}; > +static const unsigned int msiof0_ss1_b_mux[] = { > + MSIOF0_SS1_B_MARK, > +}; > +static const unsigned int msiof0_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(0, 19), > +}; > +static const unsigned int msiof0_ss2_b_mux[] = { > + MSIOF0_SS2_B_MARK, > +}; > +static const unsigned int msiof0_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(0, 21), > +}; > +static const unsigned int msiof0_rx_b_mux[] = { > + MSIOF0_RXD_B_MARK, > +}; > +static const unsigned int msiof0_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 20), > +}; > +static const unsigned int msiof0_tx_b_mux[] = { > + MSIOF0_TXD_B_MARK, > +}; > + > +static const unsigned int msiof0_clk_c_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(5, 26), > +}; > +static const unsigned int msiof0_clk_c_mux[] = { > + MSIOF0_SCK_C_MARK, > +}; > +static const unsigned int msiof0_sync_c_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(5, 25), > +}; > +static const unsigned int msiof0_sync_c_mux[] = { > + MSIOF0_SYNC_C_MARK, > +}; > +static const unsigned int msiof0_ss1_c_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(5, 27), > +}; > +static const unsigned int msiof0_ss1_c_mux[] = { > + MSIOF0_SS1_C_MARK, > +}; > +static const unsigned int msiof0_ss2_c_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(5, 28), > +}; > +static const unsigned int msiof0_ss2_c_mux[] = { > + MSIOF0_SS2_C_MARK, > +}; > +static const unsigned int msiof0_rx_c_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(5, 29), > +}; > +static const unsigned int msiof0_rx_c_mux[] = { > + MSIOF0_RXD_C_MARK, > +}; > +static const unsigned int msiof0_tx_c_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(5, 30), > +}; > +static const unsigned int msiof0_tx_c_mux[] = { > + MSIOF0_TXD_C_MARK, > +}; > /* - MSIOF1 ------------------------------------------------------------ */ > static const unsigned int msiof1_clk_pins[] = { > /* SCK */ > @@ -2092,6 +2178,143 @@ static const unsigned int msiof1_tx_pins[] = { > static const unsigned int msiof1_tx_mux[] = { > MSIOF1_TXD_MARK, > }; > + > +static const unsigned int msiof1_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 29), > +}; > +static const unsigned int msiof1_clk_b_mux[] = { > + MSIOF1_SCK_B_MARK, > +}; > +static const unsigned int msiof1_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 30), > +}; > +static const unsigned int msiof1_sync_b_mux[] = { > + MSIOF1_SYNC_B_MARK, > +}; > +static const unsigned int msiof1_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(2, 31), > +}; > +static const unsigned int msiof1_ss1_b_mux[] = { > + MSIOF1_SS1_B_MARK, > +}; > +static const unsigned int msiof1_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(7, 16), > +}; > +static const unsigned int msiof1_ss2_b_mux[] = { > + MSIOF1_SS2_B_MARK, > +}; > +static const unsigned int msiof1_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(7, 18), > +}; > +static const unsigned int msiof1_rx_b_mux[] = { > + MSIOF1_RXD_B_MARK, > +}; > +static const unsigned int msiof1_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(7, 17), > +}; > +static const unsigned int msiof1_tx_b_mux[] = { > + MSIOF1_TXD_B_MARK, > +}; > + > +static const unsigned int msiof1_clk_c_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 15), > +}; > +static const unsigned int msiof1_clk_c_mux[] = { > + MSIOF1_SCK_C_MARK, > +}; > +static const unsigned int msiof1_sync_c_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 16), > +}; > +static const unsigned int msiof1_sync_c_mux[] = { > + MSIOF1_SYNC_C_MARK, > +}; > +static const unsigned int msiof1_rx_c_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(2, 18), > +}; > +static const unsigned int msiof1_rx_c_mux[] = { > + MSIOF1_RXD_C_MARK, > +}; > +static const unsigned int msiof1_tx_c_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(2, 17), > +}; > +static const unsigned int msiof1_tx_c_mux[] = { > + MSIOF1_TXD_C_MARK, > +}; > + > +static const unsigned int msiof1_clk_d_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(0, 28), > +}; > +static const unsigned int msiof1_clk_d_mux[] = { > + MSIOF1_SCK_D_MARK, > +}; > +static const unsigned int msiof1_sync_d_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(0, 30), > +}; > +static const unsigned int msiof1_sync_d_mux[] = { > + MSIOF1_SYNC_D_MARK, > +}; > +static const unsigned int msiof1_ss1_d_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(0, 29), > +}; > +static const unsigned int msiof1_ss1_d_mux[] = { > + MSIOF1_SS1_D_MARK, > +}; > +static const unsigned int msiof1_rx_d_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(0, 26), This should be (0, 27). > +}; > +static const unsigned int msiof1_rx_d_mux[] = { > + MSIOF1_RXD_D_MARK, > +}; > +static const unsigned int msiof1_tx_d_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 26), > +}; > +static const unsigned int msiof1_tx_d_mux[] = { > + MSIOF1_TXD_D_MARK, > +}; > + > +static const unsigned int msiof1_clk_e_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(5, 18), > +}; > +static const unsigned int msiof1_clk_e_mux[] = { > + MSIOF1_SCK_E_MARK, > +}; > +static const unsigned int msiof1_sync_e_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(5, 19), > +}; > +static const unsigned int msiof1_sync_e_mux[] = { > + MSIOF1_SYNC_E_MARK, > +}; > +static const unsigned int msiof1_rx_e_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(5, 17), > +}; > +static const unsigned int msiof1_rx_e_mux[] = { > + MSIOF1_RXD_E_MARK, > +}; > +static const unsigned int msiof1_tx_e_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(5, 20), > +}; > +static const unsigned int msiof1_tx_e_mux[] = { > + MSIOF1_TXD_E_MARK, > +}; > /* - MSIOF2 ------------------------------------------------------------ */ > static const unsigned int msiof2_clk_pins[] = { > /* SCK */ > @@ -2135,6 +2358,150 @@ static const unsigned int msiof2_tx_pins[] = { > static const unsigned int msiof2_tx_mux[] = { > MSIOF2_TXD_MARK, > }; > + > +static const unsigned int msiof2_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(3, 0), > +}; > +static const unsigned int msiof2_clk_b_mux[] = { > + MSIOF2_SCK_B_MARK, > +}; > +static const unsigned int msiof2_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(3, 1), > +}; > +static const unsigned int msiof2_sync_b_mux[] = { > + MSIOF2_SYNC_B_MARK, > +}; > +static const unsigned int msiof2_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(3, 8), > +}; > +static const unsigned int msiof2_ss1_b_mux[] = { > + MSIOF2_SS1_B_MARK, > +}; > +static const unsigned int msiof2_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(3, 9), > +}; > +static const unsigned int msiof2_ss2_b_mux[] = { > + MSIOF2_SS2_B_MARK, > +}; > +static const unsigned int msiof2_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(3, 17), > +}; > +static const unsigned int msiof2_rx_b_mux[] = { > + MSIOF2_RXD_B_MARK, > +}; > +static const unsigned int msiof2_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(3, 16), > +}; > +static const unsigned int msiof2_tx_b_mux[] = { > + MSIOF2_TXD_B_MARK, > +}; > + > +static const unsigned int msiof2_clk_c_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 2), > +}; > +static const unsigned int msiof2_clk_c_mux[] = { > + MSIOF2_SCK_C_MARK, > +}; > +static const unsigned int msiof2_sync_c_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 3), > +}; > +static const unsigned int msiof2_sync_c_mux[] = { > + MSIOF2_SYNC_C_MARK, > +}; > +static const unsigned int msiof2_rx_c_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(2, 5), > +}; > +static const unsigned int msiof2_rx_c_mux[] = { > + MSIOF2_RXD_C_MARK, > +}; > +static const unsigned int msiof2_tx_c_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(2, 4), > +}; > +static const unsigned int msiof2_tx_c_mux[] = { > + MSIOF2_TXD_C_MARK, > +}; > + > +static const unsigned int msiof2_clk_d_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 14), > +}; > +static const unsigned int msiof2_clk_d_mux[] = { > + MSIOF2_SCK_D_MARK, > +}; > +static const unsigned int msiof2_sync_d_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 15), > +}; > +static const unsigned int msiof2_sync_d_mux[] = { > + MSIOF2_SYNC_D_MARK, > +}; > +static const unsigned int msiof2_ss1_d_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(2, 17), > +}; > +static const unsigned int msiof2_ss1_d_mux[] = { > + MSIOF2_SS1_D_MARK, > +}; > +static const unsigned int msiof2_ss2_d_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(2, 18), This should be (2, 19). > +}; > +static const unsigned int msiof2_ss2_d_mux[] = { > + MSIOF2_SS2_D_MARK, > +}; > +static const unsigned int msiof2_rx_d_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(2, 18), > +}; > +static const unsigned int msiof2_rx_d_mux[] = { > + MSIOF2_RXD_D_MARK, > +}; > +static const unsigned int msiof2_tx_d_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(2, 16), > +}; > +static const unsigned int msiof2_tx_d_mux[] = { > + MSIOF2_TXD_D_MARK, > +}; > + > +static const unsigned int msiof2_clk_e_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(7, 15), > +}; > +static const unsigned int msiof2_clk_e_mux[] = { > + MSIOF2_SCK_E_MARK, > +}; > +static const unsigned int msiof2_sync_e_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(7, 16), > +}; > +static const unsigned int msiof2_sync_e_mux[] = { > + MSIOF2_SYNC_E_MARK, > +}; > +static const unsigned int msiof2_rx_e_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(7, 14), > +}; > +static const unsigned int msiof2_rx_e_mux[] = { > + MSIOF2_RXD_E_MARK, > +}; > +static const unsigned int msiof2_tx_e_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(7, 13), > +}; > +static const unsigned int msiof2_tx_e_mux[] = { > + MSIOF2_TXD_E_MARK, > +}; > /* - QSPI -------------------------------------------------------------- */ > static const unsigned int qspi_ctrl_pins[] = { > /* SPCLK, SSL */ > @@ -3184,18 +3551,69 @@ static const struct sh_pfc_pin_group pinmux_groups[] > = { SH_PFC_PIN_GROUP(msiof0_ss2), > SH_PFC_PIN_GROUP(msiof0_rx), > SH_PFC_PIN_GROUP(msiof0_tx), > + SH_PFC_PIN_GROUP(msiof0_clk_b), > + SH_PFC_PIN_GROUP(msiof0_sync_b), > + SH_PFC_PIN_GROUP(msiof0_ss1_b), > + SH_PFC_PIN_GROUP(msiof0_ss2_b), > + SH_PFC_PIN_GROUP(msiof0_rx_b), > + SH_PFC_PIN_GROUP(msiof0_tx_b), > + SH_PFC_PIN_GROUP(msiof0_clk_c), > + SH_PFC_PIN_GROUP(msiof0_sync_c), > + SH_PFC_PIN_GROUP(msiof0_ss1_c), > + SH_PFC_PIN_GROUP(msiof0_ss2_c), > + SH_PFC_PIN_GROUP(msiof0_rx_c), > + SH_PFC_PIN_GROUP(msiof0_tx_c), > SH_PFC_PIN_GROUP(msiof1_clk), > SH_PFC_PIN_GROUP(msiof1_sync), > SH_PFC_PIN_GROUP(msiof1_ss1), > SH_PFC_PIN_GROUP(msiof1_ss2), > SH_PFC_PIN_GROUP(msiof1_rx), > SH_PFC_PIN_GROUP(msiof1_tx), > + SH_PFC_PIN_GROUP(msiof1_clk_b), > + SH_PFC_PIN_GROUP(msiof1_sync_b), > + SH_PFC_PIN_GROUP(msiof1_ss1_b), > + SH_PFC_PIN_GROUP(msiof1_ss2_b), > + SH_PFC_PIN_GROUP(msiof1_rx_b), > + SH_PFC_PIN_GROUP(msiof1_tx_b), > + SH_PFC_PIN_GROUP(msiof1_clk_c), > + SH_PFC_PIN_GROUP(msiof1_sync_c), > + SH_PFC_PIN_GROUP(msiof1_rx_c), > + SH_PFC_PIN_GROUP(msiof1_tx_c), > + SH_PFC_PIN_GROUP(msiof1_clk_d), > + SH_PFC_PIN_GROUP(msiof1_sync_d), > + SH_PFC_PIN_GROUP(msiof1_ss1_d), > + SH_PFC_PIN_GROUP(msiof1_rx_d), > + SH_PFC_PIN_GROUP(msiof1_tx_d), > + SH_PFC_PIN_GROUP(msiof1_clk_e), > + SH_PFC_PIN_GROUP(msiof1_sync_e), > + SH_PFC_PIN_GROUP(msiof1_rx_e), > + SH_PFC_PIN_GROUP(msiof1_tx_e), > SH_PFC_PIN_GROUP(msiof2_clk), > SH_PFC_PIN_GROUP(msiof2_sync), > SH_PFC_PIN_GROUP(msiof2_ss1), > SH_PFC_PIN_GROUP(msiof2_ss2), > SH_PFC_PIN_GROUP(msiof2_rx), > SH_PFC_PIN_GROUP(msiof2_tx), > + SH_PFC_PIN_GROUP(msiof2_clk_b), > + SH_PFC_PIN_GROUP(msiof2_sync_b), > + SH_PFC_PIN_GROUP(msiof2_ss1_b), > + SH_PFC_PIN_GROUP(msiof2_ss2_b), > + SH_PFC_PIN_GROUP(msiof2_rx_b), > + SH_PFC_PIN_GROUP(msiof2_tx_b), > + SH_PFC_PIN_GROUP(msiof2_clk_c), > + SH_PFC_PIN_GROUP(msiof2_sync_c), > + SH_PFC_PIN_GROUP(msiof2_rx_c), > + SH_PFC_PIN_GROUP(msiof2_tx_c), > + SH_PFC_PIN_GROUP(msiof2_clk_d), > + SH_PFC_PIN_GROUP(msiof2_sync_d), > + SH_PFC_PIN_GROUP(msiof2_ss1_d), > + SH_PFC_PIN_GROUP(msiof2_ss2_d), > + SH_PFC_PIN_GROUP(msiof2_rx_d), > + SH_PFC_PIN_GROUP(msiof2_tx_d), > + SH_PFC_PIN_GROUP(msiof2_clk_e), > + SH_PFC_PIN_GROUP(msiof2_sync_e), > + SH_PFC_PIN_GROUP(msiof2_rx_e), > + SH_PFC_PIN_GROUP(msiof2_tx_e), > SH_PFC_PIN_GROUP(qspi_ctrl), > SH_PFC_PIN_GROUP(qspi_data2), > SH_PFC_PIN_GROUP(qspi_data4), > @@ -3409,6 +3827,18 @@ static const char * const msiof0_groups[] = { > "msiof0_ss2", > "msiof0_rx", > "msiof0_tx", > + "msiof0_clk_b", > + "msiof0_sync_b", > + "msiof0_ss1_b", > + "msiof0_ss2_b", > + "msiof0_rx_b", > + "msiof0_tx_b", > + "msiof0_clk_c", > + "msiof0_sync_c", > + "msiof0_ss1_c", > + "msiof0_ss2_c", > + "msiof0_rx_c", > + "msiof0_tx_c", > }; > > static const char * const msiof1_groups[] = { > @@ -3418,6 +3848,25 @@ static const char * const msiof1_groups[] = { > "msiof1_ss2", > "msiof1_rx", > "msiof1_tx", > + "msiof1_clk_b", > + "msiof1_sync_b", > + "msiof1_ss1_b", > + "msiof1_ss2_b", > + "msiof1_rx_b", > + "msiof1_tx_b", > + "msiof1_clk_c", > + "msiof1_sync_c", > + "msiof1_rx_c", > + "msiof1_tx_c", > + "msiof1_clk_d", > + "msiof1_sync_d", > + "msiof1_ss1_d", > + "msiof1_rx_d", > + "msiof1_tx_d", > + "msiof1_clk_e", > + "msiof1_sync_e", > + "msiof1_rx_e", > + "msiof1_tx_e", > }; > > static const char * const msiof2_groups[] = { > @@ -3427,6 +3876,26 @@ static const char * const msiof2_groups[] = { > "msiof2_ss2", > "msiof2_rx", > "msiof2_tx", > + "msiof2_clk_b", > + "msiof2_sync_b", > + "msiof2_ss1_b", > + "msiof2_ss2_b", > + "msiof2_rx_b", > + "msiof2_tx_b", > + "msiof2_clk_c", > + "msiof2_sync_c", > + "msiof2_rx_c", > + "msiof2_tx_c", > + "msiof2_clk_d", > + "msiof2_sync_d", > + "msiof2_ss1_d", > + "msiof2_ss2_d", > + "msiof2_rx_d", > + "msiof2_tx_d", > + "msiof2_clk_e", > + "msiof2_sync_e", > + "msiof2_rx_e", > + "msiof2_tx_e", > }; > > static const char * const qspi_groups[] = { -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups @ 2014-02-25 17:19 ` Laurent Pinchart 0 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 17:19 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Linus Walleij, linux-sh, linux-kernel, Geert Uytterhoeven Hi Geert, Thank you for the patch. On Thursday 20 February 2014 20:53:41 Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Please see below for two small issues. After fixing them, Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 469 +++++++++++++++++++++++++++++++ > 1 file changed, 469 insertions(+) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index 2a64589b5dc4..682ce5d51244 > 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c > @@ -2049,6 +2049,92 @@ static const unsigned int msiof0_tx_pins[] = { > static const unsigned int msiof0_tx_mux[] = { > MSIOF0_TXD_MARK, > }; > + > +static const unsigned int msiof0_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(0, 16), > +}; > +static const unsigned int msiof0_clk_b_mux[] = { > + MSIOF0_SCK_B_MARK, > +}; > +static const unsigned int msiof0_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(0, 17), > +}; > +static const unsigned int msiof0_sync_b_mux[] = { > + MSIOF0_SYNC_B_MARK, > +}; > +static const unsigned int msiof0_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(0, 18), > +}; > +static const unsigned int msiof0_ss1_b_mux[] = { > + MSIOF0_SS1_B_MARK, > +}; > +static const unsigned int msiof0_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(0, 19), > +}; > +static const unsigned int msiof0_ss2_b_mux[] = { > + MSIOF0_SS2_B_MARK, > +}; > +static const unsigned int msiof0_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(0, 21), > +}; > +static const unsigned int msiof0_rx_b_mux[] = { > + MSIOF0_RXD_B_MARK, > +}; > +static const unsigned int msiof0_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 20), > +}; > +static const unsigned int msiof0_tx_b_mux[] = { > + MSIOF0_TXD_B_MARK, > +}; > + > +static const unsigned int msiof0_clk_c_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(5, 26), > +}; > +static const unsigned int msiof0_clk_c_mux[] = { > + MSIOF0_SCK_C_MARK, > +}; > +static const unsigned int msiof0_sync_c_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(5, 25), > +}; > +static const unsigned int msiof0_sync_c_mux[] = { > + MSIOF0_SYNC_C_MARK, > +}; > +static const unsigned int msiof0_ss1_c_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(5, 27), > +}; > +static const unsigned int msiof0_ss1_c_mux[] = { > + MSIOF0_SS1_C_MARK, > +}; > +static const unsigned int msiof0_ss2_c_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(5, 28), > +}; > +static const unsigned int msiof0_ss2_c_mux[] = { > + MSIOF0_SS2_C_MARK, > +}; > +static const unsigned int msiof0_rx_c_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(5, 29), > +}; > +static const unsigned int msiof0_rx_c_mux[] = { > + MSIOF0_RXD_C_MARK, > +}; > +static const unsigned int msiof0_tx_c_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(5, 30), > +}; > +static const unsigned int msiof0_tx_c_mux[] = { > + MSIOF0_TXD_C_MARK, > +}; > /* - MSIOF1 ------------------------------------------------------------ */ > static const unsigned int msiof1_clk_pins[] = { > /* SCK */ > @@ -2092,6 +2178,143 @@ static const unsigned int msiof1_tx_pins[] = { > static const unsigned int msiof1_tx_mux[] = { > MSIOF1_TXD_MARK, > }; > + > +static const unsigned int msiof1_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 29), > +}; > +static const unsigned int msiof1_clk_b_mux[] = { > + MSIOF1_SCK_B_MARK, > +}; > +static const unsigned int msiof1_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 30), > +}; > +static const unsigned int msiof1_sync_b_mux[] = { > + MSIOF1_SYNC_B_MARK, > +}; > +static const unsigned int msiof1_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(2, 31), > +}; > +static const unsigned int msiof1_ss1_b_mux[] = { > + MSIOF1_SS1_B_MARK, > +}; > +static const unsigned int msiof1_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(7, 16), > +}; > +static const unsigned int msiof1_ss2_b_mux[] = { > + MSIOF1_SS2_B_MARK, > +}; > +static const unsigned int msiof1_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(7, 18), > +}; > +static const unsigned int msiof1_rx_b_mux[] = { > + MSIOF1_RXD_B_MARK, > +}; > +static const unsigned int msiof1_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(7, 17), > +}; > +static const unsigned int msiof1_tx_b_mux[] = { > + MSIOF1_TXD_B_MARK, > +}; > + > +static const unsigned int msiof1_clk_c_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 15), > +}; > +static const unsigned int msiof1_clk_c_mux[] = { > + MSIOF1_SCK_C_MARK, > +}; > +static const unsigned int msiof1_sync_c_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 16), > +}; > +static const unsigned int msiof1_sync_c_mux[] = { > + MSIOF1_SYNC_C_MARK, > +}; > +static const unsigned int msiof1_rx_c_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(2, 18), > +}; > +static const unsigned int msiof1_rx_c_mux[] = { > + MSIOF1_RXD_C_MARK, > +}; > +static const unsigned int msiof1_tx_c_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(2, 17), > +}; > +static const unsigned int msiof1_tx_c_mux[] = { > + MSIOF1_TXD_C_MARK, > +}; > + > +static const unsigned int msiof1_clk_d_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(0, 28), > +}; > +static const unsigned int msiof1_clk_d_mux[] = { > + MSIOF1_SCK_D_MARK, > +}; > +static const unsigned int msiof1_sync_d_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(0, 30), > +}; > +static const unsigned int msiof1_sync_d_mux[] = { > + MSIOF1_SYNC_D_MARK, > +}; > +static const unsigned int msiof1_ss1_d_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(0, 29), > +}; > +static const unsigned int msiof1_ss1_d_mux[] = { > + MSIOF1_SS1_D_MARK, > +}; > +static const unsigned int msiof1_rx_d_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(0, 26), This should be (0, 27). > +}; > +static const unsigned int msiof1_rx_d_mux[] = { > + MSIOF1_RXD_D_MARK, > +}; > +static const unsigned int msiof1_tx_d_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 26), > +}; > +static const unsigned int msiof1_tx_d_mux[] = { > + MSIOF1_TXD_D_MARK, > +}; > + > +static const unsigned int msiof1_clk_e_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(5, 18), > +}; > +static const unsigned int msiof1_clk_e_mux[] = { > + MSIOF1_SCK_E_MARK, > +}; > +static const unsigned int msiof1_sync_e_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(5, 19), > +}; > +static const unsigned int msiof1_sync_e_mux[] = { > + MSIOF1_SYNC_E_MARK, > +}; > +static const unsigned int msiof1_rx_e_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(5, 17), > +}; > +static const unsigned int msiof1_rx_e_mux[] = { > + MSIOF1_RXD_E_MARK, > +}; > +static const unsigned int msiof1_tx_e_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(5, 20), > +}; > +static const unsigned int msiof1_tx_e_mux[] = { > + MSIOF1_TXD_E_MARK, > +}; > /* - MSIOF2 ------------------------------------------------------------ */ > static const unsigned int msiof2_clk_pins[] = { > /* SCK */ > @@ -2135,6 +2358,150 @@ static const unsigned int msiof2_tx_pins[] = { > static const unsigned int msiof2_tx_mux[] = { > MSIOF2_TXD_MARK, > }; > + > +static const unsigned int msiof2_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(3, 0), > +}; > +static const unsigned int msiof2_clk_b_mux[] = { > + MSIOF2_SCK_B_MARK, > +}; > +static const unsigned int msiof2_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(3, 1), > +}; > +static const unsigned int msiof2_sync_b_mux[] = { > + MSIOF2_SYNC_B_MARK, > +}; > +static const unsigned int msiof2_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(3, 8), > +}; > +static const unsigned int msiof2_ss1_b_mux[] = { > + MSIOF2_SS1_B_MARK, > +}; > +static const unsigned int msiof2_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(3, 9), > +}; > +static const unsigned int msiof2_ss2_b_mux[] = { > + MSIOF2_SS2_B_MARK, > +}; > +static const unsigned int msiof2_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(3, 17), > +}; > +static const unsigned int msiof2_rx_b_mux[] = { > + MSIOF2_RXD_B_MARK, > +}; > +static const unsigned int msiof2_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(3, 16), > +}; > +static const unsigned int msiof2_tx_b_mux[] = { > + MSIOF2_TXD_B_MARK, > +}; > + > +static const unsigned int msiof2_clk_c_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 2), > +}; > +static const unsigned int msiof2_clk_c_mux[] = { > + MSIOF2_SCK_C_MARK, > +}; > +static const unsigned int msiof2_sync_c_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 3), > +}; > +static const unsigned int msiof2_sync_c_mux[] = { > + MSIOF2_SYNC_C_MARK, > +}; > +static const unsigned int msiof2_rx_c_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(2, 5), > +}; > +static const unsigned int msiof2_rx_c_mux[] = { > + MSIOF2_RXD_C_MARK, > +}; > +static const unsigned int msiof2_tx_c_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(2, 4), > +}; > +static const unsigned int msiof2_tx_c_mux[] = { > + MSIOF2_TXD_C_MARK, > +}; > + > +static const unsigned int msiof2_clk_d_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(2, 14), > +}; > +static const unsigned int msiof2_clk_d_mux[] = { > + MSIOF2_SCK_D_MARK, > +}; > +static const unsigned int msiof2_sync_d_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(2, 15), > +}; > +static const unsigned int msiof2_sync_d_mux[] = { > + MSIOF2_SYNC_D_MARK, > +}; > +static const unsigned int msiof2_ss1_d_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(2, 17), > +}; > +static const unsigned int msiof2_ss1_d_mux[] = { > + MSIOF2_SS1_D_MARK, > +}; > +static const unsigned int msiof2_ss2_d_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(2, 18), This should be (2, 19). > +}; > +static const unsigned int msiof2_ss2_d_mux[] = { > + MSIOF2_SS2_D_MARK, > +}; > +static const unsigned int msiof2_rx_d_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(2, 18), > +}; > +static const unsigned int msiof2_rx_d_mux[] = { > + MSIOF2_RXD_D_MARK, > +}; > +static const unsigned int msiof2_tx_d_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(2, 16), > +}; > +static const unsigned int msiof2_tx_d_mux[] = { > + MSIOF2_TXD_D_MARK, > +}; > + > +static const unsigned int msiof2_clk_e_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(7, 15), > +}; > +static const unsigned int msiof2_clk_e_mux[] = { > + MSIOF2_SCK_E_MARK, > +}; > +static const unsigned int msiof2_sync_e_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(7, 16), > +}; > +static const unsigned int msiof2_sync_e_mux[] = { > + MSIOF2_SYNC_E_MARK, > +}; > +static const unsigned int msiof2_rx_e_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(7, 14), > +}; > +static const unsigned int msiof2_rx_e_mux[] = { > + MSIOF2_RXD_E_MARK, > +}; > +static const unsigned int msiof2_tx_e_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(7, 13), > +}; > +static const unsigned int msiof2_tx_e_mux[] = { > + MSIOF2_TXD_E_MARK, > +}; > /* - QSPI -------------------------------------------------------------- */ > static const unsigned int qspi_ctrl_pins[] = { > /* SPCLK, SSL */ > @@ -3184,18 +3551,69 @@ static const struct sh_pfc_pin_group pinmux_groups[] > = { SH_PFC_PIN_GROUP(msiof0_ss2), > SH_PFC_PIN_GROUP(msiof0_rx), > SH_PFC_PIN_GROUP(msiof0_tx), > + SH_PFC_PIN_GROUP(msiof0_clk_b), > + SH_PFC_PIN_GROUP(msiof0_sync_b), > + SH_PFC_PIN_GROUP(msiof0_ss1_b), > + SH_PFC_PIN_GROUP(msiof0_ss2_b), > + SH_PFC_PIN_GROUP(msiof0_rx_b), > + SH_PFC_PIN_GROUP(msiof0_tx_b), > + SH_PFC_PIN_GROUP(msiof0_clk_c), > + SH_PFC_PIN_GROUP(msiof0_sync_c), > + SH_PFC_PIN_GROUP(msiof0_ss1_c), > + SH_PFC_PIN_GROUP(msiof0_ss2_c), > + SH_PFC_PIN_GROUP(msiof0_rx_c), > + SH_PFC_PIN_GROUP(msiof0_tx_c), > SH_PFC_PIN_GROUP(msiof1_clk), > SH_PFC_PIN_GROUP(msiof1_sync), > SH_PFC_PIN_GROUP(msiof1_ss1), > SH_PFC_PIN_GROUP(msiof1_ss2), > SH_PFC_PIN_GROUP(msiof1_rx), > SH_PFC_PIN_GROUP(msiof1_tx), > + SH_PFC_PIN_GROUP(msiof1_clk_b), > + SH_PFC_PIN_GROUP(msiof1_sync_b), > + SH_PFC_PIN_GROUP(msiof1_ss1_b), > + SH_PFC_PIN_GROUP(msiof1_ss2_b), > + SH_PFC_PIN_GROUP(msiof1_rx_b), > + SH_PFC_PIN_GROUP(msiof1_tx_b), > + SH_PFC_PIN_GROUP(msiof1_clk_c), > + SH_PFC_PIN_GROUP(msiof1_sync_c), > + SH_PFC_PIN_GROUP(msiof1_rx_c), > + SH_PFC_PIN_GROUP(msiof1_tx_c), > + SH_PFC_PIN_GROUP(msiof1_clk_d), > + SH_PFC_PIN_GROUP(msiof1_sync_d), > + SH_PFC_PIN_GROUP(msiof1_ss1_d), > + SH_PFC_PIN_GROUP(msiof1_rx_d), > + SH_PFC_PIN_GROUP(msiof1_tx_d), > + SH_PFC_PIN_GROUP(msiof1_clk_e), > + SH_PFC_PIN_GROUP(msiof1_sync_e), > + SH_PFC_PIN_GROUP(msiof1_rx_e), > + SH_PFC_PIN_GROUP(msiof1_tx_e), > SH_PFC_PIN_GROUP(msiof2_clk), > SH_PFC_PIN_GROUP(msiof2_sync), > SH_PFC_PIN_GROUP(msiof2_ss1), > SH_PFC_PIN_GROUP(msiof2_ss2), > SH_PFC_PIN_GROUP(msiof2_rx), > SH_PFC_PIN_GROUP(msiof2_tx), > + SH_PFC_PIN_GROUP(msiof2_clk_b), > + SH_PFC_PIN_GROUP(msiof2_sync_b), > + SH_PFC_PIN_GROUP(msiof2_ss1_b), > + SH_PFC_PIN_GROUP(msiof2_ss2_b), > + SH_PFC_PIN_GROUP(msiof2_rx_b), > + SH_PFC_PIN_GROUP(msiof2_tx_b), > + SH_PFC_PIN_GROUP(msiof2_clk_c), > + SH_PFC_PIN_GROUP(msiof2_sync_c), > + SH_PFC_PIN_GROUP(msiof2_rx_c), > + SH_PFC_PIN_GROUP(msiof2_tx_c), > + SH_PFC_PIN_GROUP(msiof2_clk_d), > + SH_PFC_PIN_GROUP(msiof2_sync_d), > + SH_PFC_PIN_GROUP(msiof2_ss1_d), > + SH_PFC_PIN_GROUP(msiof2_ss2_d), > + SH_PFC_PIN_GROUP(msiof2_rx_d), > + SH_PFC_PIN_GROUP(msiof2_tx_d), > + SH_PFC_PIN_GROUP(msiof2_clk_e), > + SH_PFC_PIN_GROUP(msiof2_sync_e), > + SH_PFC_PIN_GROUP(msiof2_rx_e), > + SH_PFC_PIN_GROUP(msiof2_tx_e), > SH_PFC_PIN_GROUP(qspi_ctrl), > SH_PFC_PIN_GROUP(qspi_data2), > SH_PFC_PIN_GROUP(qspi_data4), > @@ -3409,6 +3827,18 @@ static const char * const msiof0_groups[] = { > "msiof0_ss2", > "msiof0_rx", > "msiof0_tx", > + "msiof0_clk_b", > + "msiof0_sync_b", > + "msiof0_ss1_b", > + "msiof0_ss2_b", > + "msiof0_rx_b", > + "msiof0_tx_b", > + "msiof0_clk_c", > + "msiof0_sync_c", > + "msiof0_ss1_c", > + "msiof0_ss2_c", > + "msiof0_rx_c", > + "msiof0_tx_c", > }; > > static const char * const msiof1_groups[] = { > @@ -3418,6 +3848,25 @@ static const char * const msiof1_groups[] = { > "msiof1_ss2", > "msiof1_rx", > "msiof1_tx", > + "msiof1_clk_b", > + "msiof1_sync_b", > + "msiof1_ss1_b", > + "msiof1_ss2_b", > + "msiof1_rx_b", > + "msiof1_tx_b", > + "msiof1_clk_c", > + "msiof1_sync_c", > + "msiof1_rx_c", > + "msiof1_tx_c", > + "msiof1_clk_d", > + "msiof1_sync_d", > + "msiof1_ss1_d", > + "msiof1_rx_d", > + "msiof1_tx_d", > + "msiof1_clk_e", > + "msiof1_sync_e", > + "msiof1_rx_e", > + "msiof1_tx_e", > }; > > static const char * const msiof2_groups[] = { > @@ -3427,6 +3876,26 @@ static const char * const msiof2_groups[] = { > "msiof2_ss2", > "msiof2_rx", > "msiof2_tx", > + "msiof2_clk_b", > + "msiof2_sync_b", > + "msiof2_ss1_b", > + "msiof2_ss2_b", > + "msiof2_rx_b", > + "msiof2_tx_b", > + "msiof2_clk_c", > + "msiof2_sync_c", > + "msiof2_rx_c", > + "msiof2_tx_c", > + "msiof2_clk_d", > + "msiof2_sync_d", > + "msiof2_ss1_d", > + "msiof2_ss2_d", > + "msiof2_rx_d", > + "msiof2_tx_d", > + "msiof2_clk_e", > + "msiof2_sync_e", > + "msiof2_rx_e", > + "msiof2_tx_e", > }; > > static const char * const qspi_groups[] = { -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups 2014-02-25 17:19 ` Laurent Pinchart @ 2014-02-25 17:50 ` Geert Uytterhoeven -1 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2014-02-25 17:50 UTC (permalink / raw) To: Laurent Pinchart, Kuninori Morimoto Cc: Linus Walleij, Linux-sh list, linux-kernel, Geert Uytterhoeven Hi Laurent, On Tue, Feb 25, 2014 at 6:19 PM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: >> +static const unsigned int msiof1_rx_d_pins[] = { >> + /* RXD */ >> + RCAR_GP_PIN(0, 26), > > This should be (0, 27). Wow, nice catch. Thanks a lot! >> +static const unsigned int msiof2_ss2_d_pins[] = { >> + /* SS2 */ >> + RCAR_GP_PIN(2, 18), > > This should be (2, 19). p. 4-16 of Rev. 0.31 of the R-Car M2 datasheet states that GP2_18 can be both MSIOF2_SS2_D (function 3) and MSIOF2_RXD_D (function 5), but p. 5-37 disagrees? It seems the whole function 3 column on p. 4-16 is offset by one, compared to p. 5-37. Well, (2, 19) sounds more logical, so let's assume p. 5-37 is correct for now. > > +}; > > +static const unsigned int msiof2_ss2_d_mux[] = { > > + MSIOF2_SS2_D_MARK, > > +}; > > +static const unsigned int msiof2_rx_d_pins[] = { > > + /* RXD */ > > + RCAR_GP_PIN(2, 18), > > +}; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups @ 2014-02-25 17:50 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2014-02-25 17:50 UTC (permalink / raw) To: Laurent Pinchart, Kuninori Morimoto Cc: Linus Walleij, Linux-sh list, linux-kernel, Geert Uytterhoeven Hi Laurent, On Tue, Feb 25, 2014 at 6:19 PM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: >> +static const unsigned int msiof1_rx_d_pins[] = { >> + /* RXD */ >> + RCAR_GP_PIN(0, 26), > > This should be (0, 27). Wow, nice catch. Thanks a lot! >> +static const unsigned int msiof2_ss2_d_pins[] = { >> + /* SS2 */ >> + RCAR_GP_PIN(2, 18), > > This should be (2, 19). p. 4-16 of Rev. 0.31 of the R-Car M2 datasheet states that GP2_18 can be both MSIOF2_SS2_D (function 3) and MSIOF2_RXD_D (function 5), but p. 5-37 disagrees? It seems the whole function 3 column on p. 4-16 is offset by one, compared to p. 5-37. Well, (2, 19) sounds more logical, so let's assume p. 5-37 is correct for now. > > +}; > > +static const unsigned int msiof2_ss2_d_mux[] = { > > + MSIOF2_SS2_D_MARK, > > +}; > > +static const unsigned int msiof2_rx_d_pins[] = { > > + /* RXD */ > > + RCAR_GP_PIN(2, 18), > > +}; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups 2014-02-25 17:50 ` Geert Uytterhoeven @ 2014-02-25 18:02 ` Laurent Pinchart -1 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 18:02 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Kuninori Morimoto, Linus Walleij, Linux-sh list, linux-kernel, Geert Uytterhoeven Hi Geert, On Tuesday 25 February 2014 18:50:21 Geert Uytterhoeven wrote: > On Tue, Feb 25, 2014 at 6:19 PM, Laurent Pinchart wrote: > >> +static const unsigned int msiof1_rx_d_pins[] = { > >> + /* RXD */ > >> + RCAR_GP_PIN(0, 26), > > > > This should be (0, 27). > > Wow, nice catch. Thanks a lot! You're welcome. This is why I dislike reviewing PFC patches though, it's lots of small numbers that need to be checked. > >> +static const unsigned int msiof2_ss2_d_pins[] = { > >> + /* SS2 */ > >> + RCAR_GP_PIN(2, 18), > > > > This should be (2, 19). > > p. 4-16 of Rev. 0.31 of the R-Car M2 datasheet states that GP2_18 can be > both MSIOF2_SS2_D (function 3) and MSIOF2_RXD_D (function 5), > but p. 5-37 disagrees? > It seems the whole function 3 column on p. 4-16 is offset by one, > compared to p. 5-37. > > Well, (2, 19) sounds more logical, so let's assume p. 5-37 is correct for > now. Sounds good to me. > > > +}; > > > +static const unsigned int msiof2_ss2_d_mux[] = { > > > + MSIOF2_SS2_D_MARK, > > > +}; > > > +static const unsigned int msiof2_rx_d_pins[] = { > > > + /* RXD */ > > > + RCAR_GP_PIN(2, 18), > > > +}; -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] pinctrl: sh-pfc: r8a7791: Add alternative MSIOF pin groups @ 2014-02-25 18:02 ` Laurent Pinchart 0 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 18:02 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Kuninori Morimoto, Linus Walleij, Linux-sh list, linux-kernel, Geert Uytterhoeven Hi Geert, On Tuesday 25 February 2014 18:50:21 Geert Uytterhoeven wrote: > On Tue, Feb 25, 2014 at 6:19 PM, Laurent Pinchart wrote: > >> +static const unsigned int msiof1_rx_d_pins[] = { > >> + /* RXD */ > >> + RCAR_GP_PIN(0, 26), > > > > This should be (0, 27). > > Wow, nice catch. Thanks a lot! You're welcome. This is why I dislike reviewing PFC patches though, it's lots of small numbers that need to be checked. > >> +static const unsigned int msiof2_ss2_d_pins[] = { > >> + /* SS2 */ > >> + RCAR_GP_PIN(2, 18), > > > > This should be (2, 19). > > p. 4-16 of Rev. 0.31 of the R-Car M2 datasheet states that GP2_18 can be > both MSIOF2_SS2_D (function 3) and MSIOF2_RXD_D (function 5), > but p. 5-37 disagrees? > It seems the whole function 3 column on p. 4-16 is offset by one, > compared to p. 5-37. > > Well, (2, 19) sounds more logical, so let's assume p. 5-37 is correct for > now. Sounds good to me. > > > +}; > > > +static const unsigned int msiof2_ss2_d_mux[] = { > > > + MSIOF2_SS2_D_MARK, > > > +}; > > > +static const unsigned int msiof2_rx_d_pins[] = { > > > + /* RXD */ > > > + RCAR_GP_PIN(2, 18), > > > +}; -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups 2014-02-20 19:53 ` Geert Uytterhoeven @ 2014-02-25 8:53 ` Linus Walleij -1 siblings, 0 replies; 18+ messages in thread From: Linus Walleij @ 2014-02-25 8:53 UTC (permalink / raw) To: Geert Uytterhoeven, Laurent Pinchart Cc: linux-sh, linux-kernel, Geert Uytterhoeven On Thu, Feb 20, 2014 at 8:53 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Laurent, can I have your ACK/review on Geert's patches? Yours, Linus Walleij ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups @ 2014-02-25 8:53 ` Linus Walleij 0 siblings, 0 replies; 18+ messages in thread From: Linus Walleij @ 2014-02-25 8:53 UTC (permalink / raw) To: Geert Uytterhoeven, Laurent Pinchart Cc: linux-sh, linux-kernel, Geert Uytterhoeven On Thu, Feb 20, 2014 at 8:53 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Laurent, can I have your ACK/review on Geert's patches? Yours, Linus Walleij ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups 2014-02-25 8:53 ` Linus Walleij @ 2014-02-25 17:20 ` Laurent Pinchart -1 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 17:20 UTC (permalink / raw) To: Linus Walleij Cc: Geert Uytterhoeven, linux-sh, linux-kernel, Geert Uytterhoeven Hi Linus, On Tuesday 25 February 2014 09:53:37 Linus Walleij wrote: > On Thu, Feb 20, 2014 at 8:53 PM, Geert Uytterhoeven wrote: > > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Laurent, can I have your ACK/review on Geert's patches? Done. I've acked 1/2, 2/2 has two small errors. I trust Geert to resubmit it with them fixed, you can then apply the patch with my ack. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups @ 2014-02-25 17:20 ` Laurent Pinchart 0 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 17:20 UTC (permalink / raw) To: Linus Walleij Cc: Geert Uytterhoeven, linux-sh, linux-kernel, Geert Uytterhoeven Hi Linus, On Tuesday 25 February 2014 09:53:37 Linus Walleij wrote: > On Thu, Feb 20, 2014 at 8:53 PM, Geert Uytterhoeven wrote: > > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Laurent, can I have your ACK/review on Geert's patches? Done. I've acked 1/2, 2/2 has two small errors. I trust Geert to resubmit it with them fixed, you can then apply the patch with my ack. -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups 2014-02-20 19:53 ` Geert Uytterhoeven @ 2014-02-25 17:07 ` Laurent Pinchart -1 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 17:07 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Linus Walleij, linux-sh, linux-kernel, Geert Uytterhoeven Hi Geert, Thank you for the patch. On Thursday 20 February 2014 20:53:40 Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> I'm a bit concerned that this would allow boards to select combinations of main and alternate MSIOF pins not supported by the hardware, but there's little we can do about that, so Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 129 +++++++++++++++++++++++++++++++ > 1 file changed, 129 insertions(+) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 2ca319f15d31..2d1a0a158682 > 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > @@ -2260,6 +2260,42 @@ static const unsigned int msiof0_tx_pins[] = { > static const unsigned int msiof0_tx_mux[] = { > MSIOF0_TXD_MARK, > }; > + > +static const unsigned int msiof0_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(1, 23), > +}; > +static const unsigned int msiof0_clk_b_mux[] = { > + MSIOF0_SCK_B_MARK, > +}; > +static const unsigned int msiof0_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(1, 12), > +}; > +static const unsigned int msiof0_ss1_b_mux[] = { > + MSIOF0_SS1_B_MARK, > +}; > +static const unsigned int msiof0_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(1, 10), > +}; > +static const unsigned int msiof0_ss2_b_mux[] = { > + MSIOF0_SS2_B_MARK, > +}; > +static const unsigned int msiof0_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(1, 29), > +}; > +static const unsigned int msiof0_rx_b_mux[] = { > + MSIOF0_RXD_B_MARK, > +}; > +static const unsigned int msiof0_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(1, 28), > +}; > +static const unsigned int msiof0_tx_b_mux[] = { > + MSIOF0_TXD_B_MARK, > +}; > /* - MSIOF1 > ----------------------------------------------------------------- */ static > const unsigned int msiof1_clk_pins[] = { > /* SCK */ > @@ -2303,6 +2339,42 @@ static const unsigned int msiof1_tx_pins[] = { > static const unsigned int msiof1_tx_mux[] = { > MSIOF1_TXD_MARK, > }; > + > +static const unsigned int msiof1_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(1, 16), > +}; > +static const unsigned int msiof1_clk_b_mux[] = { > + MSIOF1_SCK_B_MARK, > +}; > +static const unsigned int msiof1_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(0, 18), > +}; > +static const unsigned int msiof1_ss1_b_mux[] = { > + MSIOF1_SS1_B_MARK, > +}; > +static const unsigned int msiof1_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(0, 19), > +}; > +static const unsigned int msiof1_ss2_b_mux[] = { > + MSIOF1_SS2_B_MARK, > +}; > +static const unsigned int msiof1_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(1, 17), > +}; > +static const unsigned int msiof1_rx_b_mux[] = { > + MSIOF1_RXD_B_MARK, > +}; > +static const unsigned int msiof1_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 20), > +}; > +static const unsigned int msiof1_tx_b_mux[] = { > + MSIOF1_TXD_B_MARK, > +}; > /* - MSIOF2 > ----------------------------------------------------------------- */ static > const unsigned int msiof2_clk_pins[] = { > /* SCK */ > @@ -2389,6 +2461,35 @@ static const unsigned int msiof3_tx_pins[] = { > static const unsigned int msiof3_tx_mux[] = { > MSIOF3_TXD_MARK, > }; > + > +static const unsigned int msiof3_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(0, 0), > +}; > +static const unsigned int msiof3_clk_b_mux[] = { > + MSIOF3_SCK_B_MARK, > +}; > +static const unsigned int msiof3_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(0, 1), > +}; > +static const unsigned int msiof3_sync_b_mux[] = { > + MSIOF3_SYNC_B_MARK, > +}; > +static const unsigned int msiof3_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(0, 2), > +}; > +static const unsigned int msiof3_rx_b_mux[] = { > + MSIOF3_RXD_B_MARK, > +}; > +static const unsigned int msiof3_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 3), > +}; > +static const unsigned int msiof3_tx_b_mux[] = { > + MSIOF3_TXD_B_MARK, > +}; > /* - QSPI > ------------------------------------------------------------------- */ > static const unsigned int qspi_ctrl_pins[] = { > /* SPCLK, SSL */ > @@ -3676,12 +3777,22 @@ static const struct sh_pfc_pin_group pinmux_groups[] > = { SH_PFC_PIN_GROUP(msiof0_ss2), > SH_PFC_PIN_GROUP(msiof0_rx), > SH_PFC_PIN_GROUP(msiof0_tx), > + SH_PFC_PIN_GROUP(msiof0_clk_b), > + SH_PFC_PIN_GROUP(msiof0_ss1_b), > + SH_PFC_PIN_GROUP(msiof0_ss2_b), > + SH_PFC_PIN_GROUP(msiof0_rx_b), > + SH_PFC_PIN_GROUP(msiof0_tx_b), > SH_PFC_PIN_GROUP(msiof1_clk), > SH_PFC_PIN_GROUP(msiof1_sync), > SH_PFC_PIN_GROUP(msiof1_ss1), > SH_PFC_PIN_GROUP(msiof1_ss2), > SH_PFC_PIN_GROUP(msiof1_rx), > SH_PFC_PIN_GROUP(msiof1_tx), > + SH_PFC_PIN_GROUP(msiof1_clk_b), > + SH_PFC_PIN_GROUP(msiof1_ss1_b), > + SH_PFC_PIN_GROUP(msiof1_ss2_b), > + SH_PFC_PIN_GROUP(msiof1_rx_b), > + SH_PFC_PIN_GROUP(msiof1_tx_b), > SH_PFC_PIN_GROUP(msiof2_clk), > SH_PFC_PIN_GROUP(msiof2_sync), > SH_PFC_PIN_GROUP(msiof2_ss1), > @@ -3694,6 +3805,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] > = { SH_PFC_PIN_GROUP(msiof3_ss2), > SH_PFC_PIN_GROUP(msiof3_rx), > SH_PFC_PIN_GROUP(msiof3_tx), > + SH_PFC_PIN_GROUP(msiof3_clk_b), > + SH_PFC_PIN_GROUP(msiof3_sync_b), > + SH_PFC_PIN_GROUP(msiof3_rx_b), > + SH_PFC_PIN_GROUP(msiof3_tx_b), > SH_PFC_PIN_GROUP(qspi_ctrl), > SH_PFC_PIN_GROUP(qspi_data2), > SH_PFC_PIN_GROUP(qspi_data4), > @@ -3967,6 +4082,11 @@ static const char * const msiof0_groups[] = { > "msiof0_ss2", > "msiof0_rx", > "msiof0_tx", > + "msiof0_clk_b", > + "msiof0_ss1_b", > + "msiof0_ss2_b", > + "msiof0_rx_b", > + "msiof0_tx_b", > }; > > static const char * const msiof1_groups[] = { > @@ -3976,6 +4096,11 @@ static const char * const msiof1_groups[] = { > "msiof1_ss2", > "msiof1_rx", > "msiof1_tx", > + "msiof1_clk_b", > + "msiof1_ss1_b", > + "msiof1_ss2_b", > + "msiof1_rx_b", > + "msiof1_tx_b", > }; > > static const char * const msiof2_groups[] = { > @@ -3994,6 +4119,10 @@ static const char * const msiof3_groups[] = { > "msiof3_ss2", > "msiof3_rx", > "msiof3_tx", > + "msiof3_clk_b", > + "msiof3_sync_b", > + "msiof3_rx_b", > + "msiof3_tx_b", > }; > > static const char * const qspi_groups[] = { -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups @ 2014-02-25 17:07 ` Laurent Pinchart 0 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2014-02-25 17:07 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Linus Walleij, linux-sh, linux-kernel, Geert Uytterhoeven Hi Geert, Thank you for the patch. On Thursday 20 February 2014 20:53:40 Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> I'm a bit concerned that this would allow boards to select combinations of main and alternate MSIOF pins not supported by the hardware, but there's little we can do about that, so Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 129 +++++++++++++++++++++++++++++++ > 1 file changed, 129 insertions(+) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 2ca319f15d31..2d1a0a158682 > 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c > @@ -2260,6 +2260,42 @@ static const unsigned int msiof0_tx_pins[] = { > static const unsigned int msiof0_tx_mux[] = { > MSIOF0_TXD_MARK, > }; > + > +static const unsigned int msiof0_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(1, 23), > +}; > +static const unsigned int msiof0_clk_b_mux[] = { > + MSIOF0_SCK_B_MARK, > +}; > +static const unsigned int msiof0_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(1, 12), > +}; > +static const unsigned int msiof0_ss1_b_mux[] = { > + MSIOF0_SS1_B_MARK, > +}; > +static const unsigned int msiof0_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(1, 10), > +}; > +static const unsigned int msiof0_ss2_b_mux[] = { > + MSIOF0_SS2_B_MARK, > +}; > +static const unsigned int msiof0_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(1, 29), > +}; > +static const unsigned int msiof0_rx_b_mux[] = { > + MSIOF0_RXD_B_MARK, > +}; > +static const unsigned int msiof0_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(1, 28), > +}; > +static const unsigned int msiof0_tx_b_mux[] = { > + MSIOF0_TXD_B_MARK, > +}; > /* - MSIOF1 > ----------------------------------------------------------------- */ static > const unsigned int msiof1_clk_pins[] = { > /* SCK */ > @@ -2303,6 +2339,42 @@ static const unsigned int msiof1_tx_pins[] = { > static const unsigned int msiof1_tx_mux[] = { > MSIOF1_TXD_MARK, > }; > + > +static const unsigned int msiof1_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(1, 16), > +}; > +static const unsigned int msiof1_clk_b_mux[] = { > + MSIOF1_SCK_B_MARK, > +}; > +static const unsigned int msiof1_ss1_b_pins[] = { > + /* SS1 */ > + RCAR_GP_PIN(0, 18), > +}; > +static const unsigned int msiof1_ss1_b_mux[] = { > + MSIOF1_SS1_B_MARK, > +}; > +static const unsigned int msiof1_ss2_b_pins[] = { > + /* SS2 */ > + RCAR_GP_PIN(0, 19), > +}; > +static const unsigned int msiof1_ss2_b_mux[] = { > + MSIOF1_SS2_B_MARK, > +}; > +static const unsigned int msiof1_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(1, 17), > +}; > +static const unsigned int msiof1_rx_b_mux[] = { > + MSIOF1_RXD_B_MARK, > +}; > +static const unsigned int msiof1_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 20), > +}; > +static const unsigned int msiof1_tx_b_mux[] = { > + MSIOF1_TXD_B_MARK, > +}; > /* - MSIOF2 > ----------------------------------------------------------------- */ static > const unsigned int msiof2_clk_pins[] = { > /* SCK */ > @@ -2389,6 +2461,35 @@ static const unsigned int msiof3_tx_pins[] = { > static const unsigned int msiof3_tx_mux[] = { > MSIOF3_TXD_MARK, > }; > + > +static const unsigned int msiof3_clk_b_pins[] = { > + /* SCK */ > + RCAR_GP_PIN(0, 0), > +}; > +static const unsigned int msiof3_clk_b_mux[] = { > + MSIOF3_SCK_B_MARK, > +}; > +static const unsigned int msiof3_sync_b_pins[] = { > + /* SYNC */ > + RCAR_GP_PIN(0, 1), > +}; > +static const unsigned int msiof3_sync_b_mux[] = { > + MSIOF3_SYNC_B_MARK, > +}; > +static const unsigned int msiof3_rx_b_pins[] = { > + /* RXD */ > + RCAR_GP_PIN(0, 2), > +}; > +static const unsigned int msiof3_rx_b_mux[] = { > + MSIOF3_RXD_B_MARK, > +}; > +static const unsigned int msiof3_tx_b_pins[] = { > + /* TXD */ > + RCAR_GP_PIN(0, 3), > +}; > +static const unsigned int msiof3_tx_b_mux[] = { > + MSIOF3_TXD_B_MARK, > +}; > /* - QSPI > ------------------------------------------------------------------- */ > static const unsigned int qspi_ctrl_pins[] = { > /* SPCLK, SSL */ > @@ -3676,12 +3777,22 @@ static const struct sh_pfc_pin_group pinmux_groups[] > = { SH_PFC_PIN_GROUP(msiof0_ss2), > SH_PFC_PIN_GROUP(msiof0_rx), > SH_PFC_PIN_GROUP(msiof0_tx), > + SH_PFC_PIN_GROUP(msiof0_clk_b), > + SH_PFC_PIN_GROUP(msiof0_ss1_b), > + SH_PFC_PIN_GROUP(msiof0_ss2_b), > + SH_PFC_PIN_GROUP(msiof0_rx_b), > + SH_PFC_PIN_GROUP(msiof0_tx_b), > SH_PFC_PIN_GROUP(msiof1_clk), > SH_PFC_PIN_GROUP(msiof1_sync), > SH_PFC_PIN_GROUP(msiof1_ss1), > SH_PFC_PIN_GROUP(msiof1_ss2), > SH_PFC_PIN_GROUP(msiof1_rx), > SH_PFC_PIN_GROUP(msiof1_tx), > + SH_PFC_PIN_GROUP(msiof1_clk_b), > + SH_PFC_PIN_GROUP(msiof1_ss1_b), > + SH_PFC_PIN_GROUP(msiof1_ss2_b), > + SH_PFC_PIN_GROUP(msiof1_rx_b), > + SH_PFC_PIN_GROUP(msiof1_tx_b), > SH_PFC_PIN_GROUP(msiof2_clk), > SH_PFC_PIN_GROUP(msiof2_sync), > SH_PFC_PIN_GROUP(msiof2_ss1), > @@ -3694,6 +3805,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] > = { SH_PFC_PIN_GROUP(msiof3_ss2), > SH_PFC_PIN_GROUP(msiof3_rx), > SH_PFC_PIN_GROUP(msiof3_tx), > + SH_PFC_PIN_GROUP(msiof3_clk_b), > + SH_PFC_PIN_GROUP(msiof3_sync_b), > + SH_PFC_PIN_GROUP(msiof3_rx_b), > + SH_PFC_PIN_GROUP(msiof3_tx_b), > SH_PFC_PIN_GROUP(qspi_ctrl), > SH_PFC_PIN_GROUP(qspi_data2), > SH_PFC_PIN_GROUP(qspi_data4), > @@ -3967,6 +4082,11 @@ static const char * const msiof0_groups[] = { > "msiof0_ss2", > "msiof0_rx", > "msiof0_tx", > + "msiof0_clk_b", > + "msiof0_ss1_b", > + "msiof0_ss2_b", > + "msiof0_rx_b", > + "msiof0_tx_b", > }; > > static const char * const msiof1_groups[] = { > @@ -3976,6 +4096,11 @@ static const char * const msiof1_groups[] = { > "msiof1_ss2", > "msiof1_rx", > "msiof1_tx", > + "msiof1_clk_b", > + "msiof1_ss1_b", > + "msiof1_ss2_b", > + "msiof1_rx_b", > + "msiof1_tx_b", > }; > > static const char * const msiof2_groups[] = { > @@ -3994,6 +4119,10 @@ static const char * const msiof3_groups[] = { > "msiof3_ss2", > "msiof3_rx", > "msiof3_tx", > + "msiof3_clk_b", > + "msiof3_sync_b", > + "msiof3_rx_b", > + "msiof3_tx_b", > }; > > static const char * const qspi_groups[] = { -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups 2014-02-20 19:53 ` Geert Uytterhoeven @ 2014-03-05 1:16 ` Linus Walleij -1 siblings, 0 replies; 18+ messages in thread From: Linus Walleij @ 2014-03-05 1:16 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Laurent Pinchart, linux-sh, linux-kernel, Geert Uytterhoeven On Fri, Feb 21, 2014 at 3:53 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Patch applied with Lauren's ACK. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups @ 2014-03-05 1:16 ` Linus Walleij 0 siblings, 0 replies; 18+ messages in thread From: Linus Walleij @ 2014-03-05 1:16 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Laurent Pinchart, linux-sh, linux-kernel, Geert Uytterhoeven On Fri, Feb 21, 2014 at 3:53 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Patch applied with Lauren's ACK. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-03-05 1:16 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-02-20 19:53 [PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups Geert Uytterhoeven 2014-02-20 19:53 ` Geert Uytterhoeven 2014-02-20 19:53 ` [PATCH 2/2] pinctrl: sh-pfc: r8a7791: " Geert Uytterhoeven 2014-02-20 19:53 ` Geert Uytterhoeven 2014-02-25 17:19 ` Laurent Pinchart 2014-02-25 17:19 ` Laurent Pinchart 2014-02-25 17:50 ` Geert Uytterhoeven 2014-02-25 17:50 ` Geert Uytterhoeven 2014-02-25 18:02 ` Laurent Pinchart 2014-02-25 18:02 ` Laurent Pinchart 2014-02-25 8:53 ` [PATCH 1/2] pinctrl: sh-pfc: r8a7790: " Linus Walleij 2014-02-25 8:53 ` Linus Walleij 2014-02-25 17:20 ` Laurent Pinchart 2014-02-25 17:20 ` Laurent Pinchart 2014-02-25 17:07 ` Laurent Pinchart 2014-02-25 17:07 ` Laurent Pinchart 2014-03-05 1:16 ` Linus Walleij 2014-03-05 1:16 ` Linus Walleij
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.