From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@free-electrons.com (Gregory CLEMENT) Date: Mon, 29 Aug 2016 11:29:25 +0200 Subject: [PATCH] ARM: dts: mvebu: fix reference to a390 spi controller In-Reply-To: <20160826153925.863488-1-arnd@arndb.de> (Arnd Bergmann's message of "Fri, 26 Aug 2016 17:38:54 +0200") References: <20160826153925.863488-1-arnd@arndb.de> Message-ID: <87k2ezhqiy.fsf@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Arnd, On ven., ao?t 26 2016, Arnd Bergmann wrote: > 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 at 10680/spi-flash at 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 at 10680/spi-flash at 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") Applied on mvebu/dt Thanks, Gregory > --- > arch/arm/boot/dts/armada-390-db.dts | 60 ++++++++++++++++++------------------- > 1 file changed, 30 insertions(+), 30 deletions(-) > > 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 at 10680 { > - status = "okay"; > - pinctrl-0 = <&spi1_pins>; > - pinctrl-names = "default"; > - > - spi-flash at 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 at 0 { > - label = "U-Boot"; > - reg = <0 0x400000>; > - }; > - partition at 400000 { > - label = "Filesystem"; > - reg = <0x400000 0xc00000>; > - }; > - }; > - }; > - }; > - > i2c at 11000 { > status = "okay"; > clock-frequency = <100000>; > @@ -173,3 +143,33 @@ > }; > }; > }; > + > +&spi1 { > + status = "okay"; > + pinctrl-0 = <&spi1_pins>; > + pinctrl-names = "default"; > + > + spi-flash at 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 at 0 { > + label = "U-Boot"; > + reg = <0 0x400000>; > + }; > + partition at 400000 { > + label = "Filesystem"; > + reg = <0x400000 0xc00000>; > + }; > + }; > + }; > +}; > -- > 2.9.0 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gregory CLEMENT Subject: Re: [PATCH] ARM: dts: mvebu: fix reference to a390 spi controller Date: Mon, 29 Aug 2016 11:29:25 +0200 Message-ID: <87k2ezhqiy.fsf@free-electrons.com> References: <20160826153925.863488-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <20160826153925.863488-1-arnd-r2nGTMty4D4@public.gmane.org> (Arnd Bergmann's message of "Fri, 26 Aug 2016 17:38:54 +0200") Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Arnd Bergmann Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Stefan Roese , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org Hi Arnd, On ven., août 26 2016, Arnd Bergmann wrote: > 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") Applied on mvebu/dt Thanks, Gregory > --- > arch/arm/boot/dts/armada-390-db.dts | 60 ++++++++++++++++++------------------- > 1 file changed, 30 insertions(+), 30 deletions(-) > > 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>; > + }; > + }; > + }; > +}; > -- > 2.9.0 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932841AbcH2J33 convert rfc822-to-8bit (ORCPT ); Mon, 29 Aug 2016 05:29:29 -0400 Received: from down.free-electrons.com ([37.187.137.238]:54775 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756842AbcH2J32 (ORCPT ); Mon, 29 Aug 2016 05:29:28 -0400 From: Gregory CLEMENT To: Arnd Bergmann Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Stefan Roese , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: dts: mvebu: fix reference to a390 spi controller References: <20160826153925.863488-1-arnd@arndb.de> Date: Mon, 29 Aug 2016 11:29:25 +0200 In-Reply-To: <20160826153925.863488-1-arnd@arndb.de> (Arnd Bergmann's message of "Fri, 26 Aug 2016 17:38:54 +0200") Message-ID: <87k2ezhqiy.fsf@free-electrons.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnd, On ven., août 26 2016, Arnd Bergmann wrote: > 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") Applied on mvebu/dt Thanks, Gregory > --- > arch/arm/boot/dts/armada-390-db.dts | 60 ++++++++++++++++++------------------- > 1 file changed, 30 insertions(+), 30 deletions(-) > > 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>; > + }; > + }; > + }; > +}; > -- > 2.9.0 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com