From patchwork Mon May 22 12:59:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9740285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E7B39603F1 for ; Mon, 22 May 2017 13:12:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D88D828671 for ; Mon, 22 May 2017 13:12:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD41628711; Mon, 22 May 2017 13:12:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SUSPICIOUS_RECIPS autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A9D828712 for ; Mon, 22 May 2017 13:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=03CUtwRr3mvMbzVn+iEWM4rpIOUq+ubnEmsWBh5jECg=; b=IbjlcWXBavvXQzDei2L0el8BYO wOIoEaJqUoSUhRcG+HSjhv7DUwIXPH0/l9fy/COmt6mSer5u0NJqxlZkasa+SOqBr9M4aCg/XUSVM K1w6Lvl4o+XydSVv83fyz67l6bi2ruHF7BivGPvYchWOlNmtkRQt/NNSxyKFdWhCdtWLcUSfgY/uO SxPUMDg2dpk2tINUAUVBFfcuWPWNsElPZ/im302MVpbqNA3ZfYeQ0+08aQBeZ1Inqqsv0MpKrhpW8 vk66U/3WUWDz5kWxpjGC8peKZ51m5LMah7p9rh70+Xm65OsAbUniAiW/JltGP9dx3NsnV6vQ7kUfa U/9+jofA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dCn8D-0004r0-K9; Mon, 22 May 2017 13:12:17 +0000 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dCmwH-0004GT-Jh for linux-arm-kernel@lists.infradead.org; Mon, 22 May 2017 13:00:01 +0000 Received: by mail-wr0-x236.google.com with SMTP id l50so38075221wrc.3 for ; Mon, 22 May 2017 05:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nxCCmWP/BcXETrA4dVh1MnbPVcHwi9fKeUmyt3WSI4I=; b=Rn36rnbvRnUW2klJs4u9ep3ek8oLB8rgzYisuQSX2MeEQKAeoseqfbMNr588HO3DeX V3MDpzEjnQGlXCkDrvsy9jSflFv5bfFCpL42vrZeyJK8ElkRNYlCBqul/QYCi3khPpy3 A6UHlJpWdcSMfIeONn99pjH5/DebwZwepwXn6qErGwSg+89jiqx9FYbwAmQnwPSFofXi uwTCDGnStCK4XMEXf7S8g20MtQqMoLDguZrT9lf+ZoiQZ0aEW/NRxyclqtch/VgKg16p eta1FgVvcBq/8nMi0E4BNBB+B4rFZo1hMIOeFm8AAiR40s6tIZ42clJSS1snYPniSqBa TqLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nxCCmWP/BcXETrA4dVh1MnbPVcHwi9fKeUmyt3WSI4I=; b=rGvxp0T8bjrlMmKNJsGHWclWKxStXuYOOqX172mjaFJSuHvnkuE3WCtEgrlimd/MGR dIflhwBI3CD4KslaL9+o2oR9ttJAWk6szV52uvoCIpXe2u6DkMybrvzTBtmICKglHvNs +9o0N1ddg2zp+wDj6od7msarZ2puyyUqM7cr/IvEKTOiX31rFNrH0jlGOv0Hiz7MEsUK aQ6ic05JlvYYKasBpZyk5eGHyhfNJmybw6GszjVCyckn/vPN78CRao7/2umrdfhcTzV6 7uPrY5lng3EXs8ZWFQdcdaKm1ttHwaw46m4oMFGrIst9fQL3I3A8ou3yvBnUC2JO6DsN cGVQ== X-Gm-Message-State: AODbwcC/jzbuLuKY7xfVh1qmxJD1Qs3gu7VkcAdyqZd3fJr9Y1wzdSM/ 071mlH8x7Q/FAis3QN5shw== X-Received: by 10.223.153.181 with SMTP id y50mr11333898wrb.41.1495457977116; Mon, 22 May 2017 05:59:37 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id y6sm14518847wrc.51.2017.05.22.05.59.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 05:59:36 -0700 (PDT) From: Neil Armstrong To: linus.walleij@linaro.org Subject: [PATCH 2/2] pinctrl: meson-gxbb: Add SPI pins for SPICC controller Date: Mon, 22 May 2017 14:59:26 +0200 Message-Id: <1495457966-2359-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1495457966-2359-1-git-send-email-narmstrong@baylibre.com> References: <1495457966-2359-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170522_055957_815750_449395FC X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The SPICC controller has dedicated SPI pins, this patchs add the pins definition in the GXBB pinctrl driver Signed-off-by: Neil Armstrong --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 9b00be1..3ccb0f4f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -161,6 +161,11 @@ static const unsigned int nor_c_pins[] = { PIN(BOOT_13, EE_OFF) }; static const unsigned int nor_cs_pins[] = { PIN(BOOT_15, EE_OFF) }; +static const unsigned int spi_sclk_pins[] = { PIN(GPIOZ_6, EE_OFF) }; +static const unsigned int spi_ss0_pins[] = { PIN(GPIOZ_7, EE_OFF) }; +static const unsigned int spi_miso_pins[] = { PIN(GPIOZ_12, EE_OFF) }; +static const unsigned int spi_mosi_pins[] = { PIN(GPIOZ_13, EE_OFF) }; + static const unsigned int sdcard_d0_pins[] = { PIN(CARD_1, EE_OFF) }; static const unsigned int sdcard_d1_pins[] = { PIN(CARD_0, EE_OFF) }; static const unsigned int sdcard_d2_pins[] = { PIN(CARD_5, EE_OFF) }; @@ -462,6 +467,10 @@ GROUP(eth_txd1, 6, 4), GROUP(eth_txd2, 6, 3), GROUP(eth_txd3, 6, 2), + GROUP(spi_ss0, 5, 26), + GROUP(spi_sclk, 5, 27), + GROUP(spi_miso, 5, 28), + GROUP(spi_mosi, 5, 29), /* Bank H */ GROUP(hdmi_hpd, 1, 26), @@ -598,6 +607,10 @@ "nor_d", "nor_q", "nor_c", "nor_cs", }; +static const char * const spi_groups[] = { + "spi_mosi", "spi_miso", "spi_ss0", "spi_sclk", +}; + static const char * const sdcard_groups[] = { "sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3", "sdcard_cmd", "sdcard_clk", @@ -743,6 +756,7 @@ FUNCTION(gpio_periphs), FUNCTION(emmc), FUNCTION(nor), + FUNCTION(spi), FUNCTION(sdcard), FUNCTION(sdio), FUNCTION(nand),