From patchwork Fri Aug 26 15:38:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101922 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp418529qga; Fri, 26 Aug 2016 08:40:38 -0700 (PDT) X-Received: by 10.66.170.44 with SMTP id aj12mr7150202pac.131.1472226035186; Fri, 26 Aug 2016 08:40:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f184si21812323pfb.129.2016.08.26.08.40.34; Fri, 26 Aug 2016 08:40: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; 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 S1754487AbcHZPkd (ORCPT + 27 others); Fri, 26 Aug 2016 11:40:33 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:64620 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754196AbcHZPkb (ORCPT ); Fri, 26 Aug 2016 11:40:31 -0400 Received: from wuerfel.lan. ([176.0.135.42]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0M03PY-1aptSt0prg-00uI3t; Fri, 26 Aug 2016 17:39:27 +0200 From: Arnd Bergmann To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Cc: Arnd Bergmann , Stefan Roese , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: dts: mvebu: fix reference to a390 spi controller Date: Fri, 26 Aug 2016 17:38:54 +0200 Message-Id: <20160826153925.863488-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:cIHuipSTjO9D9xIqMKODMowyOGMXoBeLhCF8FbSqnECCllbXvBl uWgzL1q3LSm23omyw//trk8H1ObyMDwBZuVsQHarMHBRUAUXZ5fBEQElZmBv5iq81eLCjV6 dx6j/HnEOKTVmYi71ZzME1pG5LrS5IdBNTC3S5ToI5winG0jaGxn+2BSMH12u7E/VvL2+Im n+6IQk0Y6/CggR0iafLQw== X-UI-Out-Filterresults: notjunk:1; V01:K0:XURicdfzNUg=:5B6euTqb1XoOQqgeieFYL3 AZx9tstDpIZKpE/qTP2DkxC7tPIfH9UyJ+jt9ErYm9STPedWQg3K3ES7YVhJuidGMYEoxYSQh 09TjQPg5BnxhfF6okUZQ2zVsYGi1e2BoXZ70V/NvWhviFi/VQEkgraXhcLt7kQOfiyowDmTZM 12bUpIQFs61jLhS8e7LPqm7M6fLiTLFdfwtRibUWYcIkT6m//BJashLijsuOvonil7dQUAqsP Z4vEnpyibZnYAjuOx+APd6+aIw8Dexg3jWLSVw3QycobRjv/qNaX6weZfsQzMf84tEa9ole+b 9DDAz2H8NBY7HTOpfhNtztLVGpsv4OUQRG1uuSNYTKIqV4CIykzIgKYc2T31+Js2RSHMmg9dD Nl5EaNewkJKFKPb+aWia3xArYKPaTVlkBYuZC4M4ddwNdwD8l9LB1DsFB9R+35fqou37xpqDS NHpqWCc9JCq6U2aY+Vvde7nRItleAvFTcgc8QNWzn8VQM+cJjYaFXIuMnVwXi8ZDcpToo7lfH akcrGJvUiSNHpefyaGULx5zqG2FFjL2pcDX2UkWevRQn8JUJtvZROGWt5IKrXKgFwasj0niJy Jg4F12076XFvOtV/oJJTXSS893FK0nwlqQZrYNQ2AjWbQPlcbwOkswVzKoOlGr3/1IvDiGJ+W j1QgZmVtPtqz9VseSoeY+KBmJD/qUVRgdkYZhercVmyDE8Z+OISB1nXpLYMyuKYlyU3c= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The SPI controller in the arch/arm/boot/dts/armada-39x.dtsi file has moved to a different location in the hierarchy, which breaks the overrides in the board specific file: Warning (reg_format): "reg" property in /soc/internal-regs/spi@10680/spi-flash@1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi@10680/spi-flash@1 This changes the board to reference the spi controller by its label (which has not changed) rather than the full path. Signed-off-by: Arnd Bergmann Fixes: 0160a4b68987 ("ARM: dts: mvebu: A37x/XP/38x/39x: Move SPI controller nodes into 'soc' node") --- arch/arm/boot/dts/armada-390-db.dts | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) -- 2.9.0 diff --git a/arch/arm/boot/dts/armada-390-db.dts b/arch/arm/boot/dts/armada-390-db.dts index 9d0d9b2e9bfc..34e279d973c8 100644 --- a/arch/arm/boot/dts/armada-390-db.dts +++ b/arch/arm/boot/dts/armada-390-db.dts @@ -66,36 +66,6 @@ MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; internal-regs { - spi@10680 { - status = "okay"; - pinctrl-0 = <&spi1_pins>; - pinctrl-names = "default"; - - spi-flash@1 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "n25q128a13", - "jedec,spi-nor"; - reg = <0>; /* Chip select 0 */ - spi-max-frequency = <108000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "U-Boot"; - reg = <0 0x400000>; - }; - partition@400000 { - label = "Filesystem"; - reg = <0x400000 0xc00000>; - }; - }; - }; - }; - i2c@11000 { status = "okay"; clock-frequency = <100000>; @@ -173,3 +143,33 @@ }; }; }; + +&spi1 { + status = "okay"; + pinctrl-0 = <&spi1_pins>; + pinctrl-names = "default"; + + spi-flash@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "n25q128a13", + "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "U-Boot"; + reg = <0 0x400000>; + }; + partition@400000 { + label = "Filesystem"; + reg = <0x400000 0xc00000>; + }; + }; + }; +};