From patchwork Wed Aug 9 16:43:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109736 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1125367qge; Wed, 9 Aug 2017 09:45:00 -0700 (PDT) X-Received: by 10.84.197.3 with SMTP id m3mr9787005pld.241.1502297100565; Wed, 09 Aug 2017 09:45:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502297100; cv=none; d=google.com; s=arc-20160816; b=XkULW+jULr5S/Sj641+1goPwVJE72GMS8L9QssBaPxsNw8e3bhMwidCctRuwX7y6ul 1DboMsHbTa6R9Lh19LQsmmJGA853NAU8EogrvnZlOgThDUMhMZWZ09oeo4M6ckkcSc28 UpApsT7VkmPJpooyMAxKj5hD8NNj2Vb+8sSl2tgV1l0Ie7mTe+JCjUybUiBX+/Nrb8ND 7ssPoD/kwHVUxDQ4kLq486rMrnMjgflqYZNW1adh9b4/gYmuYbVjhWzTo/ZMazVHmeSj XmrYxnd53K9fQMsO4+cBCBmGV8F5au+ry3PvR/MEt1QK0UWD4dck1Rh84Jv2ce/9Hp/X Hgpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=gz8kIP8h2s4Uc5v4MFJ7ZyCmT+L0I6qe9ifAzTQIQkg=; b=npt1l1DS+/3g3wjNLbPN5r84eqj6nnt/vWddUD5Tu2TB5rxHncjVHpef++qT1fTYKR /rVz240ExFhso8MA7evqq1v+iY9yA1c6KAGHIeA9/xOFs5fVlMNyrl3BgFQY7elfwEzs aR3qJOE++dKKE8klgQiypTEiZA7wUyd31sFeATTjm2zWkl2qEQXojF1Dz0SDv8Z1mqLJ bJvP68p3YHqwOr9TyeF9XWrlYy21ptRXBvcnPjmD+bRGMLZYhygc/omJPOS1cpC1TJSi bJnw59JJE1vEpZ522T/m/3hhEIiErkoDX/vfl8wiEmdeR/2c5Hqu0MXDJB6aHFBKRkje 0WRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=oqB3S7CM; 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 x63si2798423pff.604.2017.08.09.09.45.00; Wed, 09 Aug 2017 09:45:00 -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=oqB3S7CM; 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 S1754291AbdHIQoz (ORCPT + 25 others); Wed, 9 Aug 2017 12:44:55 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:60873 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754197AbdHIQow (ORCPT ); Wed, 9 Aug 2017 12:44:52 -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 v79Ghj8s020252; Thu, 10 Aug 2017 01:43:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v79Ghj8s020252 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502297026; bh=gz8kIP8h2s4Uc5v4MFJ7ZyCmT+L0I6qe9ifAzTQIQkg=; h=From:To:Cc:Subject:Date:From; b=oqB3S7CMBkln5M+oW1rkUr/xgcdXYv2/jVdchGj/mHvA4fzbr2p4dT6P90kYeRNBb kq156JNTw5/33x602xOcZH6UDylesFu97d99RI4d3vk5C55iM/U0W3Ggdd9eCN40HG nCDwaM86zQjZcKHDZRPApJxksPRoiJQaFM4vaIzL4WYYJQSv40goQ+Wwybn9+Ndlpk dfQpWcAL/Ogo8wjKZUfVV0zyjR2cgnAAUGPJkmfpfjCwfI7e6b+ha7UCkeroqcmEqm NaXbhVHqpfmFQaCKOzxZ5uT3bYzjSqV9Z5haSpdxreBoEEMQd4n4xsevbeBISs6Eyk 39U7hCTOya6cA== 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 1/6] ARM: dts: uniphier: remove sLD3 SoC support Date: Thu, 10 Aug 2017 01:43:26 +0900 Message-Id: <1502297011-30201-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This SoC is too old. It is difficult to maintain any longer. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/Makefile | 1 - arch/arm/boot/dts/uniphier-sld3-ref.dts | 75 --------- arch/arm/boot/dts/uniphier-sld3.dtsi | 260 -------------------------------- 3 files changed, 336 deletions(-) delete mode 100644 arch/arm/boot/dts/uniphier-sld3-ref.dts delete mode 100644 arch/arm/boot/dts/uniphier-sld3.dtsi -- 2.7.4 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4b17f35dc9a7..ccf5b1da1948 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -970,7 +970,6 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-pro4-sanji.dtb \ uniphier-pxs2-gentil.dtb \ uniphier-pxs2-vodka.dtb \ - uniphier-sld3-ref.dtb \ uniphier-sld8-ref.dtb dtb-$(CONFIG_ARCH_VERSATILE) += \ versatile-ab.dtb \ diff --git a/arch/arm/boot/dts/uniphier-sld3-ref.dts b/arch/arm/boot/dts/uniphier-sld3-ref.dts deleted file mode 100644 index 70cda39a3dd2..000000000000 --- a/arch/arm/boot/dts/uniphier-sld3-ref.dts +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Device Tree Source for UniPhier sLD3 Reference Board - * - * Copyright (C) 2015-2016 Socionext Inc. - * Author: Masahiro Yamada - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) - */ - -/dts-v1/; -/include/ "uniphier-sld3.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" - -/ { - model = "UniPhier sLD3 Reference Board"; - compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3"; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - aliases { - serial0 = &serial0; - serial1 = &serial1; - serial2 = &serial2; - i2c0 = &i2c0; - i2c1 = &i2c1; - i2c2 = &i2c2; - i2c3 = &i2c3; - i2c4 = &i2c4; - }; - - memory@8000000 { - device_type = "memory"; - reg = <0x80000000 0x20000000 - 0xc0000000 0x20000000>; - }; -}; - -ðsc { - interrupts = <0 49 4>; -}; - -&serial0 { - status = "okay"; -}; - -&serial1 { - status = "okay"; -}; - -&serial2 { - status = "okay"; -}; - -&i2c0 { - status = "okay"; -}; - -&usb0 { - status = "okay"; -}; - -&usb1 { - status = "okay"; -}; - -&usb2 { - status = "okay"; -}; - -&usb3 { - status = "okay"; -}; diff --git a/arch/arm/boot/dts/uniphier-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi deleted file mode 100644 index 408287936613..000000000000 --- a/arch/arm/boot/dts/uniphier-sld3.dtsi +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Device Tree Source for UniPhier sLD3 SoC - * - * Copyright (C) 2015-2016 Socionext Inc. - * Author: Masahiro Yamada - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) - */ - -/ { - compatible = "socionext,uniphier-sld3"; - #address-cells = <1>; - #size-cells = <1>; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0>; - enable-method = "psci"; - next-level-cache = <&l2>; - }; - - cpu@1 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <1>; - enable-method = "psci"; - next-level-cache = <&l2>; - }; - }; - - psci { - compatible = "arm,psci-0.2"; - method = "smc"; - }; - - clocks { - refclk: ref { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <24576000>; - }; - - arm_timer_clk: arm_timer_clk { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <50000000>; - }; - }; - - soc { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - interrupt-parent = <&intc>; - - timer@20000200 { - compatible = "arm,cortex-a9-global-timer"; - reg = <0x20000200 0x20>; - interrupts = <1 11 0x304>; - clocks = <&arm_timer_clk>; - }; - - timer@20000600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0x20000600 0x20>; - interrupts = <1 13 0x304>; - clocks = <&arm_timer_clk>; - }; - - intc: interrupt-controller@20001000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - interrupt-controller; - reg = <0x20001000 0x1000>, - <0x20000100 0x100>; - }; - - l2: l2-cache@500c0000 { - compatible = "socionext,uniphier-system-cache"; - reg = <0x500c0000 0x2000>, <0x503c0100 0x4>, - <0x506c0000 0x400>; - interrupts = <0 174 4>, <0 175 4>; - cache-unified; - cache-size = <(512 * 1024)>; - cache-sets = <256>; - cache-line-size = <128>; - cache-level = <2>; - }; - - serial0: serial@54006800 { - compatible = "socionext,uniphier-uart"; - status = "disabled"; - reg = <0x54006800 0x40>; - interrupts = <0 33 4>; - clocks = <&sys_clk 0>; - }; - - serial1: serial@54006900 { - compatible = "socionext,uniphier-uart"; - status = "disabled"; - reg = <0x54006900 0x40>; - interrupts = <0 35 4>; - clocks = <&sys_clk 0>; - }; - - serial2: serial@54006a00 { - compatible = "socionext,uniphier-uart"; - status = "disabled"; - reg = <0x54006a00 0x40>; - interrupts = <0 37 4>; - clocks = <&sys_clk 0>; - }; - - i2c0: i2c@58400000 { - compatible = "socionext,uniphier-i2c"; - status = "disabled"; - reg = <0x58400000 0x40>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <0 41 1>; - clocks = <&sys_clk 1>; - clock-frequency = <100000>; - }; - - i2c1: i2c@58480000 { - compatible = "socionext,uniphier-i2c"; - status = "disabled"; - reg = <0x58480000 0x40>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <0 42 1>; - clocks = <&sys_clk 1>; - clock-frequency = <100000>; - }; - - i2c2: i2c@58500000 { - compatible = "socionext,uniphier-i2c"; - status = "disabled"; - reg = <0x58500000 0x40>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <0 43 1>; - clocks = <&sys_clk 1>; - clock-frequency = <100000>; - }; - - i2c3: i2c@58580000 { - compatible = "socionext,uniphier-i2c"; - status = "disabled"; - reg = <0x58580000 0x40>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <0 44 1>; - clocks = <&sys_clk 1>; - clock-frequency = <100000>; - }; - - /* chip-internal connection for DMD */ - i2c4: i2c@58600000 { - compatible = "socionext,uniphier-i2c"; - reg = <0x58600000 0x40>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <0 45 1>; - clocks = <&sys_clk 1>; - clock-frequency = <400000>; - }; - - system_bus: system-bus@58c00000 { - compatible = "socionext,uniphier-system-bus"; - status = "disabled"; - reg = <0x58c00000 0x400>; - #address-cells = <2>; - #size-cells = <1>; - }; - - smpctrl@59801000 { - compatible = "socionext,uniphier-smpctrl"; - reg = <0x59801000 0x400>; - }; - - mioctrl@59810000 { - compatible = "socionext,uniphier-sld3-mioctrl", - "simple-mfd", "syscon"; - reg = <0x59810000 0x800>; - - mio_clk: clock { - compatible = "socionext,uniphier-sld3-mio-clock"; - #clock-cells = <1>; - }; - - mio_rst: reset { - compatible = "socionext,uniphier-sld3-mio-reset"; - #reset-cells = <1>; - }; - }; - - usb0: usb@5a800100 { - compatible = "socionext,uniphier-ehci", "generic-ehci"; - status = "disabled"; - reg = <0x5a800100 0x100>; - interrupts = <0 80 4>; - clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>; - resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>, - <&mio_rst 12>; - }; - - usb1: usb@5a810100 { - compatible = "socionext,uniphier-ehci", "generic-ehci"; - status = "disabled"; - reg = <0x5a810100 0x100>; - interrupts = <0 81 4>; - clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>; - resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>, - <&mio_rst 13>; - }; - - usb2: usb@5a820100 { - compatible = "socionext,uniphier-ehci", "generic-ehci"; - status = "disabled"; - reg = <0x5a820100 0x100>; - interrupts = <0 82 4>; - clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>; - resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>, - <&mio_rst 14>; - }; - - usb3: usb@5a830100 { - compatible = "socionext,uniphier-ehci", "generic-ehci"; - status = "disabled"; - reg = <0x5a830100 0x100>; - interrupts = <0 83 4>; - clocks = <&mio_clk 7>, <&mio_clk 11>, <&mio_clk 15>; - resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 11>, - <&mio_rst 15>; - }; - - sysctrl@f1840000 { - compatible = "socionext,uniphier-sld3-sysctrl", - "simple-mfd", "syscon"; - reg = <0xf1840000 0x10000>; - - sys_clk: clock { - compatible = "socionext,uniphier-sld3-clock"; - #clock-cells = <1>; - }; - - sys_rst: reset { - compatible = "socionext,uniphier-sld3-reset"; - #reset-cells = <1>; - }; - }; - }; -}; From patchwork Wed Aug 9 16:43:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109735 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1125245qge; Wed, 9 Aug 2017 09:44:51 -0700 (PDT) X-Received: by 10.84.138.129 with SMTP id 1mr9805146plp.223.1502297091460; Wed, 09 Aug 2017 09:44:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502297091; cv=none; d=google.com; s=arc-20160816; b=NJQRlj5Pht0L9PjTmbYWQA02qDnaBuOgti9wmZia6NmErK2ReQCWKtd3xNEWkwOEC8 g2hLMxaUiS43Ut88vgLHUnQ3x1BxfJ54p8wqACgKtKO4lkosFZval/JOqcxYI3WVNXUe Ky18G22tcaQSamPu5btAAXDQyegAJ6pnCg5uqC3bB8ZaA71X6utaOyObDBrRxVJd9tbZ QoC74t38Av3l2BNoohTx0S3IMPErv6MELHV3DDGQbgpyJ+GYOyNnJKyXj3gVnzotPgj3 SpMvWc7EKvR5a0Eebmzp1uOlv3tPyGoYI8QiB2WMRF6MMqDaIDT5RmkCQ0WMurPlJFRC 8GmQ== 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=eapJQOpJ41V1/DfoG89++BxPBEAQYSPpah8uQ9y5jdE=; b=TI3cMekBxdsWdmGT+3Ug9rTp1/4mD3goXWr9mtk1VgVyShDyPixVVrOLS0nKegN3nH xjGUkqlc0vdHqB28Rsh4TMYCIiU87WK36+oVOvm3c3Fklkhfo1NK6Qj5VeAZHKkhWI6S vz3bRR5ySeDb4KuNYGJOI2M+8xRfAO7t7xYt6Amnkgo74CO327dXW9bjKh/leWvxDGUj 2tkPX5Kt28mAVlBmUkEMLbOkyZ91C8POeqpXdpJ1q+NpQeR88wsVJ3OgOTXI2aNVDZEH LLduL/U0DyE6tonoyzPluUtaqWoQZrzPjv59uCA5LmyysPx3ekteSGhZzihvi7U7s2hW VVSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Wunz1lyL; 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 c13si2652007pgn.688.2017.08.09.09.44.51; Wed, 09 Aug 2017 09:44:51 -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=Wunz1lyL; 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 S1754272AbdHIQot (ORCPT + 25 others); Wed, 9 Aug 2017 12:44:49 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:60725 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752757AbdHIQoo (ORCPT ); Wed, 9 Aug 2017 12:44:44 -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 v79Ghj8t020252; Thu, 10 Aug 2017 01:43:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v79Ghj8t020252 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502297026; bh=eapJQOpJ41V1/DfoG89++BxPBEAQYSPpah8uQ9y5jdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wunz1lyL6FGf6IdN1soAr1/Vd6AC+6GI21nlKvCtaRWqOZ7rTxUuvCQedvNQUs3Ii z5Dnr/OGcn4BR4qX886uZxkNlx/ML49UzYFHTwp/vWD85og5xNuPIABVXCtoWv2s9V GTsqPtRnwHD48tu+z90dyEA1NeQof6k2lLsGLOkfM0N5qLoxcK5hsS+QfoL4hbP98J CiYAwOEItgS/RKwHKwkA3O2te4R2O8bmB2x99+lN4JHIlCuaacqHV9hn4bpusOftI5 juvm50GLa/UORiF6WHWW5PiJHC9EynRrobUgXfJ51lK5FvaQ/PfoisjLFL5eAmzovF YWqb+WbW7vcwg== 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 2/6] ARM: dts: uniphier use #incluude instead of /include/ Date: Thu, 10 Aug 2017 01:43:27 +0900 Message-Id: <1502297011-30201-2-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 To include dt-bindings headers. Signed-off-by: Masahiro Yamada --- arch/arm/boot/dts/uniphier-ld4-ref.dts | 6 +++--- arch/arm/boot/dts/uniphier-ld4.dtsi | 2 +- arch/arm/boot/dts/uniphier-ld6b-ref.dts | 6 +++--- arch/arm/boot/dts/uniphier-ld6b.dtsi | 2 +- arch/arm/boot/dts/uniphier-pro4-ace.dts | 2 +- arch/arm/boot/dts/uniphier-pro4-ref.dts | 6 +++--- arch/arm/boot/dts/uniphier-pro4-sanji.dts | 2 +- arch/arm/boot/dts/uniphier-pro4.dtsi | 2 +- arch/arm/boot/dts/uniphier-pro5.dtsi | 2 +- arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 2 +- arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 2 +- arch/arm/boot/dts/uniphier-pxs2.dtsi | 2 +- arch/arm/boot/dts/uniphier-sld8-ref.dts | 6 +++--- arch/arm/boot/dts/uniphier-sld8.dtsi | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/uniphier-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ld4-ref.dts index 4817ebb28eb2..86b089e9c163 100644 --- a/arch/arm/boot/dts/uniphier-ld4-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld4-ref.dts @@ -8,9 +8,9 @@ */ /dts-v1/; -/include/ "uniphier-ld4.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" +#include "uniphier-ld4.dtsi" +#include "uniphier-ref-daughter.dtsi" +#include "uniphier-support-card.dtsi" / { model = "UniPhier LD4 Reference Board"; diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi index fb2fd9605b9d..5d3924c8568c 100644 --- a/arch/arm/boot/dts/uniphier-ld4.dtsi +++ b/arch/arm/boot/dts/uniphier-ld4.dtsi @@ -288,4 +288,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ld6b-ref.dts index 96db4abc02c3..6dbdc86225e9 100644 --- a/arch/arm/boot/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/boot/dts/uniphier-ld6b-ref.dts @@ -8,9 +8,9 @@ */ /dts-v1/; -/include/ "uniphier-ld6b.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" +#include "uniphier-ld6b.dtsi" +#include "uniphier-ref-daughter.dtsi" +#include "uniphier-support-card.dtsi" / { model = "UniPhier LD6b Reference Board"; diff --git a/arch/arm/boot/dts/uniphier-ld6b.dtsi b/arch/arm/boot/dts/uniphier-ld6b.dtsi index 8b9a79731bd3..9a7b25cc8233 100644 --- a/arch/arm/boot/dts/uniphier-ld6b.dtsi +++ b/arch/arm/boot/dts/uniphier-ld6b.dtsi @@ -12,7 +12,7 @@ * The D-chip (digital chip) is the same as the PXs2 die. * Reuse the PXs2 device tree with some properties overridden. */ -/include/ "uniphier-pxs2.dtsi" +#include "uniphier-pxs2.dtsi" / { compatible = "socionext,uniphier-ld6b"; diff --git a/arch/arm/boot/dts/uniphier-pro4-ace.dts b/arch/arm/boot/dts/uniphier-pro4-ace.dts index 11690b57931c..089419cee273 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ace.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ace.dts @@ -8,7 +8,7 @@ */ /dts-v1/; -/include/ "uniphier-pro4.dtsi" +#include "uniphier-pro4.dtsi" / { model = "UniPhier Pro4 Ace Board"; diff --git a/arch/arm/boot/dts/uniphier-pro4-ref.dts b/arch/arm/boot/dts/uniphier-pro4-ref.dts index 4cf539245f2e..d3be37b2ac35 100644 --- a/arch/arm/boot/dts/uniphier-pro4-ref.dts +++ b/arch/arm/boot/dts/uniphier-pro4-ref.dts @@ -8,9 +8,9 @@ */ /dts-v1/; -/include/ "uniphier-pro4.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" +#include "uniphier-pro4.dtsi" +#include "uniphier-ref-daughter.dtsi" +#include "uniphier-support-card.dtsi" / { model = "UniPhier Pro4 Reference Board"; diff --git a/arch/arm/boot/dts/uniphier-pro4-sanji.dts b/arch/arm/boot/dts/uniphier-pro4-sanji.dts index 2763cebcd76a..adef212b45b2 100644 --- a/arch/arm/boot/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/boot/dts/uniphier-pro4-sanji.dts @@ -8,7 +8,7 @@ */ /dts-v1/; -/include/ "uniphier-pro4.dtsi" +#include "uniphier-pro4.dtsi" / { model = "UniPhier Pro4 Sanji Board"; diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi index 37400becf4ba..394b35e1082d 100644 --- a/arch/arm/boot/dts/uniphier-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi @@ -308,4 +308,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi index 140327ddde1c..df0506b58330 100644 --- a/arch/arm/boot/dts/uniphier-pro5.dtsi +++ b/arch/arm/boot/dts/uniphier-pro5.dtsi @@ -371,4 +371,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts index 81560f75bfa7..7dfae2667f50 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts @@ -8,7 +8,7 @@ */ /dts-v1/; -/include/ "uniphier-pxs2.dtsi" +#include "uniphier-pxs2.dtsi" / { model = "UniPhier PXs2 Gentil Board"; diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts index dc2d0579c666..0cf615463a82 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts @@ -8,7 +8,7 @@ */ /dts-v1/; -/include/ "uniphier-pxs2.dtsi" +#include "uniphier-pxs2.dtsi" / { model = "UniPhier PXs2 Vodka Board"; diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index bace751d4023..c26d4ba1b9c3 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -355,4 +355,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts index 4536d5b71297..394f5df62eda 100644 --- a/arch/arm/boot/dts/uniphier-sld8-ref.dts +++ b/arch/arm/boot/dts/uniphier-sld8-ref.dts @@ -8,9 +8,9 @@ */ /dts-v1/; -/include/ "uniphier-sld8.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" +#include "uniphier-sld8.dtsi" +#include "uniphier-ref-daughter.dtsi" +#include "uniphier-support-card.dtsi" / { model = "UniPhier sLD8 Reference Board"; diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi index 9fb9167f2db4..0c022fa5640c 100644 --- a/arch/arm/boot/dts/uniphier-sld8.dtsi +++ b/arch/arm/boot/dts/uniphier-sld8.dtsi @@ -288,4 +288,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" From patchwork Wed Aug 9 16:43:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109734 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1125144qge; Wed, 9 Aug 2017 09:44:45 -0700 (PDT) X-Received: by 10.84.224.134 with SMTP id s6mr9802659plj.4.1502297085084; Wed, 09 Aug 2017 09:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502297085; cv=none; d=google.com; s=arc-20160816; b=gERO6iIOV2sxbpBpwGEiUa79bFPHefKY8wc+WZ25Wr/KMaY5jgIWBVYKikqRWeJVm0 BTNWsFDbKnmqZ9K9W6+tMC5CHmSb48HUiGDlw1LkvqU/mdj4LqGNN7HMddRoIUDI66bx o/EE/m1FUUWyjttOuslz+qOnmDfjo/pW1PSWERpW84duz77scDcvLDlII9/D7pSix1Xt WrriD+3IQNPnnr94roFtiYsseyAiqPZdsHR9HI0niqbmNZVKvodQyPyu3qWSuHL89Zp2 R82wIIfn5r1j2ODJ5vgOCpFk7qD1MY5QlqQaJL4JfiC0sK8xOxjBXvZzJUsyLpigzQyT J85A== 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=W9kdn/yjkGKb5WYBdFfAtDxzo75nmYIqsf98gceCBJ4=; b=uQAMQc3ADfUPjGKdhaax2QsmFHXT2P4WC4/a7gcNe6+8yILM76jvL+A2/+vSLai3RW 3xOAeaswrEfiPCq69MtOzDITNwdaJVVo9Vk2h6pkHjj4S98D4LvMcTYuCIuESQmIv5/j 66/mX0Fbao3Kz1TQSfE6HWlXyeTJcDrmet4FNUrB8GG9Y/6Bx78jnyIKz2q92Zcy2yNb EsHvI0vO4goaogKuMuc9Qrfkd8kiAA4qNv46c43zd7ecauWQz8Ko2vGbD2g3F+M2fKhA 2/p+8MVidu9P2nW2v6bM+JJ2kt0bKoIZsuYI2MP992ZyJuYEe1qQpj6I7FcFL4CrSLk7 5Epw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=HIwVp9z8; 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 c13si2652007pgn.688.2017.08.09.09.44.44; Wed, 09 Aug 2017 09:44:45 -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=HIwVp9z8; 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 S1754232AbdHIQom (ORCPT + 25 others); Wed, 9 Aug 2017 12:44:42 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:60667 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbdHIQok (ORCPT ); Wed, 9 Aug 2017 12:44:40 -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 v79Ghj8u020252; Thu, 10 Aug 2017 01:43:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v79Ghj8u020252 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502297026; bh=W9kdn/yjkGKb5WYBdFfAtDxzo75nmYIqsf98gceCBJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HIwVp9z8CMAq6lg/CqjN/uhKpx701Jyelz5LzA+RlaHMT6p1TTgeMGlnhbxPhc0qD ioF+IbJA/pGUTZplJgPbMzqANg/NAJYFua0osI415ZgafxS2eul7geBrFMmdXFHXul VNyqPVTPOxfDYvxjGhQhRVlqDbDvQsSbsKwHaJtH+TBpDDypzbPo/u/LEtAp4T1YP/ DEAPDKGMt4gcU1lmuOtUg460Ro0cR0TsZDbQmuEFkjwA9+sBjgBSCimX5hI0Ica60v mAUjx+ozDvtLaCehfbpUsR5tVZcudFXwqWquUuvTGMFFOw1or1REfmTi76K+xbqVyd iKZlErcr0AU9Q== 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 3/6] arm64: dts: uniphier: use #include instead of /include/ Date: Thu, 10 Aug 2017 01:43:28 +0900 Message-Id: <1502297011-30201-3-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 To include dt-bindings headers. Signed-off-by: Masahiro Yamada --- arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 6 +++--- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 6 +++--- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts index 115357018ef7..bc3099a0d38f 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -9,7 +9,7 @@ */ /dts-v1/; -/include/ "uniphier-ld11.dtsi" +#include "uniphier-ld11.dtsi" / { model = "UniPhier LD11 Global Board (REF_LD11_GP)"; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts index cc8ebe34c27c..ffb473ad2e0f 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts @@ -8,9 +8,9 @@ */ /dts-v1/; -/include/ "uniphier-ld11.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" +#include "uniphier-ld11.dtsi" +#include "uniphier-ref-daughter.dtsi" +#include "uniphier-support-card.dtsi" / { model = "UniPhier LD11 Reference Board"; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index bdce5b89baec..e420268295d9 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -371,4 +371,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index 9f620d4101b5..763c4d86b12c 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -9,7 +9,7 @@ */ /dts-v1/; -/include/ "uniphier-ld20.dtsi" +#include "uniphier-ld20.dtsi" / { model = "UniPhier LD20 Global Board (REF_LD20_GP)"; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts index 494166aee24c..1ca0c8620dc5 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts @@ -8,9 +8,9 @@ */ /dts-v1/; -/include/ "uniphier-ld20.dtsi" -/include/ "uniphier-ref-daughter.dtsi" -/include/ "uniphier-support-card.dtsi" +#include "uniphier-ld20.dtsi" +#include "uniphier-ref-daughter.dtsi" +#include "uniphier-support-card.dtsi" / { model = "UniPhier LD20 Reference Board"; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index de1e75362817..5cdd7a9db412 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -392,4 +392,4 @@ }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" From patchwork Wed Aug 9 16:43:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109737 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1125723qge; Wed, 9 Aug 2017 09:45:18 -0700 (PDT) X-Received: by 10.98.198.72 with SMTP id m69mr8836556pfg.188.1502297118542; Wed, 09 Aug 2017 09:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502297118; cv=none; d=google.com; s=arc-20160816; b=ipvcx33tOWlvNYgCUwScdb7F/hOLG5LhOrE9giY2KtzE6WexO5Tb25/O0ekNJgW/A6 CR5LjYBCiCRp4cxsFcNNbYYJnd5hD6mAjJdo+6syHKMEwe7sNpcnWOyOO91tWguAKBI0 2IsJ/ZUJ+zVbRG5B/WYTiD6uTM5gwfhpUHlh1Z3tzt6UvsKXyieoKfsodw7Ag7FmcYcj DQPZ+KbTcesvG/aP6FZ/o20fAZS78hoOrtW6HO6WJop59CcuIkYKo38VWnakQHyr+n4z tqfn3XEGyoMnZglWnCfAMcD8wrUk4Rq7eMdQrVz72fu7P+fLgyvHfKF4rKBLQWDMWvaK pS2w== 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=HHpkach8YDRio1Vmll2czMK87e/dpxFwMJ0Au1vL/lc=; b=kvh+Va/uEZ0Aff/w3zJ62eaYn6KCx7M47w6xHHv8G2ZvvMt8jibBwwXcWax//shJK4 LcreC/nhiEk0WdygUzXhVpboLQQokhC0VymfRKo/w2GGI0TvnCVqXwjiLI0sHkQsaDRv wmRvNYQd69s8bnOXy17C3ulcNUkhW+5UcxENrhW9u3+QJqJRYk2sYaH5fl5eJZ2nzV/S /la0B5WlOYIHOZ4ynw/sUNMzLC455PWg66SfSN1Ry/sABVwDWa4HeSCVhjUzqv3ijknx PecoKTxJd6lgjXXHAHC/qshK+JfM8E7L61/QkIIxYuGAlNdwQ9YdRvOQHNeTD8ouhbBe N8jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=fb4JQpuK; 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 x63si2798423pff.604.2017.08.09.09.45.17; Wed, 09 Aug 2017 09:45:18 -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=fb4JQpuK; 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 S1754255AbdHIQos (ORCPT + 25 others); Wed, 9 Aug 2017 12:44:48 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:60760 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754197AbdHIQop (ORCPT ); Wed, 9 Aug 2017 12:44:45 -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 v79Ghj8v020252; Thu, 10 Aug 2017 01:43:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v79Ghj8v020252 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502297027; bh=HHpkach8YDRio1Vmll2czMK87e/dpxFwMJ0Au1vL/lc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fb4JQpuK/gwISVcvbZV1IwAz7thb1UkX59UHLY4Uwi1ZvsiWL6W0UDIz5v+qJBSPQ JciZTI9hh2doUhpIEfrWzlBwsHWqGVyYx2Wgrf8eYStCd7QeoZm2g6onC0roKEKt6f CV1oqEj0tT4BwQ66O75bgPU34hruzUrshyI0xwPtwMbB4vcVOrAB/aSYRykPKPFLRl 4NFswsYIb+XODs5dAv5LmnrfxgN7dChGMYxoUb6swqEPbE+VnaPHCPGL1B6kx1+3Eg i91KNtFcEtjop3nglQNBy8w1vNOXVAkL20WKqMiNVZqyZ4hXhbCBJYvvI0t2fJoMJu dOqYPQHgmRWEQ== 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 4/6] arm64: dts: uniphier: use cross-arch include instead of symlinks Date: Thu, 10 Aug 2017 01:43:29 +0900 Message-Id: <1502297011-30201-4-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 On UniPhier platform, some DTSI files are shared between arm and arm64. Recently, inclusion of DT material of different architectures has been supported by the build system level. Use #include , which will work without relying on the exact same hierarchy as the kernel. Signed-off-by: Masahiro Yamada --- arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi -- 2.7.4 diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi deleted file mode 120000 index f42fb6f38bd3..000000000000 --- a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/uniphier-pinctrl.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi new file mode 100644 index 000000000000..9caabbb8bae3 --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi @@ -0,0 +1 @@ +#include diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi deleted file mode 120000 index 4685a8d89cba..000000000000 --- a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/uniphier-ref-daughter.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi new file mode 100644 index 000000000000..e66d999d9f5d --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi @@ -0,0 +1 @@ +#include diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi deleted file mode 120000 index 1246db9be2a1..000000000000 --- a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi +++ /dev/null @@ -1 +0,0 @@ -../../../../arm/boot/dts/uniphier-support-card.dtsi \ No newline at end of file diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi new file mode 100644 index 000000000000..28c5b4ed1d95 --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi @@ -0,0 +1 @@ +#include 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>; + }; }; }; From patchwork Wed Aug 9 16:43:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109738 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1126062qge; Wed, 9 Aug 2017 09:45:36 -0700 (PDT) X-Received: by 10.99.119.76 with SMTP id s73mr8326333pgc.374.1502297135971; Wed, 09 Aug 2017 09:45:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502297135; cv=none; d=google.com; s=arc-20160816; b=dNV6UDSvVdmpcmulSKxmiy6AcX5kSIESm2G01zytR0hkdGxD57CigClJPSLtIycg9l 8rjqg8QBnCkbFEW2Un71XFFVP9e9c21EDWreRV0lHEWpAtWWlydgvi8POxKpnJEMtVhy shi+aLMlLaJTp6gQ6RXKG50vxVMLePtJJULzSAQES2yV2Nhoqmv2ghb6Gd8PrAPC+XM/ a4EMuYLcKtMbDyMLKNSJeTBqACFhdOZ9OC04wWzZGnykf928vZ3OG8hC0/yR+JlaQ/8R tTiwD80x6eY3kn6qitXVN12oWOXB2VDD6ts9SXavzfbaoC5OfO7N6N+BlU9jvWh9qQv+ XHOQ== 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=u9P7NMB4fPAofrrT1Ue3vS9JdqaKr6rbb9M7+AJVSD4=; b=FaURQ1iKyVL8n7n25fBaHkxj856nbxcX07ydJMy5jGtEQyKCAscpoT+4JgG3L6cYq5 XM9N0DIb1SWyIJmOXfwHXaP6DRL1ovrXViblbyzWzE6dT6Sn3c5AnKzTyYdvEnYJo8D/ gdeTHiKl1HjiOhvBpM1UQ+dhkrgkllVTyFOHLJ5RS27lvV2vc7r26eSuCWK/cEN5ORQr XvL6k3fLp0N468veK/vMQhyvm9o4kOdvV/cyvFBkOo0DlUfoatRm5hwQGVTzpqhV6+Vl jhN3urvpINonKrKKg3h5gBBk/re2BrVbcYdJYH9RsW2JQqYhMAeZ/0cGxG7Hlt4+4Cn2 dcrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=M1hjG6JX; 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.35; Wed, 09 Aug 2017 09:45:35 -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=M1hjG6JX; 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 S1754366AbdHIQpc (ORCPT + 25 others); Wed, 9 Aug 2017 12:45:32 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:60780 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754236AbdHIQoq (ORCPT ); Wed, 9 Aug 2017 12:44:46 -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 v79Ghj8x020252; Thu, 10 Aug 2017 01:43:47 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com v79Ghj8x020252 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502297028; bh=u9P7NMB4fPAofrrT1Ue3vS9JdqaKr6rbb9M7+AJVSD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M1hjG6JXI4yQBuptZrVV1hAr19YcglPh+HskZ77mCMa9hQedZqRCbgRDCz7AVgu07 Iibta7dI3Ppizz1PvNFOoFajV1M9E6LnmhO+FROfTHBU8WiOL3RP6mejyY++SdIXu3 k+kY31MoJkmSzpAGsAepS5apVhIaQQgKYSA+nfxtDj2o3wQCB7NoB6Pgwj8GRoDPVr nP+4Y3Lnn5jrCNYTRTlcckb/Mbl7v0WYeKHJPu+zMYjFWbO8R01qFxrdm7qCnHsJcW ro4ZtPlrxk5OugIwJAVuR2OH1lbnK6LE6c1tDS1/K1COKrCkgBwosaGaEfhTA/Csxh mjKHNUrrqPWSw== 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 6/6] arm64: dts: uniphier: add Denali NAND controller nodes Date: Thu, 10 Aug 2017 01:43:31 +0900 Message-Id: <1502297011-30201-6-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 LD11 and LD20. Neither of them supports the CS1 line, so pinctrl is set up for a single CS line. Signed-off-by: Masahiro Yamada --- arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 4 ++++ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 11 +++++++++++ arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 4 ++++ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 11 +++++++++++ 4 files changed, 30 insertions(+) -- 2.7.4 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts index ffb473ad2e0f..d80d4c999157 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts @@ -62,3 +62,7 @@ &usb2 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index e420268295d9..d85f058b55d1 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -368,6 +368,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_nand>; + clocks = <&sys_clk 2>; + }; }; }; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts index 1ca0c8620dc5..fd6d2cae3b3e 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts @@ -50,3 +50,7 @@ &i2c0 { status = "okay"; }; + +&nand { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index 5cdd7a9db412..0c4bcdcac0db 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -389,6 +389,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_nand>; + clocks = <&sys_clk 2>; + }; }; };