From patchwork Wed Aug 9 16:43:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109740 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1126378qge; Wed, 9 Aug 2017 09:45:53 -0700 (PDT) X-Received: by 10.99.112.16 with SMTP id l16mr8245953pgc.143.1502297153100; Wed, 09 Aug 2017 09:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502297153; cv=none; d=google.com; s=arc-20160816; b=lwAa9PmtdN95dzpJj8YipKnS1prxYG7aU3HtHWVcVaC4DLXCqbx1D0Y4FPJk40WcSz MKzRsnAB0UmzPF+eIZXpo17qWfpKXLVk2pKkNpswGGO8nkwuV+M9hxuhmGMn8oIo+PEy jWRbVo5GtwtIQsGARsGLVWlO7K8qCnbtK2aMZpCNmB1tLHf2w0T6bvWzZi8TMsnv0570 uyPPATM0l9Vsalpt4mjbJIGZb3A6TLrHPcVz30UcQvxoWztV5g54rqJL6jVw0P+bcWmf xxYA0xGnqh/7H0bbd1rJJzw5cl3VyDou58vJM+lZD+PzdS7pcl4K5jGJf0IhKNntz3np Y+Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=yD2LewFZoXs64hxthwUbrFhrct25yc+wS7dCLbT1IBQ=; b=tgTy2u3YfuJz5tH20dNuaSQxDrv1ASpc3njmmPmMMNY0xZqIj/qlORVB5uM4KgJwOb BWFGvQjgzk5TxtN6yD/2A/kaWGwuv2pOjaS2dgLboQT+PT38ZgEIaUMKJSyTTgg1a5gr VIAdCiXNK4kTGiHHWn2zAjzd2HaKnR/R+16cyMBlaaz68HRIZ3XNdTO2R8Lq+2emOZV9 u6hu1Jc2EYxfTI/KSx2Jm5OAW90iFG6yCYWrERiB4J9MjenZBscGkVFb8r1U9VoQ4E/7 llYmMOeZjmdrRxvsCpKqtHOZVuwTibZsrYGBt18JHyinpXsTYxxy1EcmuUA3Gf+56oxN r0Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=IR0jNiYE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 205si2768908pfy.264.2017.08.09.09.45.52; Wed, 09 Aug 2017 09:45:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=IR0jNiYE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754401AbdHIQpu (ORCPT + 25 others); Wed, 9 Aug 2017 12:45:50 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:60694 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753229AbdHIQol (ORCPT ); Wed, 9 Aug 2017 12:44:41 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-07.nifty.com with ESMTP id v79Ghj8w020252; Thu, 10 Aug 2017 01:43:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v79Ghj8w020252 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502297027; bh=yD2LewFZoXs64hxthwUbrFhrct25yc+wS7dCLbT1IBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IR0jNiYEzAxn//KIyisOgD+y+cSAd7W4BU1QNzzY6ABs0ilNUoDOgS56MiGySnC/Y cWAEZ33F5RK+rEMCR00VdRWmUFRqmeZj6yp+2MjSQv6as9Rm5vuMmNrFj4BjdzC/q8 4fXuex/Diz5KZy+Ti2rxS9/qJrZTTTbABQ7GOe1KhyA+cfRjafOoNspDEQb7rFm0qS BfV7bvI7rh1iGonwRvBm7CTRyTj4A9aHgQoUJXI90asN1AoPN1qxcWWs2yNXIAB85G ek7hAUM7/owMxhNiSvdqv7sTycaN/446ysSnY9JoAddwxPc7JrTvP95r2NN6xjf0VL Qmqp/CAr4Ha5A== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 5/6] ARM: dts: uniphier: add Denali NAND controller node Date: Thu, 10 Aug 2017 01:43:30 +0900 Message-Id: <1502297011-30201-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502297011-30201-1-git-send-email-yamada.masahiro@socionext.com> References: <1502297011-30201-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add NAND controller node to LD4, Pro4, sLD8, Pro5, and PXs2. Set up pinctrl to enable 2 chip select lines except Pro4. The CS1 for Pro4 is multiplexed with other peripherals such as UART2, so I did not enable it. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-ld4-ref.dts | 4 ++++ arch/arm/boot/dts/uniphier-ld4.dtsi | 11 +++++++++++ arch/arm/boot/dts/uniphier-ld6b-ref.dts | 4 ++++ arch/arm/boot/dts/uniphier-pro4-ref.dts | 4 ++++ arch/arm/boot/dts/uniphier-pro4.dtsi | 11 +++++++++++ arch/arm/boot/dts/uniphier-pro5.dtsi | 11 +++++++++++ arch/arm/boot/dts/uniphier-pxs2.dtsi | 11 +++++++++++ arch/arm/boot/dts/uniphier-sld8-ref.dts | 4 ++++ arch/arm/boot/dts/uniphier-sld8.dtsi | 11 +++++++++++ 9 files changed, 71 insertions(+) -- 2.7.4 diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts index 86b089e9c163..b3aaab354f3e 100644 --- a/arch/arm/boot/dts/uniphier-ld4-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts @@ -64,3 +64,7 @@ &usb1 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi index 5d3924c8568c..91410609b181 100644 --- a/arch/arm/boot/dts/uniphier-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi @@ -285,6 +285,17 @@ #reset-cells = <1>; }; }; + + nand: nand@68000000 { + compatible = "socionext,uniphier-denali-nand-v5a"; + status = "disabled"; + reg-names = "nand_data", "denali_reg"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + interrupts = <0 65 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand2cs>; + clocks = <&sys_clk 2>; + }; }; }; diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts index 6dbdc86225e9..2188d114d79b 100644 --- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts @@ -58,3 +58,7 @@ &i2c0 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts index d3be37b2ac35..903df6348e77 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ref.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts @@ -66,3 +66,7 @@ &usb3 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi index 394b35e1082d..1d3d00d9c936 100644 --- a/arch/arm/boot/dts/uniphier-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi @@ -305,6 +305,17 @@ #reset-cells = <1>; }; }; + + nand: nand@68000000 { + compatible = "denali,denali-nand-uniphier-v5a"; + status = "disabled"; + reg-names = "nand_data", "denali_reg"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + interrupts = <0 65 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand>; + clocks = <&sys_clk 2>; + }; }; }; diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi index df0506b58330..759c2a53c29d 100644 --- a/arch/arm/boot/dts/uniphier-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi @@ -368,6 +368,17 @@ #reset-cells = <1>; }; }; + + nand: nand@68000000 { + compatible = "denali,denali-nand-uniphier-v5b"; + status = "disabled"; + reg-names = "nand_data", "denali_reg"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + interrupts = <0 65 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand2cs>; + clocks = <&sys_clk 2>; + }; }; }; diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index c26d4ba1b9c3..ed2b9a4516aa 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -352,6 +352,17 @@ #reset-cells = <1>; }; }; + + nand: nand@68000000 { + compatible = "socionext,uniphier-denali-nand-v5b"; + status = "disabled"; + reg-names = "nand_data", "denali_reg"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + interrupts = <0 65 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand2cs>; + clocks = <&sys_clk 2>; + }; }; }; diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts index 394f5df62eda..5accd3cc76e4 100644 --- a/arch/arm/boot/dts/uniphier-sld8-ref.dts +++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts @@ -68,3 +68,7 @@ &usb2 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi index 0c022fa5640c..756fed778de6 100644 --- a/arch/arm/boot/dts/uniphier-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi @@ -285,6 +285,17 @@ #reset-cells = <1>; }; }; + + nand: nand@68000000 { + compatible = "denali,denali-nand-uniphier-v5a"; + status = "disabled"; + reg-names = "nand_data", "denali_reg"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + interrupts = <0 65 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nand2cs>; + clocks = <&sys_clk 2>; + }; }; };