Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / freescale / fsl-ls1046a.dtsi

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
index ef83786b8b905d57852ad6637bd2d4dfb5683c43..51cbd50012d625e62a25e9083b826447062ca81c 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
@@ -3,6 +3,7 @@
  * Device Tree Include file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright 2016 Freescale Semiconductor, Inc.
+ * Copyright 2018 NXP
  *
  * Mingkai Hu <mingkai.hu@nxp.com>
  */
@@ -198,11 +199,10 @@
                ifc: ifc@1530000 {
                        compatible = "fsl,ifc", "simple-bus";
                        reg = <0x0 0x1530000 0x0 0x10000>;
-                       big-endian;
                        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
                };
 
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -361,7 +361,7 @@
                        #thermal-sensor-cells = <1>;
                };
 
-               dspi: dspi@2100000 {
+               dspi: spi@2100000 {
                        compatible = "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;