From patchwork Fri Dec 20 14:14:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3389221 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 714EFC0D4A for ; Fri, 20 Dec 2013 14:14:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38B70206E3 for ; Fri, 20 Dec 2013 14:14:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1266C206E2 for ; Fri, 20 Dec 2013 14:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030201Ab3LTOOe (ORCPT ); Fri, 20 Dec 2013 09:14:34 -0500 Received: from mail-lb0-f182.google.com ([209.85.217.182]:55747 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030197Ab3LTOOe (ORCPT ); Fri, 20 Dec 2013 09:14:34 -0500 Received: by mail-lb0-f182.google.com with SMTP id l4so1135914lbv.13 for ; Fri, 20 Dec 2013 06:14:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jnPi4N1L022htVJQREx2n0SeGj/FcHp22XGMw1jl5r4=; b=bfykuQ+3CjH7o1Kzwd6aT/lWJtd7Tpf92KQ1iFi0FRRKdLeyn0fZhOZ2pKIae5B6Cc h3w1tSa5HLo24O5whAvutXB64SyuBhnbZbhWELZugLLRH7VyD+Z1BugVZIS0RbHIXyyP irrKPcmgEtjTx13pBRYDgYCiFza1vTfw6Xibjd5xC0znTATbrWUXsOFOVAbJBe0rPVAQ gpdOnjyPDAvqyZrjRIhoPxvueu80XtA1CXomNx40tkl7/anFTE8cjFw5fU2EmhPjPLom 2Rf1t9kxFkXNTL3tcv3TRpAtzeDZ2UsYVduqRj08cfP3jjl8t+9x48GF/d7NhVXC1Y/5 paWQ== X-Gm-Message-State: ALoCoQnwhHXc+xjIMtWA7FM9vFbODcdHuuWTMzGKyuZ64t7a6OzEZV6DtWAUtIdTHba1tKApcgOE X-Received: by 10.152.143.101 with SMTP id sd5mr1278049lab.26.1387548872890; Fri, 20 Dec 2013 06:14:32 -0800 (PST) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id e10sm6185043laa.6.2013.12.20.06.14.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Dec 2013 06:14:31 -0800 (PST) From: Valentine Barshak To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , Kuninori Morimoto , Laurent Pinchart , Linus Walleij Subject: [PATCH 1/5] pinctl: sh-pfc: r8a7791: Group USB PWEN and OVC pins together Date: Fri, 20 Dec 2013 18:14:24 +0400 Message-Id: <1387548868-20943-2-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1387548868-20943-1-git-send-email-valentine.barshak@cogentembedded.com> References: <1387548868-20943-1-git-send-email-valentine.barshak@cogentembedded.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This groups USB PWEN and OVC pins together on R8A7791 SoC, the same way it's done on R8A7790, since both are needed for a USB device. Signed-off-by: Valentine Barshak Acked-by: Laurent Pinchart --- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 40 +++++++++++------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index ea02d37..894dd61 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -2649,33 +2649,21 @@ static const unsigned int sdhi2_wp_mux[] = { SD2_WP_MARK, }; /* - USB0 ------------------------------------------------------------------- */ -static const unsigned int usb0_pwen_pins[] = { - /* PWEN */ - RCAR_GP_PIN(7, 23), +static const unsigned int usb0_pins[] = { + RCAR_GP_PIN(7, 23), /* PWEN */ + RCAR_GP_PIN(7, 24), /* OVC */ }; -static const unsigned int usb0_pwen_mux[] = { +static const unsigned int usb0_mux[] = { USB0_PWEN_MARK, -}; -static const unsigned int usb0_ovc_pins[] = { - /* OVC */ - RCAR_GP_PIN(7, 24), -}; -static const unsigned int usb0_ovc_mux[] = { USB0_OVC_MARK, }; /* - USB1 ------------------------------------------------------------------- */ -static const unsigned int usb1_pwen_pins[] = { - /* PWEN */ - RCAR_GP_PIN(7, 25), +static const unsigned int usb1_pins[] = { + RCAR_GP_PIN(7, 25), /* PWEN */ + RCAR_GP_PIN(6, 30), /* OVC */ }; -static const unsigned int usb1_pwen_mux[] = { +static const unsigned int usb1_mux[] = { USB1_PWEN_MARK, -}; -static const unsigned int usb1_ovc_pins[] = { - /* OVC */ - RCAR_GP_PIN(6, 30), -}; -static const unsigned int usb1_ovc_mux[] = { USB1_OVC_MARK, }; @@ -2810,10 +2798,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(sdhi2_ctrl), SH_PFC_PIN_GROUP(sdhi2_cd), SH_PFC_PIN_GROUP(sdhi2_wp), - SH_PFC_PIN_GROUP(usb0_pwen), - SH_PFC_PIN_GROUP(usb0_ovc), - SH_PFC_PIN_GROUP(usb1_pwen), - SH_PFC_PIN_GROUP(usb1_ovc), + SH_PFC_PIN_GROUP(usb0), + SH_PFC_PIN_GROUP(usb1), }; static const char * const du_groups[] = { @@ -3016,12 +3002,10 @@ static const char * const sdhi2_groups[] = { }; static const char * const usb0_groups[] = { - "usb0_pwen", - "usb0_ovc", + "usb0", }; static const char * const usb1_groups[] = { - "usb1_pwen", - "usb1_ovc", + "usb1", }; static const struct sh_pfc_function pinmux_functions[] = {