Commit d10046e2 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Linus Walleij

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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fb95a94b
...@@ -1733,19 +1733,32 @@ static const unsigned int du_clk_out_1_mux[] = { ...@@ -1733,19 +1733,32 @@ static const unsigned int du_clk_out_1_mux[] = {
DU1_DOTCLKOUT1_MARK DU1_DOTCLKOUT1_MARK
}; };
static const unsigned int du_sync_pins[] = { static const unsigned int du_sync_pins[] = {
/* EXVSYNC/VSYNC, EXHSYNC/HSYNC, EXDISP/EXODDF/EXCDE */ /* EXVSYNC/VSYNC, EXHSYNC/HSYNC */
RCAR_GP_PIN(3, 29), RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 27), RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 27),
}; };
static const unsigned int du_sync_mux[] = { static const unsigned int du_sync_mux[] = {
DU1_EXODDF_DU1_ODDF_DISP_CDE_MARK,
DU1_EXVSYNC_DU1_VSYNC_MARK, DU1_EXHSYNC_DU1_HSYNC_MARK DU1_EXVSYNC_DU1_VSYNC_MARK, DU1_EXHSYNC_DU1_HSYNC_MARK
}; };
static const unsigned int du_cde_disp_pins[] = { static const unsigned int du_oddf_pins[] = {
/* CDE DISP */ /* EXDISP/EXODDF/EXCDE */
RCAR_GP_PIN(3, 31), RCAR_GP_PIN(3, 30), 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[] = { static const unsigned int du_disp_mux[] = {
DU1_CDE_MARK, DU1_DISP_MARK DU1_DISP_MARK,
}; };
static const unsigned int du0_clk_in_pins[] = { static const unsigned int du0_clk_in_pins[] = {
/* CLKIN */ /* CLKIN */
...@@ -3555,7 +3568,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { ...@@ -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_0),
SH_PFC_PIN_GROUP(du_clk_out_1), SH_PFC_PIN_GROUP(du_clk_out_1),
SH_PFC_PIN_GROUP(du_sync), 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(du0_clk_in),
SH_PFC_PIN_GROUP(du1_clk_in), SH_PFC_PIN_GROUP(du1_clk_in),
SH_PFC_PIN_GROUP(du1_clk_in_b), SH_PFC_PIN_GROUP(du1_clk_in_b),
...@@ -3804,7 +3819,9 @@ static const char * const du_groups[] = { ...@@ -3804,7 +3819,9 @@ static const char * const du_groups[] = {
"du_clk_out_0", "du_clk_out_0",
"du_clk_out_1", "du_clk_out_1",
"du_sync", "du_sync",
"du_cde_disp", "du_oddf",
"du_cde",
"du_disp",
}; };
static const char * const du0_groups[] = { static const char * const du0_groups[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment