Merge tag ‘mvebu-fixes-5.0-2’ of git://git.infradead.org/linux-mvebu into arm/fixes [Linux 5.0]

Merge tag ‘mvebu-fixes-5.0-2’ of git://git.infradead.org/linux-mvebu into arm/fixes [Linux 5.0]

This Linux kernel change "Merge tag ‘mvebu-fixes-5.0-2’ of git://git.infradead.org/linux-mvebu into arm/fixes" is included in the Linux 5.0 release. This change is authored by Arnd Bergmann <arnd [at] arndb.de> on Fri Feb 22 14:57:27 2019 +0100. The commit for this change in Linux stable tree is 2f8b1ce (patch). Other info about this change: Merge: 3858bfc bdd22a4

Merge tag 'mvebu-fixes-5.0-2' of git://git.infradead.org/linux-mvebu into arm/fixes

mvebu fixes for 5.0 (part 2)

Fix PHY reset signal on clearfog gt 8K (Armada 8040 based)
Fix NAND description on Armada XP boards which was broken since a few
release

* tag 'mvebu-fixes-5.0-2' of git://git.infradead.org/linux-mvebu:
  arm64: dts: clearfog-gt-8k: fix SGMII PHY reset signal
  ARM: dts: armada-xp: fix Armada XP boards NAND description

Signed-off-by: Arnd Bergmann <[email protected]>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/arm/boot/dts/tegra124-nyan.dtsi | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index d5f11d6d..bc85b6a 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -13,10 +13,25 @@
        stdout-path = "serial0:115200n8";
    };

-   [email protected] {
+   /*
+    * Note that recent version of the device tree compiler (starting with
+    * version 1.4.2) warn about this node containing a reg property, but
+    * missing a unit-address. However, the bootloader on these Chromebook
+    * devices relies on the full name of this node to be exactly /memory.
+    * Adding the unit-address causes the bootloader to create a /memory
+    * node and write the memory bank configuration to that node, which in
+    * turn leads the kernel to believe that the device has 2 GiB of
+    * memory instead of the amount detected by the bootloader.
+    *
+    * The name of this node is effectively ABI and must not be changed.
+    */
+   memory {
+       device_type = "memory";
        reg = <0x0 0x80000000 0x0 0x80000000>;
    };

+   /delete-node/ [email protected];
+
    [email protected] {
        [email protected] {
            status = "okay";

Leave a Reply

Your email address will not be published. Required fields are marked *