From patchwork Tue Jul 12 21:40:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 647648 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rpwNt4rGDz9sCt for ; Wed, 13 Jul 2016 07:40:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b=sBc+qgeB; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750923AbcGLVkN (ORCPT ); Tue, 12 Jul 2016 17:40:13 -0400 Received: from mail-lf0-f46.google.com ([209.85.215.46]:35755 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750852AbcGLVkN (ORCPT ); Tue, 12 Jul 2016 17:40:13 -0400 Received: by mail-lf0-f46.google.com with SMTP id f93so24257212lfi.2 for ; Tue, 12 Jul 2016 14:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:organization:user-agent:in-reply-to :references:mime-version:content-transfer-encoding; bh=DZT1ejBgzHlHLby1B2YpqQPZhDUHxp5T1GxupMgzv3o=; b=sBc+qgeBbJu9zwIFSGvt1p1H84GOtrXPZXAaGqKHiI97LNX4dGFk+nP5xBY77We1aF ENGqwJZHOqFqrAJXLijuY2CqCT0EKLC0dCPoxoSQ77fbAbrJhIrgwscIduDsgr400D3m wh+Z8uoEmsJAqOet6fLjT6PLZqnVSiON25WB/C2WICBz7VeW2ZhdDbRDw7WSXP3D86pC z7ckUuQuuMu9XVnk/wo4wHMKCF7jzhouYrwDbcFa3BGhWawkHhTaDgK3YeL2QtZB367j sQvAsPEAK72QJsMwueCHftOv0tkcJOTsV6IuADgiW/Vh3M79/xXpDRjUbzx//uE76TlY Ydcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding; bh=DZT1ejBgzHlHLby1B2YpqQPZhDUHxp5T1GxupMgzv3o=; b=hXrlCzMZKCL2bXRRIxdoA7/aYTKNKMYJn1CW3PlMMLcL6vSJ1n6tnLJouTFKY4xgLI iwrSxAdKw47nHDVuSWX3Pel0ivnEl5qOyFqcuq6ZyupUEmxOW+a1ETGI4sqsHuLjBjBo TQ1V1vdWMDEEFkM/Ekdw95e3zCBcmFSts90qvbo8f9RKLD37W5BwXred0eDm5D/RK7B6 PnlUk+tp4L+e3TA2LjI9ZBUKloKgl6vJcq2BUt0YWhhwWEOTb0OMqU0VBiAykPNsHhlK 1sQjSDlfkjxkZ10c2V9twp2ArAFeEaG9CJfiGjKRaC2xTPGe4rmLDljrPozQzCFTZook 5jxQ== X-Gm-Message-State: ALyK8tKyUed16nBda/Dh2eJbGZ/4Vg5gKapc5Ox3Oy5dd5JnponkuKTeIQzsveFsvvf0XA== X-Received: by 10.46.33.72 with SMTP id h69mr2490456ljh.45.1468359605175; Tue, 12 Jul 2016 14:40:05 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.81.138]) by smtp.gmail.com with ESMTPSA id f20sm578032lji.46.2016.07.12.14.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 14:40:04 -0700 (PDT) From: Sergei Shtylyov To: linus.walleij@linaro.org, linux-renesas-soc@vger.kernel.org, laurent.pinchart@ideasonboard.com, linux-gpio@vger.kernel.org, geert+renesas@glider.be Subject: [PATCH] pinctrl: sh-pfc: r8a7792: add SDHI pin groups Date: Wed, 13 Jul 2016 00:40:03 +0300 Message-ID: <3437294.RhgABMHgKt@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.10 (Linux/4.4.13-200.fc22.x86_64; KDE/4.14.17; x86_64; ; ) In-Reply-To: <1501145.5ro9yfox2Z@wasted.cogentembedded.com> References: <1501145.5ro9yfox2Z@wasted.cogentembedded.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add SDHI0 pin groups to the R8A7792 PFC driver. Signed-off-by: Sergei Shtylyov Reviewed-by: Geert Uytterhoeven Acked-by: Linus Walleij --- The patch is against the 'devel' branch of Linus Walleij's 'linux-pinctrl.git' repo plus my 2 R8A7792 PFC patches posted before and the EtherAVB patch just reposted... drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 51 +++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pinctrl/drivers/pinctrl/sh-pfc/pfc-r8a7792.c =================================================================== --- linux-pinctrl.orig/drivers/pinctrl/sh-pfc/pfc-r8a7792.c +++ linux-pinctrl/drivers/pinctrl/sh-pfc/pfc-r8a7792.c @@ -932,6 +932,43 @@ static const unsigned int scif3_clk_pins static const unsigned int scif3_clk_mux[] = { SCK3_MARK, }; +/* - SDHI0 ------------------------------------------------------------------ */ +static const unsigned int sdhi0_data1_pins[] = { + /* DAT0 */ + RCAR_GP_PIN(11, 7), +}; +static const unsigned int sdhi0_data1_mux[] = { + SD0_DAT0_MARK, +}; +static const unsigned int sdhi0_data4_pins[] = { + /* DAT[0-3] */ + RCAR_GP_PIN(11, 7), RCAR_GP_PIN(11, 8), + RCAR_GP_PIN(11, 9), RCAR_GP_PIN(11, 10), +}; +static const unsigned int sdhi0_data4_mux[] = { + SD0_DAT0_MARK, SD0_DAT1_MARK, SD0_DAT2_MARK, SD0_DAT3_MARK, +}; +static const unsigned int sdhi0_ctrl_pins[] = { + /* CLK, CMD */ + RCAR_GP_PIN(11, 5), RCAR_GP_PIN(11, 6), +}; +static const unsigned int sdhi0_ctrl_mux[] = { + SD0_CLK_MARK, SD0_CMD_MARK, +}; +static const unsigned int sdhi0_cd_pins[] = { + /* CD */ + RCAR_GP_PIN(11, 11), +}; +static const unsigned int sdhi0_cd_mux[] = { + SD0_CD_MARK, +}; +static const unsigned int sdhi0_wp_pins[] = { + /* WP */ + RCAR_GP_PIN(11, 12), +}; +static const unsigned int sdhi0_wp_mux[] = { + SD0_WP_MARK, +}; static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(avb_link), @@ -958,6 +995,11 @@ static const struct sh_pfc_pin_group pin SH_PFC_PIN_GROUP(scif0_ctrl), SH_PFC_PIN_GROUP(scif3_data), SH_PFC_PIN_GROUP(scif3_clk), + SH_PFC_PIN_GROUP(sdhi0_data1), + SH_PFC_PIN_GROUP(sdhi0_data4), + SH_PFC_PIN_GROUP(sdhi0_ctrl), + SH_PFC_PIN_GROUP(sdhi0_cd), + SH_PFC_PIN_GROUP(sdhi0_wp), }; static const char * const avb_groups[] = { @@ -999,12 +1041,21 @@ static const char * const scif3_groups[] "scif3_clk", }; +static const char * const sdhi0_groups[] = { + "sdhi0_data1", + "sdhi0_data4", + "sdhi0_ctrl", + "sdhi0_cd", + "sdhi0_wp", +}; + static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(avb), SH_PFC_FUNCTION(intc), SH_PFC_FUNCTION(lbsc), SH_PFC_FUNCTION(scif0), SH_PFC_FUNCTION(scif3), + SH_PFC_FUNCTION(sdhi0), }; static const struct pinmux_cfg_reg pinmux_config_regs[] = {