From 4b5dc172d87cc8291ddb7377d3252b6777cf8d4b Mon Sep 17 00:00:00 2001 From: Dmitry Shifrin Date: Wed, 4 Apr 2018 12:59:59 +0300 Subject: [PATCH 2/2] r8a7797: pinctrl: Add pin function for hyperflash Signed-off-by: Dmitry Shifrin --- drivers/pinctrl/sh-pfc/pfc-r8a7797.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7797.c b/drivers/pinctrl/sh-pfc/pfc-r8a7797.c index 4f451c4..d989acd 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7797.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7797.c @@ -1196,6 +1196,25 @@ static const unsigned int qspi1_data4_mux[] = { QSPI1_IO2_MARK, QSPI1_IO3_MARK }; +static const unsigned int rpc_hyperflash_pins[] = { + RCAR_GP_PIN(5, 14), RCAR_GP_PIN(5, 12), + RCAR_GP_PIN(5, 11), RCAR_GP_PIN(5, 7), + RCAR_GP_PIN(5, 8), RCAR_GP_PIN(5, 9), + RCAR_GP_PIN(5, 10), RCAR_GP_PIN(5, 6), + RCAR_GP_PIN(5, 5), RCAR_GP_PIN(5, 4), + RCAR_GP_PIN(5, 3), RCAR_GP_PIN(5, 2), + RCAR_GP_PIN(5, 1), RCAR_GP_PIN(5, 0) +}; +static const unsigned int rpc_hyperflash_mux[] = { + RPC_INT_N_MARK, RPC_RESET_N_MARK, + QSPI1_SSL_MARK, QSPI1_IO3_MARK, + QSPI1_IO2_MARK, QSPI1_MISO_IO1_MARK, + QSPI1_MOSI_IO0_MARK, QSPI1_SPCLK_MARK, + QSPI0_SSL_MARK, QSPI0_IO3_MARK, + QSPI0_IO2_MARK, QSPI0_MISO_IO1_MARK, + QSPI0_MOSI_IO0_MARK, QSPI0_SPCLK_MARK +}; + /* - I2C -------------------------------------------------------------------- */ static const unsigned int i2c0_pins[] = { /* SDA0, SCL0 */ @@ -2030,6 +2049,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(qspi1_ctrl), SH_PFC_PIN_GROUP(qspi1_data2), SH_PFC_PIN_GROUP(qspi1_data4), + SH_PFC_PIN_GROUP(rpc_hyperflash), }; static const char * const avb0_groups[] = { @@ -2272,6 +2292,10 @@ static const char * const qspi1_groups[] = { "qspi1_data4", }; +static const char * const rpc_hyperflash_groups[] = { + "rpc_hyperflash", +}; + #define POCCTRL0 0x380 #define POCCTRL1 0x384 #define PIN2POCCTRL0_SHIFT(a) ({ \ @@ -2317,6 +2341,7 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(vin1), SH_PFC_FUNCTION(qspi0), SH_PFC_FUNCTION(qspi1), + SH_PFC_FUNCTION(rpc_hyperflash), }; static const struct pinmux_cfg_reg pinmux_config_regs[] = { -- 2.7.4