* [PATCH v2 2/5] arm64: dts: fsl: ls1046a: disable the flash controller by default
2018-09-03 14:08 [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Alexandre Belloni
@ 2018-09-03 14:08 ` Alexandre Belloni
2018-09-03 14:08 ` [PATCH v2 3/5] arm64: dts: fsl: ls1046a: disable uarts " Alexandre Belloni
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Alexandre Belloni @ 2018-09-03 14:08 UTC (permalink / raw)
To: Shawn Guo; +Cc: Li Yang, linux-kernel, linux-arm-kernel, Alexandre Belloni
Set the Integrated Flash Controller status to disabled so each board has
the option to enable it. All the existing users have status = "okay" so
there is no functional change.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index ef83786b8b90..2d8122019cd8 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -200,6 +200,7 @@
reg = <0x0 0x1530000 0x0 0x10000>;
big-endian;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
};
qspi: quadspi@1550000 {
--
2.19.0.rc1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/5] arm64: dts: fsl: ls1046a: disable uarts by default
2018-09-03 14:08 [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Alexandre Belloni
2018-09-03 14:08 ` [PATCH v2 2/5] arm64: dts: fsl: ls1046a: disable the flash controller by default Alexandre Belloni
@ 2018-09-03 14:08 ` Alexandre Belloni
2018-09-03 14:08 ` [PATCH v2 4/5] dt-bindings: Add vendor prefix for Microsys Alexandre Belloni
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Alexandre Belloni @ 2018-09-03 14:08 UTC (permalink / raw)
To: Shawn Guo; +Cc: Li Yang, linux-kernel, linux-arm-kernel, Alexandre Belloni
Disable the UARTs by defaultto avoid registering unused UARTs. This
effectively change the number of registered UARTS for the RDB and QDS from
4 to 2 but this seems the right thing to do.
It is especially useful when connecting other 8250 uart on PCIe for example
as the default maximum number of 8250 UARTs that can be registered is 4.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index 2d8122019cd8..62ae3ee19d6f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -423,6 +423,7 @@
reg = <0x00 0x21c0500 0x0 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>;
+ status = "disabled";
};
duart1: serial@21c0600 {
@@ -430,6 +431,7 @@
reg = <0x00 0x21c0600 0x0 0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>;
+ status = "disabled";
};
duart2: serial@21d0500 {
@@ -437,6 +439,7 @@
reg = <0x0 0x21d0500 0x0 0x100>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>;
+ status = "disabled";
};
duart3: serial@21d0600 {
@@ -444,6 +447,7 @@
reg = <0x0 0x21d0600 0x0 0x100>;
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clockgen 4 1>;
+ status = "disabled";
};
gpio0: gpio@2300000 {
--
2.19.0.rc1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 4/5] dt-bindings: Add vendor prefix for Microsys
2018-09-03 14:08 [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Alexandre Belloni
2018-09-03 14:08 ` [PATCH v2 2/5] arm64: dts: fsl: ls1046a: disable the flash controller by default Alexandre Belloni
2018-09-03 14:08 ` [PATCH v2 3/5] arm64: dts: fsl: ls1046a: disable uarts " Alexandre Belloni
@ 2018-09-03 14:08 ` Alexandre Belloni
2018-09-10 0:38 ` Shawn Guo, Rob Herring
2018-09-03 14:08 ` [PATCH v2 5/5] arm64: dts: add Microsys MPX-LS1046A SoM and SBC-LS1046A SBC Alexandre Belloni
2018-09-10 0:39 ` [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Shawn Guo
4 siblings, 1 reply; 9+ messages in thread
From: Alexandre Belloni @ 2018-09-03 14:08 UTC (permalink / raw)
To: Shawn Guo; +Cc: Li Yang, linux-kernel, linux-arm-kernel, Alexandre Belloni
Add vendor prefix for MicroSys Electronics GmbH
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 2c3fc512e746..10155a44b783 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -235,6 +235,7 @@ micrel Micrel Inc.
microchip Microchip Technology Inc.
microcrystal Micro Crystal AG
micron Micron Technology Inc.
+microsys MicroSys Electronics GmbH
minix MINIX Technology Ltd.
miramems MiraMEMS Sensing Technology Co., Ltd.
mitsubishi Mitsubishi Electric Corporation
--
2.19.0.rc1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 4/5] dt-bindings: Add vendor prefix for Microsys
2018-09-03 14:08 ` [PATCH v2 4/5] dt-bindings: Add vendor prefix for Microsys Alexandre Belloni
@ 2018-09-10 0:38 ` Shawn Guo, Rob Herring
2018-09-10 7:54 ` Alexandre Belloni
0 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo, Rob Herring @ 2018-09-10 0:38 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: Li Yang, linux-kernel, linux-arm-kernel
+Rob
@Rob, Are you okay with this? The patch should really be sent to you
from the beginning.
Shawn
On Mon, Sep 03, 2018 at 04:08:39PM +0200, Alexandre Belloni wrote:
> Add vendor prefix for MicroSys Electronics GmbH
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
> index 2c3fc512e746..10155a44b783 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@ -235,6 +235,7 @@ micrel Micrel Inc.
> microchip Microchip Technology Inc.
> microcrystal Micro Crystal AG
> micron Micron Technology Inc.
> +microsys MicroSys Electronics GmbH
> minix MINIX Technology Ltd.
> miramems MiraMEMS Sensing Technology Co., Ltd.
> mitsubishi Mitsubishi Electric Corporation
> --
> 2.19.0.rc1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 4/5] dt-bindings: Add vendor prefix for Microsys
2018-09-10 0:38 ` Shawn Guo, Rob Herring
@ 2018-09-10 7:54 ` Alexandre Belloni
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Belloni @ 2018-09-10 7:54 UTC (permalink / raw)
To: Shawn Guo, Rob Herring; +Cc: Li Yang, linux-kernel, linux-arm-kernel
On 10/09/2018 08:38:53+0800, Shawn Guo wrote:
> +Rob
>
> @Rob, Are you okay with this? The patch should really be sent to you
> from the beginning.
>
Ah right, Rob was cced on v1 and I forgot to do that in v2.
> Shawn
>
> On Mon, Sep 03, 2018 at 04:08:39PM +0200, Alexandre Belloni wrote:
> > Add vendor prefix for MicroSys Electronics GmbH
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > ---
> > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
> > index 2c3fc512e746..10155a44b783 100644
> > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> > @@ -235,6 +235,7 @@ micrel Micrel Inc.
> > microchip Microchip Technology Inc.
> > microcrystal Micro Crystal AG
> > micron Micron Technology Inc.
> > +microsys MicroSys Electronics GmbH
> > minix MINIX Technology Ltd.
> > miramems MiraMEMS Sensing Technology Co., Ltd.
> > mitsubishi Mitsubishi Electric Corporation
> > --
> > 2.19.0.rc1
> >
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 5/5] arm64: dts: add Microsys MPX-LS1046A SoM and SBC-LS1046A SBC
2018-09-03 14:08 [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Alexandre Belloni
` (2 preceding siblings ...)
2018-09-03 14:08 ` [PATCH v2 4/5] dt-bindings: Add vendor prefix for Microsys Alexandre Belloni
@ 2018-09-03 14:08 ` Alexandre Belloni
2018-09-10 0:39 ` [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Shawn Guo
4 siblings, 0 replies; 9+ messages in thread
From: Alexandre Belloni @ 2018-09-03 14:08 UTC (permalink / raw)
To: Shawn Guo; +Cc: Li Yang, linux-kernel, linux-arm-kernel, Alexandre Belloni
Microsys designs a SoM based on the LS1046A named miriac MPX-LS1046A
https://microsys.de/products/system-on-modules/qoriqr-armr-architecture/miriactm-mpx-ls1046a/
It also provides an SBC accepting this SoM, the miriac SBC-LS1046
https://microsys.de/en/products/single-board-computer/miriactm-sbcs/miriactm-sbc-ls1046a/
This adds a dtsi for the SoM and a dts for the SBC.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
Changes in v2:
- Addressed Shawn's comments
arch/arm64/boot/dts/freescale/Makefile | 1 +
.../fsl-ls1046a-miriac-mpxls1046.dtsi | 62 ++++++++++
.../freescale/fsl-ls1046a-miriac-sbc1046.dts | 116 ++++++++++++++++++
3 files changed, 179 insertions(+)
create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-mpxls1046.dtsi
create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-sbc1046.dts
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 86e18adb695a..b0b81ca887e8 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb
+dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-miriac-sbc1046.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-qds.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-rdb.dtb
dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1088a-qds.dtb
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-mpxls1046.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-mpxls1046.dtsi
new file mode 100644
index 000000000000..b4f998fbe460
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-mpxls1046.dtsi
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/ {
+ compatible = "microsys,mpxls1046a", "fsl,ls1046a";
+};
+
+&duart0 {
+ status = "okay";
+};
+
+&duart1 {
+ status = "okay";
+};
+
+&i2c0 {
+ status = "okay";
+
+ rtc@32 {
+ compatible = "epson,rx8803";
+ reg = <0x32>;
+ };
+
+ temp-sensor@4c {
+ compatible = "national,lm90";
+ reg = <0x4c>;
+ };
+
+ eeprom@50 {
+ compatible = "at24,24c128";
+ reg = <0x50>;
+ };
+};
+
+&ifc {
+ #address-cells = <2>;
+ #size-cells = <1>;
+
+ ranges = <0x0 0x0 0x0 0x7e800000 0x00010000>;
+ status = "okay";
+
+ nand@0,0 {
+ compatible = "fsl,ifc-nand";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x0 0x0 0x10000>;
+ };
+};
+
+&qspi {
+ num-cs = <1>;
+ bus-num = <0>;
+ status = "okay";
+
+ qflash0: flash@0 {
+ compatible = "spansion,m25p80";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ spi-max-frequency = <20000000>;
+ m25p,fast-read;
+ reg = <0>;
+ };
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-sbc1046.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-sbc1046.dts
new file mode 100644
index 000000000000..c0c8ebdd6bb4
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-miriac-sbc1046.dts
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+/dts-v1/;
+
+#include "fsl-ls1046a.dtsi"
+#include "fsl-ls1046a-miriac-mpxls1046.dtsi"
+
+/ {
+ model = "Microsys miriac SBC-LS1046A";
+ compatible = "microsys,sbc1046a", "microsys,mpxls1046a", "fsl,ls1046a";
+
+ aliases {
+ ethernet0 = &enet2;
+ ethernet1 = &enet4;
+ ethernet2 = &enet5;
+ ethernet3 = &enet6;
+ serial0 = &duart0;
+ serial1 = &duart1;
+ serial2 = &duart2;
+ serial3 = &duart3;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
+
+&duart0 {
+ status = "okay";
+};
+
+&duart1 {
+ status = "okay";
+};
+
+&i2c0 {
+ status = "okay";
+
+ eeprom@57 {
+ compatible = "at24,24c128";
+ reg = <0x57>;
+ };
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&ifc {
+ nand@0,0 {
+ partition@0 {
+ reg = <0x0 0x00100000>;
+ label = "NAND U-Boot Image";
+ read-only;
+ };
+
+ partition@100000 {
+ reg = <0x00100000 0x00100000>;
+ label = "NAND U-Boot Env";
+ };
+
+ partition@200000 {
+ reg = <0x00200000 0x01E00000>;
+ label = "NAND FIT Image";
+ };
+
+ partition@02000000 {
+ reg = <0x02000000 0x1e000000>;
+ label = "NAND (RW) UBIFS Root File System";
+ };
+ };
+};
+
+#include "fsl-ls1046-post.dtsi"
+
+&fman0 {
+ compatible = "fsl,fman", "simple-bus";
+
+ ethernet@e4000 {
+ phy-handle = <&rgmii_phy1>;
+ phy-connection-type = "rgmii";
+ };
+
+ ethernet@e8000 {
+ phy-handle = <&sgmii_phy1>;
+ phy-connection-type = "sgmii";
+ };
+
+ ethernet@ea000 {
+ phy-handle = <&sgmii_phy2>;
+ phy-connection-type = "sgmii";
+ };
+
+ ethernet@f0000 {
+ phy-handle = <&sgmii_phy3>;
+ phy-connection-type = "sgmii";
+ };
+
+ mdio@fc000 {
+ sgmii_phy3: ethernet-phy@0 {
+ reg = <0>;
+ };
+
+ sgmii_phy2: ethernet-phy@1 {
+ reg = <1>;
+ };
+
+ sgmii_phy1: ethernet-phy@2 {
+ reg = <2>;
+ };
+
+ rgmii_phy1: ethernet-phy@3 {
+ reg = <3>;
+ };
+ };
+};
--
2.19.0.rc1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes
2018-09-03 14:08 [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Alexandre Belloni
` (3 preceding siblings ...)
2018-09-03 14:08 ` [PATCH v2 5/5] arm64: dts: add Microsys MPX-LS1046A SoM and SBC-LS1046A SBC Alexandre Belloni
@ 2018-09-10 0:39 ` Shawn Guo
2018-09-10 5:56 ` Li Yang
4 siblings, 1 reply; 9+ messages in thread
From: Shawn Guo @ 2018-09-10 0:39 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: Li Yang, linux-kernel, linux-arm-kernel
The series looks good to me. @Leo, what about you?
Shawn
On Mon, Sep 03, 2018 at 04:08:36PM +0200, Alexandre Belloni wrote:
> Use a generic node name for the m25p80 flashes on ls1043 and ls1046 boards.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +-
> arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +-
> arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
> index c7b8d2c009cd..af972e91d6bc 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
> @@ -136,7 +136,7 @@
> bus-num = <0>;
> status = "okay";
>
> - qflash0: s25fl128s@0 {
> + qflash0: flash@0 {
> compatible = "spansion,m25p80";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
> index e69306e6b0b1..219068220b84 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
> @@ -165,7 +165,7 @@
> bus-num = <0>;
> status = "okay";
>
> - qflash0: s25fl128s@0 {
> + qflash0: flash@0 {
> compatible = "spansion,m25p80";
> #address-cells = <1>;
> #size-cells = <1>;
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> index 440e111651d5..df676b30357b 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> @@ -103,7 +103,7 @@
> bus-num = <0>;
> status = "okay";
>
> - qflash0: s25fs512s@0 {
> + qflash0: flash@0 {
> compatible = "spansion,m25p80";
> #address-cells = <1>;
> #size-cells = <1>;
> @@ -111,7 +111,7 @@
> reg = <0>;
> };
>
> - qflash1: s25fs512s@1 {
> + qflash1: flash@1 {
> compatible = "spansion,m25p80";
> #address-cells = <1>;
> #size-cells = <1>;
> --
> 2.19.0.rc1
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes
2018-09-10 0:39 ` [PATCH v2 1/5] arm64: dts: fsl: use a generic node name for m25p80 flashes Shawn Guo
@ 2018-09-10 5:56 ` Li Yang
0 siblings, 0 replies; 9+ messages in thread
From: Li Yang @ 2018-09-10 5:56 UTC (permalink / raw)
To: Shawn Guo
Cc: alexandre.belloni, lkml,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Sun, Sep 9, 2018 at 10:11 PM Shawn Guo <shawnguo@kernel.org> wrote:
>
> The series looks good to me. @Leo, what about you?
Looks fine to me too.
Acked-by: Li Yang <leoyang.li@nxp.com>
>
> Shawn
>
> On Mon, Sep 03, 2018 at 04:08:36PM +0200, Alexandre Belloni wrote:
> > Use a generic node name for the m25p80 flashes on ls1043 and ls1046 boards.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > ---
> > arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +-
> > arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +-
> > arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 ++--
> > 3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
> > index c7b8d2c009cd..af972e91d6bc 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts
> > @@ -136,7 +136,7 @@
> > bus-num = <0>;
> > status = "okay";
> >
> > - qflash0: s25fl128s@0 {
> > + qflash0: flash@0 {
> > compatible = "spansion,m25p80";
> > #address-cells = <1>;
> > #size-cells = <1>;
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
> > index e69306e6b0b1..219068220b84 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts
> > @@ -165,7 +165,7 @@
> > bus-num = <0>;
> > status = "okay";
> >
> > - qflash0: s25fl128s@0 {
> > + qflash0: flash@0 {
> > compatible = "spansion,m25p80";
> > #address-cells = <1>;
> > #size-cells = <1>;
> > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > index 440e111651d5..df676b30357b 100644
> > --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
> > @@ -103,7 +103,7 @@
> > bus-num = <0>;
> > status = "okay";
> >
> > - qflash0: s25fs512s@0 {
> > + qflash0: flash@0 {
> > compatible = "spansion,m25p80";
> > #address-cells = <1>;
> > #size-cells = <1>;
> > @@ -111,7 +111,7 @@
> > reg = <0>;
> > };
> >
> > - qflash1: s25fs512s@1 {
> > + qflash1: flash@1 {
> > compatible = "spansion,m25p80";
> > #address-cells = <1>;
> > #size-cells = <1>;
> > --
> > 2.19.0.rc1
> >
^ permalink raw reply [flat|nested] 9+ messages in thread