Skip to content

Commit

Permalink
pinctrl: sh-pfc: pfc-r8a7790: Group VIN0 HSYNC and VSYNC together
Browse files Browse the repository at this point in the history
This groups VIN0 HSYNC and VSYNC pins together
since one cannot be used without another.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  • Loading branch information
Valentine Barshak authored and Laurent Pinchart committed Dec 10, 2013
1 parent 7a57be8 commit a9e4c7b
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions drivers/pinctrl/sh-pfc/pfc-r8a7790.c
Original file line number Diff line number Diff line change
Expand Up @@ -3278,16 +3278,12 @@ static const unsigned int vin0_data_b_mux[] = {
VI0_DATA3_VI0_B3_MARK, VI0_DATA4_VI0_B4_MARK, VI0_DATA5_VI0_B5_MARK,
VI0_DATA6_VI0_B6_MARK, VI0_DATA7_VI0_B7_MARK,
};
static const unsigned int vin0_hsync_pins[] = {
RCAR_GP_PIN(0, 12),
static const unsigned int vin0_sync_pins[] = {
RCAR_GP_PIN(0, 12), /* HSYNC */
RCAR_GP_PIN(0, 13), /* VSYNC */
};
static const unsigned int vin0_hsync_mux[] = {
static const unsigned int vin0_sync_mux[] = {
VI0_HSYNC_N_MARK,
};
static const unsigned int vin0_vsync_pins[] = {
RCAR_GP_PIN(0, 13),
};
static const unsigned int vin0_vsync_mux[] = {
VI0_VSYNC_N_MARK,
};
static const unsigned int vin0_field_pins[] = {
Expand Down Expand Up @@ -3535,8 +3531,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(vin0_data_g),
SH_PFC_PIN_GROUP(vin0_data_r),
SH_PFC_PIN_GROUP(vin0_data_b),
SH_PFC_PIN_GROUP(vin0_hsync),
SH_PFC_PIN_GROUP(vin0_vsync),
SH_PFC_PIN_GROUP(vin0_sync),
SH_PFC_PIN_GROUP(vin0_field),
SH_PFC_PIN_GROUP(vin0_clkenb),
SH_PFC_PIN_GROUP(vin0_clk),
Expand Down Expand Up @@ -3861,8 +3856,7 @@ static const char * const vin0_groups[] = {
"vin0_data_g",
"vin0_data_r",
"vin0_data_b",
"vin0_hsync",
"vin0_vsync",
"vin0_sync",
"vin0_field",
"vin0_clkenb",
"vin0_clk",
Expand Down

0 comments on commit a9e4c7b

Please sign in to comment.