Merge tag 'imx-dt64-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

Freescale arm64 device tree update for 4.18:
 - Add unit address for ls208xa-rdb SPI flash node matching 'reg'
   property to fix DTC warning unit_address_vs_reg.
 - Use hypen instead of underscore in aliases name for fsl-ls1012a to
   fix DTC warning alias_paths.

* tag 'imx-dt64-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: fsl-ls1012a: Fix DTC aliases warnings
  arm64: dts: ls208xa-rdb: Pass unit name to SPI flash node

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index bb788eddf9f4e8cc0493c62279745f6475ec6250..205f0f4c5df0a5b6b9fe1480d97be09930f38e00 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -53,11 +53,11 @@
 
        aliases {
                crypto = &crypto;
-               rtic_a = &rtic_a;
-               rtic_b = &rtic_b;
-               rtic_c = &rtic_c;
-               rtic_d = &rtic_d;
-               sec_mon = &sec_mon;
+               rtic-a = &rtic_a;
+               rtic-b = &rtic_b;
+               rtic-c = &rtic_c;
+               rtic-d = &rtic_d;
+               sec-mon = &sec_mon;
        };
 
        cpus {

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
index 5498c705ae6a476ed04d9b4fd2a71f4be9dff8aa..061647bd97b8a6246d94b41d0c64027769036a02 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
@@ -134,7 +134,7 @@
 
 &dspi {
        status = "okay";
-       dflash0: n25q512a {
+       dflash0: n25q512a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p80";