Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751363AbbKQDSP (ORCPT ); Mon, 16 Nov 2015 22:18:15 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33056 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752161AbbKQDRp (ORCPT ); Mon, 16 Nov 2015 22:17:45 -0500 From: Magnus Damm To: linux-sh@vger.kernel.org Cc: linus.walleij@linaro.org, linux-kernel@vger.kernel.org, koji.matsuoka.xm@renesas.com, linux-gpio@vger.kernel.org, horms@verge.net.au, geert@glider.be, laurent.pinchart@ideasonboard.com, Magnus Damm Date: Tue, 17 Nov 2015 12:18:51 +0900 Message-Id: <20151117031851.24924.18884.sendpatchset@little-apple> In-Reply-To: <20151117031832.24924.60685.sendpatchset@little-apple> References: <20151117031832.24924.60685.sendpatchset@little-apple> Subject: [PATCH 02/04] pinctrl: sh-pfc: r8a7794: Separate DU CDE and DISP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2737 Lines: 93 From: Magnus Damm Separate DU CDE and DISP signals to let the r8a7794 ALT board that lacks CDE handle the DISP signal by itself. The groups "du0_cde_disp" and "du1_cde_disp" are replaced by "du0_cde", "du1_cde", "du0_disp" and "du1_disp". Signed-off-by: Magnus Damm --- drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 50 +++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 16 deletions(-) --- 0008/drivers/pinctrl/sh-pfc/pfc-r8a7794.c +++ work/drivers/pinctrl/sh-pfc/pfc-r8a7794.c 2015-11-16 15:04:00.760513000 +0900 @@ -1616,19 +1616,33 @@ static const unsigned int du1_sync_mux[] DU1_EXODDF_DU1_ODDF_DISP_CDE_MARK, DU1_EXVSYNC_DU1_VSYNC_MARK, DU1_EXHSYNC_DU1_HSYNC_MARK }; -static const unsigned int du0_cde_disp_pins[] = { - /* CDE DISP */ - RCAR_GP_PIN(2, 31), RCAR_GP_PIN(2, 30), -}; -static const unsigned int du0_cde_disp_mux[] = { - DU0_CDE_MARK, DU0_DISP_MARK -}; -static const unsigned int du1_cde_disp_pins[] = { - /* CDE DISP */ - RCAR_GP_PIN(4, 31), RCAR_GP_PIN(4, 30), +static const unsigned int du0_cde_pins[] = { + /* CDE */ + RCAR_GP_PIN(2, 31), }; -static const unsigned int du1_cde_disp_mux[] = { - DU1_CDE_MARK, DU1_DISP_MARK +static const unsigned int du0_cde_mux[] = { + DU0_CDE_MARK, +}; +static const unsigned int du1_cde_pins[] = { + /* CDE */ + RCAR_GP_PIN(4, 31), +}; +static const unsigned int du1_cde_mux[] = { + DU1_CDE_MARK +}; +static const unsigned int du0_disp_pins[] = { + /* DISP */ + RCAR_GP_PIN(2, 30), +}; +static const unsigned int du0_disp_mux[] = { + DU0_DISP_MARK +}; +static const unsigned int du1_disp_pins[] = { + /* DISP */ + RCAR_GP_PIN(4, 30), +}; +static const unsigned int du1_disp_mux[] = { + DU1_DISP_MARK }; static const unsigned int du0_clk_in_pins[] = { /* CLKIN */ @@ -2932,8 +2946,10 @@ static const struct sh_pfc_pin_group pin SH_PFC_PIN_GROUP(du1_clk_out), SH_PFC_PIN_GROUP(du0_sync), SH_PFC_PIN_GROUP(du1_sync), - SH_PFC_PIN_GROUP(du0_cde_disp), - SH_PFC_PIN_GROUP(du1_cde_disp), + SH_PFC_PIN_GROUP(du0_cde), + SH_PFC_PIN_GROUP(du1_cde), + SH_PFC_PIN_GROUP(du0_disp), + SH_PFC_PIN_GROUP(du1_disp), SH_PFC_PIN_GROUP(du0_clk_in), SH_PFC_PIN_GROUP(du1_clk_in), SH_PFC_PIN_GROUP(eth_link), @@ -3122,8 +3138,10 @@ static const char * const du_groups[] = "du1_clk_out", "du0_sync", "du1_sync", - "du0_cde_disp", - "du1_cde_disp", + "du0_cde", + "du1_cde", + "du0_disp", + "du1_disp", }; static const char * const du0_groups[] = { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/