From patchwork Tue Apr 5 13:27:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guodong Xu X-Patchwork-Id: 8751651 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 7D3649F336 for ; Tue, 5 Apr 2016 13:33:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED8BE203A1 for ; Tue, 5 Apr 2016 13:33:26 +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 109B92028D for ; Tue, 5 Apr 2016 13:33:26 +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 1anR53-000448-MP; Tue, 05 Apr 2016 13:31:41 +0000 Received: from mail-pf0-x230.google.com ([2607:f8b0:400e:c00::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1anR45-0002v1-39 for linux-arm-kernel@lists.infradead.org; Tue, 05 Apr 2016 13:30:45 +0000 Received: by mail-pf0-x230.google.com with SMTP id e128so10980764pfe.3 for ; Tue, 05 Apr 2016 06:30:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QcEBYdISAJ89NwnHXlD/WSlMbRS/gxnufdvr/QvGB8Q=; b=kWlqM24WtN6L05vSrQd3ysGx5Sih9k31wNB8sIoBsix5TyITyA2+66IcqkGqMCumXs 0LMMEzULbjcf9gN25QZjt6Z6J14Gj7JqHN/AEpz4SPtWlfYsHiX7978zwH0VOJeDDyoA NwMcZ8iy4LWrheH4FOhm7ejl+WonUnvhKIg7E= 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=QcEBYdISAJ89NwnHXlD/WSlMbRS/gxnufdvr/QvGB8Q=; b=iAqZZEXqikejxr3rUuWFBVkw1JLq4Dckw+AlVCOG+d8DCL2K4d0tSblqurm/HZOW4/ +GpEyrtenyA7FzzCrs0GATy6WPMP/GXZF7Zm14/2M2TZdAlNrhg6WeKSiI42SeTG9HnB AkRxqDqM9Hgpwv/8BbDeQH7c0yYb+/E5191UuaCptK3XqOkT9XZctt6+0/2ZN1qhGUxv o/Tpnpy//CLq9imMo285xdgb+r8AnIf2vzvcTrBbsoLzq14ffKuvkWuVSV10Cj6rZLpY FxALiZ9yoGqhFsdPyVCISbjWPCN9U9DCYy3hbdaAuKGSuEFgbzr8wOye/yKrbTcZcLpy Ip1g== X-Gm-Message-State: AD7BkJJhmZTczJM/3m0gs+Q8uk5PX/GixFTZlNgg9ct2UcGI9OsV/e5bqRcZU6TPA2ACyDbL X-Received: by 10.98.72.149 with SMTP id q21mr61029405pfi.148.1459863020338; Tue, 05 Apr 2016 06:30:20 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.49]) by smtp.gmail.com with ESMTPSA id wh9sm8060481pab.8.2016.04.05.06.30.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Apr 2016 06:30:19 -0700 (PDT) From: Guodong Xu To: xuwei5@hisilicon.com, mark.rutland@arm.com, robh@kernel.org, grant.likely@secretlab.ca, linus.walleij@linaro.org, arnd.bergmann@linaro.org Subject: [PATCH v3 06/16] arm64: dts: add Hi6220 spi configuration nodes Date: Tue, 5 Apr 2016 21:27:30 +0800 Message-Id: <1459862860-9775-7-git-send-email-guodong.xu@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459862860-9775-1-git-send-email-guodong.xu@linaro.org> References: <1459862860-9775-1-git-send-email-guodong.xu@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160405_063041_738745_BFBF1001 X-CRM114-Status: GOOD ( 11.07 ) 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: devicetree@vger.kernel.org, kong.kongxinwei@hisilicon.com, Zhong Kaihua , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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: Zhong Kaihua Add Hi6220 spi configuration nodes Signed-off-by: Zhong Kaihua Signed-off-by: Wei Xu --- arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 15 +++++++++++++++ arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi | 21 +++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index 985a2ad..5c9ee31 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts @@ -20,6 +20,7 @@ serial1 = &uart1; /* BT UART */ serial2 = &uart2; /* LS Expansion UART0 */ serial3 = &uart3; /* LS Expansion UART1 */ + spi0 = &spi_0; }; chosen { diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index c65d8dc..8b74eeb 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -587,5 +587,20 @@ clock-names = "apb_pclk"; status = "ok"; }; + + spi_0: spi@f7106000 { + compatible = "arm,pl022", "arm,primecell"; + reg = <0x0 0xf7106000 0x0 0x1000>; + interrupts = <0 50 4>; + bus-id = <0>; + enable-dma = <0>; + clocks = <&sys_ctrl HI6220_SPI_CLK>; + clock-names = "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&spi0_pmx_func &spi0_cfg_func>; + num-cs = <1>; + cs-gpios = <&gpio6 2 0>; + status = "ok"; + }; }; }; diff --git a/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi b/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi index 28806df..0916e84 100644 --- a/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi @@ -221,6 +221,15 @@ 0xfc MUX_M0 /* I2C2_SDA (IOMG063) */ >; }; + + spi0_pmx_func: spi0_pmx_func { + pinctrl-single,pins = < + 0x1a0 MUX_M1 /* SPI0_DI (IOMG104) */ + 0x1a4 MUX_M1 /* SPI0_DO (IOMG105) */ + 0x1a8 MUX_M1 /* SPI0_CS_N (IOMG106) */ + 0x1ac MUX_M1 /* SPI0_CLK (IOMG107) */ + >; + }; }; pmx1: pinmux@f7010800 { @@ -625,6 +634,18 @@ pinctrl-single,bias-pullup = ; pinctrl-single,drive-strength = ; }; + + spi0_cfg_func: spi0_cfg_func { + pinctrl-single,pins = < + 0x1b0 0x0 /* SPI0_DI (IOCFG108) */ + 0x1b4 0x0 /* SPI0_DO (IOCFG109) */ + 0x1b8 0x0 /* SPI0_CS_N (IOCFG110) */ + 0x1bc 0x0 /* SPI0_CLK (IOCFG111) */ + >; + pinctrl-single,bias-pulldown = ; + pinctrl-single,bias-pullup = ; + pinctrl-single,drive-strength = ; + }; }; pmx2: pinmux@f8001800 {