diff options
| author | Valentine Barshak <valentine.barshak@cogentembedded.com> | 2013-12-10 22:20:23 +0400 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-10 23:42:30 +0400 |
| commit | a9e4c7bb466b34b19ca71ee7383ca23bd37a88c5 (patch) | |
| tree | 147b3ac8069f25bf2c1ff4c14705cd0264b25aaa | |
| parent | 7a57be873ae02aa956f453450a6903c6c8970896 (diff) | |
| download | linux-a9e4c7bb466b34b19ca71ee7383ca23bd37a88c5.tar.xz | |
pinctrl: sh-pfc: pfc-r8a7790: Group VIN0 HSYNC and VSYNC together
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>
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 5a45ab0877e5..81ff4bf72264 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c @@ -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[] = { @@ -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), @@ -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", |