19 files changed, 125 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f10fe8526239..01d178a2009f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -617,7 +617,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
         orion5x-lacie-ethernet-disk-mini-v2.dtb \
         orion5x-linkstation-lsgl.dtb \
         orion5x-linkstation-lswtgl.dtb \
-        orion5x-lschl.dtb \
+        orion5x-linkstation-lschl.dtb \
         orion5x-lswsgl.dtb \
         orion5x-maxtor-shared-storage-2.dtb \
         orion5x-netgear-wnr854t.dtb \
diff --git a/arch/arm/boot/dts/imx1.dtsi b/arch/arm/boot/dts/imx1.dtsi
index b792eee3899b..2ee40bc9ec21 100644
--- a/arch/arm/boot/dts/imx1.dtsi
+++ b/arch/arm/boot/dts/imx1.dtsi
@@ -18,6 +18,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 gpio0 = &gpio1;
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index ac2a9da62b6c..43ccbbf754a3 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -16,6 +16,14 @@
         #size-cells = <1>;
 
         interrupt-parent = <&icoll>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 gpio0 = &gpio0;
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 831d09a28155..acd475659156 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -14,6 +14,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 9d8b5969ee3b..b397384248f4 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -19,6 +19,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 3aabf65a6a52..d6a2190b60ef 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -17,6 +17,14 @@
         #size-cells = <1>;
 
         interrupt-parent = <&icoll>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &mac0;
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 85cd8be22f71..23b0d2cf9acd 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -12,6 +12,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 serial0 = &uart1;
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 9f40e6229189..d0496c65cea2 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -13,6 +13,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index fe0221e4cbf7..ceae909e2201 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -17,6 +17,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 33526cade735..1ee1d542d9ad 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -19,6 +19,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index ca51dc03e327..2e516f4985e4 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -19,6 +19,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 1ade1951e620..7aa120fbdc71 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -137,7 +137,7 @@
 &gpio4 {
         gpio-ranges = <&iomuxc  5 136 1>, <&iomuxc  6 145 1>, <&iomuxc  7 150 1>,
                       <&iomuxc  8 146 1>, <&iomuxc  9 151 1>, <&iomuxc 10 147 1>,
-                      <&iomuxc 11 151 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>,
+                      <&iomuxc 11 152 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>,
                       <&iomuxc 14 149 1>, <&iomuxc 15 154 1>, <&iomuxc 16  39 7>,
                       <&iomuxc 23  56 1>, <&iomuxc 24  61 7>, <&iomuxc 31  46 1>;
 };
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 89b834f3fa17..e7d30f45b161 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -16,6 +16,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 19cbd879c448..cc9572ea2860 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -14,6 +14,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 10f333016197..dd4ec85ecbaa 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -15,6 +15,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 can0 = &flexcan1;
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 39845a7e0463..53d3f8e41e9b 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -15,6 +15,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 ethernet0 = &fec1;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 8ff2cbdd8f0d..be33dfc86838 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -50,6 +50,14 @@
 / {
         #address-cells = <1>;
         #size-cells = <1>;
+        /*
+         * The decompressor and also some bootloaders rely on a
+         * pre-existing /chosen node to be available to insert the
+         * command line and merge other ATAGS info.
+         * Also for U-Boot there must be a pre-existing /memory node.
+         */
+        chosen {};
+        memory { device_type = "memory"; reg = <0 0>; };
 
         aliases {
                 gpio0 = &gpio1;
diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-linkstation-lschl.dts
index 947409252845..ea6c881634b9 100644
--- a/arch/arm/boot/dts/orion5x-lschl.dts
+++ b/arch/arm/boot/dts/orion5x-linkstation-lschl.dts
@@ -2,7 +2,7 @@
  * Device Tree file for Buffalo Linkstation LS-CHLv3
  *
  * Copyright (C) 2016 Ash Hughes <ashley.hughes@blueyonder.co.uk>
- * Copyright (C) 2015, 2016
+ * Copyright (C) 2015-2017
  * Roger Shimizu <rogershimizu@gmail.com>
  *
  * This file is dual-licensed: you can use it either under the terms
@@ -52,7 +52,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-        model = "Buffalo Linkstation Live v3 (LS-CHL)";
+        model = "Buffalo Linkstation LiveV3 (LS-CHL)";
         compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x";
 
         memory { /* 128 MB */
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index c8b2944e304a..ace97e8576db 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -680,6 +680,7 @@
                                 phy-names       = "usb2-phy", "usb3-phy";
                                 phys            = <&usb2_picophy0>,
                                                   <&phy_port2 PHY_TYPE_USB3>;
+                                snps,dis_u3_susphy_quirk;
                         };
                 };