Merge tag 'upstream-4.19-rc1' of git://git.infradead.org/linux-ubifs

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / tegra30-cardhu.dtsi

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 92a9740c533f217a10cd6fb4421d2fc6871d015d..fb9222b479d2d91e1bf0b700afdf78abd36c6879 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -40,7 +40,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
 
@@ -206,6 +206,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x70>;
+                       reset-gpio = <&gpio TEGRA_GPIO(BB, 0) GPIO_ACTIVE_LOW>;
                };
        };