From patchwork Mon Dec 14 15:42:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 7845581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6124A9F3CD for ; Mon, 14 Dec 2015 15:45:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4786A20382 for ; Mon, 14 Dec 2015 15:45:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69171201F5 for ; Mon, 14 Dec 2015 15:45:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a8VIX-0007qS-Kb; Mon, 14 Dec 2015 15:44:25 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a8VI4-0007PK-Rm for linux-arm-kernel@lists.infradead.org; Mon, 14 Dec 2015 15:43:58 +0000 Received: by wmpp66 with SMTP id p66so66022977wmp.1 for ; Mon, 14 Dec 2015 07:43:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xdFrwL23PIqy+vQTgubu5tWjvw5YpBhAV0quZS09UY8=; b=tHNdDUqf8unEdOMHDAsS2aC5uHrVmmkuqdzN3gxsiwK/mueEFy1tRiMqY7oL+kgBXs XtAcmTwKuuUiFhOrZTer+iK8fD+hHMug3FZpszomd8GmVfp7B8k4RhnZt9H15ezkGUgX RnEhVVCBVQhvLAzGZxTYmHafWLAgz+Wl9cvJ0mDaEFkllAQHuOG5iwZV0fzhSNuqZu6C sOLoUG7ieQB/oX4VuKDSAxxk4JkNBLwJ8cIJPwFfDSDruQ5vsVGF31EMYJqIxJp471Ip z+vd0WPM+f9o57io0AkMLSNWH60nrC0Vn4wt7Hb2nfIvnaFs5o19gPyS8fDsZG4XD9rE PvgA== X-Received: by 10.28.144.139 with SMTP id s133mr25466257wmd.90.1450107777311; Mon, 14 Dec 2015 07:42:57 -0800 (PST) Received: from groucho.site (ip9234e209.dynamic.kabel-deutschland.de. [146.52.226.9]) by smtp.gmail.com with ESMTPSA id l20sm16752009wmd.20.2015.12.14.07.42.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Dec 2015 07:42:56 -0800 (PST) From: Ulrich Hecht To: linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/6] pinctrl: sh-pfc: r8a7795: Add SATA support Date: Mon, 14 Dec 2015 16:42:36 +0100 Message-Id: <1450107758-2544-5-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1450107758-2544-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1450107758-2544-1-git-send-email-ulrich.hecht+renesas@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151214_074357_141149_85E0FC08 X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: takeshi.kihara.df@renesas.com, kuninori.morimoto.gx@renesas.com, geert+renesas@glider.be, kouei.abe.cp@renesas.com, magnus.damm@gmail.com, Ulrich Hecht MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Takeshi Kihara This patch adds SATA0 pinmux support to r8a7795 SoC. Signed-off-by: Takeshi Kihara [uli: adjusted for new PFC driver] Signed-off-by: Ulrich Hecht --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 35e0172..d036c92 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -2492,6 +2492,22 @@ static const unsigned int msiof3_rxd_d_mux[] = { MSIOF3_RXD_D_MARK, }; +/* - SATA --------------------------------------------------------------------*/ +static const unsigned int sata0_devslp_a_pins[] = { + /* DEVSLP */ + RCAR_GP_PIN(6, 16), +}; +static const unsigned int sata0_devslp_a_mux[] = { + SATA_DEVSLP_A_MARK, +}; +static const unsigned int sata0_devslp_b_pins[] = { + /* DEVSLP */ + RCAR_GP_PIN(4, 6), +}; +static const unsigned int sata0_devslp_b_mux[] = { + SATA_DEVSLP_B_MARK, +}; + /* - SCIF0 ------------------------------------------------------------------ */ static const unsigned int scif0_data_pins[] = { /* RX, TX */ @@ -3020,6 +3036,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(msiof3_ss1_d), SH_PFC_PIN_GROUP(msiof3_txd_d), SH_PFC_PIN_GROUP(msiof3_rxd_d), + SH_PFC_PIN_GROUP(sata0_devslp_a), + SH_PFC_PIN_GROUP(sata0_devslp_b), SH_PFC_PIN_GROUP(scif0_data), SH_PFC_PIN_GROUP(scif0_clk), SH_PFC_PIN_GROUP(scif0_ctrl), @@ -3267,6 +3285,11 @@ static const char * const msiof3_groups[] = { "msiof3_rxd_d", }; +static const char * const sata0_groups[] = { + "sata0_devslp_a", + "sata0_devslp_b", +}; + static const char * const scif0_groups[] = { "scif0_data", "scif0_clk", @@ -3358,6 +3381,7 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(msiof1), SH_PFC_FUNCTION(msiof2), SH_PFC_FUNCTION(msiof3), + SH_PFC_FUNCTION(sata0), SH_PFC_FUNCTION(scif0), SH_PFC_FUNCTION(scif1), SH_PFC_FUNCTION(scif2),