lkml.org 
[lkml]   [2014]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] pinctrl: sh-pfc: r8a7790: Add alternative MSIOF pin groups
    Date
    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


    \
     
     \ /
      Last update: 2014-02-20 21:41    [W:6.690 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site