| From 1e3e35c0af27cd424c24f329e822e5327be8f15d Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 1 Apr 2014 12:59:09 +0200 |
| Subject: pinctrl: sh-pfc: r8a7791: Split the DU sync and cde/disp groups |
| |
| The DU parallel interface ODDF signal is optional, move it out of the |
| HSYNC/VSYNC group into a group of its down. The CDE and DISP signals are |
| independent, split them to two different groups. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| (cherry picked from commit d10046e25c73e6150677b1b5360f20bb631181a7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 37 ++++++++++++++++++++++++++---------- |
| 1 file changed, 27 insertions(+), 10 deletions(-) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c |
| index 7868bf3a0f91..a823b5ba4fd8 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c |
| @@ -1733,19 +1733,32 @@ static const unsigned int du_clk_out_1_mux[] = { |
| DU1_DOTCLKOUT1_MARK |
| }; |
| static const unsigned int du_sync_pins[] = { |
| - /* EXVSYNC/VSYNC, EXHSYNC/HSYNC, EXDISP/EXODDF/EXCDE */ |
| - RCAR_GP_PIN(3, 29), RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 27), |
| + /* EXVSYNC/VSYNC, EXHSYNC/HSYNC */ |
| + RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 27), |
| }; |
| static const unsigned int du_sync_mux[] = { |
| - DU1_EXODDF_DU1_ODDF_DISP_CDE_MARK, |
| DU1_EXVSYNC_DU1_VSYNC_MARK, DU1_EXHSYNC_DU1_HSYNC_MARK |
| }; |
| -static const unsigned int du_cde_disp_pins[] = { |
| - /* CDE DISP */ |
| - RCAR_GP_PIN(3, 31), RCAR_GP_PIN(3, 30), |
| +static const unsigned int du_oddf_pins[] = { |
| + /* EXDISP/EXODDF/EXCDE */ |
| + RCAR_GP_PIN(3, 29), |
| +}; |
| +static const unsigned int du_oddf_mux[] = { |
| + DU1_EXODDF_DU1_ODDF_DISP_CDE_MARK, |
| +}; |
| +static const unsigned int du_cde_pins[] = { |
| + /* CDE */ |
| + RCAR_GP_PIN(3, 31), |
| +}; |
| +static const unsigned int du_cde_mux[] = { |
| + DU1_CDE_MARK, |
| +}; |
| +static const unsigned int du_disp_pins[] = { |
| + /* DISP */ |
| + RCAR_GP_PIN(3, 30), |
| }; |
| -static const unsigned int du_cde_disp_mux[] = { |
| - DU1_CDE_MARK, DU1_DISP_MARK |
| +static const unsigned int du_disp_mux[] = { |
| + DU1_DISP_MARK, |
| }; |
| static const unsigned int du0_clk_in_pins[] = { |
| /* CLKIN */ |
| @@ -3555,7 +3568,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { |
| SH_PFC_PIN_GROUP(du_clk_out_0), |
| SH_PFC_PIN_GROUP(du_clk_out_1), |
| SH_PFC_PIN_GROUP(du_sync), |
| - SH_PFC_PIN_GROUP(du_cde_disp), |
| + SH_PFC_PIN_GROUP(du_oddf), |
| + SH_PFC_PIN_GROUP(du_cde), |
| + SH_PFC_PIN_GROUP(du_disp), |
| SH_PFC_PIN_GROUP(du0_clk_in), |
| SH_PFC_PIN_GROUP(du1_clk_in), |
| SH_PFC_PIN_GROUP(du1_clk_in_b), |
| @@ -3804,7 +3819,9 @@ static const char * const du_groups[] = { |
| "du_clk_out_0", |
| "du_clk_out_1", |
| "du_sync", |
| - "du_cde_disp", |
| + "du_oddf", |
| + "du_cde", |
| + "du_disp", |
| }; |
| |
| static const char * const du0_groups[] = { |
| -- |
| 2.1.2 |
| |