From patchwork Wed Jun 5 08:25:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 2666821 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D9012DFE82 for ; Wed, 5 Jun 2013 08:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753229Ab3FEI1w (ORCPT ); Wed, 5 Jun 2013 04:27:52 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:33871 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752926Ab3FEI1d (ORCPT ); Wed, 5 Jun 2013 04:27:33 -0400 Received: from ayumi.isobedori.kobe.vergenet.net (p5212-ipbfp1903kobeminato.hyogo.ocn.ne.jp [114.172.132.212]) by kirsty.vergenet.net (Postfix) with ESMTP id D80E02671A5; Wed, 5 Jun 2013 18:27:19 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 74899EDE7D7; Wed, 5 Jun 2013 17:27:18 +0900 (JST) From: Simon Horman To: Arnd Bergmann , Olof Johansson Cc: linux-sh@vger.kernel.org, arm@kernel.org, linux-arm-kernel@lists.infradead.org, Magnus Damm , Laurent Pinchart , Simon Horman Subject: [PATCH 065/130] sh-pfc: r8a7740: Add HDMI pin groups and functions Date: Wed, 5 Jun 2013 17:25:56 +0900 Message-Id: <1370420821-28420-66-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1370420821-28420-1-git-send-email-horms+renesas@verge.net.au> References: <1370420821-28420-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Laurent Pinchart Signed-off-by: Laurent Pinchart Signed-off-by: Simon Horman --- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index 49da76a..5a77d39 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -2039,6 +2039,14 @@ static const unsigned int gether_wol_pins[] = { static const unsigned int gether_wol_mux[] = { ET_WOL_MARK, }; +/* - HDMI ------------------------------------------------------------------- */ +static const unsigned int hdmi_pins[] = { + /* HPD, CEC */ + 210, 211, +}; +static const unsigned int hdmi_mux[] = { + HDMI_HPD_MARK, HDMI_CEC_MARK, +}; /* - INTC ------------------------------------------------------------------- */ IRQC_PINS_MUX(0, 0, 2); IRQC_PINS_MUX(0, 1, 13); @@ -2787,6 +2795,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(gether_int), SH_PFC_PIN_GROUP(gether_link), SH_PFC_PIN_GROUP(gether_wol), + SH_PFC_PIN_GROUP(hdmi), SH_PFC_PIN_GROUP(intc_irq0_0), SH_PFC_PIN_GROUP(intc_irq0_1), SH_PFC_PIN_GROUP(intc_irq1), @@ -2985,6 +2994,10 @@ static const char * const gether_groups[] = { "gether_wol", }; +static const char * const hdmi_groups[] = { + "hdmi", +}; + static const char * const intc_groups[] = { "intc_irq0_0", "intc_irq0_1", @@ -3173,6 +3186,7 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(fsia), SH_PFC_FUNCTION(fsib), SH_PFC_FUNCTION(gether), + SH_PFC_FUNCTION(hdmi), SH_PFC_FUNCTION(intc), SH_PFC_FUNCTION(lcd0), SH_PFC_FUNCTION(lcd1),