| From 9c6659165e808445ca775b3349c0cfaa6cb42c9f Mon Sep 17 00:00:00 2001 |
| From: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| Date: Fri, 16 Feb 2018 15:25:40 +0100 |
| Subject: [PATCH 0856/1795] pinctrl: sh-pfc: r8a7795: Add HDMI pins, groups and |
| functions |
| |
| This patch adds HDMI0 CEC pin, group and function to the R8A7795 SoC. |
| |
| Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| [uli: fixed typo in comment] |
| Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> |
| Reviewed-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| |
| (cherry picked from commit 5722110e2f8ecf1cf8dac7b0c3c864c5fcf5491f) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 28 ++++++++++++++++++++++++++++ |
| 1 file changed, 28 insertions(+) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c |
| index 4faf759a4c17..51afa1ce07fc 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c |
| @@ -2127,6 +2127,22 @@ static const unsigned int du_disp_mux[] = { |
| DU_DISP_MARK, |
| }; |
| |
| +/* - HDMI ------------------------------------------------------------------- */ |
| +static const unsigned int hdmi0_cec_pins[] = { |
| + /* HDMI0_CEC */ |
| + RCAR_GP_PIN(7, 2), |
| +}; |
| +static const unsigned int hdmi0_cec_mux[] = { |
| + HDMI0_CEC_MARK, |
| +}; |
| +static const unsigned int hdmi1_cec_pins[] = { |
| + /* HDMI1_CEC */ |
| + RCAR_GP_PIN(7, 3), |
| +}; |
| +static const unsigned int hdmi1_cec_mux[] = { |
| + HDMI1_CEC_MARK, |
| +}; |
| + |
| /* - HSCIF0 ----------------------------------------------------------------- */ |
| static const unsigned int hscif0_data_pins[] = { |
| /* RX, TX */ |
| @@ -3954,6 +3970,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { |
| SH_PFC_PIN_GROUP(du_oddf), |
| SH_PFC_PIN_GROUP(du_cde), |
| SH_PFC_PIN_GROUP(du_disp), |
| + SH_PFC_PIN_GROUP(hdmi0_cec), |
| + SH_PFC_PIN_GROUP(hdmi1_cec), |
| SH_PFC_PIN_GROUP(hscif0_data), |
| SH_PFC_PIN_GROUP(hscif0_clk), |
| SH_PFC_PIN_GROUP(hscif0_ctrl), |
| @@ -4304,6 +4322,14 @@ static const char * const du_groups[] = { |
| "du_disp", |
| }; |
| |
| +static const char * const hdmi0_groups[] = { |
| + "hdmi0_cec", |
| +}; |
| + |
| +static const char * const hdmi1_groups[] = { |
| + "hdmi1_cec", |
| +}; |
| + |
| static const char * const hscif0_groups[] = { |
| "hscif0_data", |
| "hscif0_clk", |
| @@ -4671,6 +4697,8 @@ static const struct sh_pfc_function pinmux_functions[] = { |
| SH_PFC_FUNCTION(drif2), |
| SH_PFC_FUNCTION(drif3), |
| SH_PFC_FUNCTION(du), |
| + SH_PFC_FUNCTION(hdmi0), |
| + SH_PFC_FUNCTION(hdmi1), |
| SH_PFC_FUNCTION(hscif0), |
| SH_PFC_FUNCTION(hscif1), |
| SH_PFC_FUNCTION(hscif2), |
| -- |
| 2.19.0 |
| |