Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fcb4401 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-dt64-4.18' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents faee4edf 70ce6043

arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -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 {

arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ 


&dspi {

	status = "okay";

	dflash0: n25q512a {

	dflash0: n25q512a@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "st,m25p80";