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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / dm8148-evm.dts

diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index 4128fa91823c98c6fb94870ccb2e5b69c31f35e0..d6657b3bae84b11395b46bc4d130964179b0bde1 100644 (file)
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -12,13 +12,13 @@
        model = "DM8148 EVM";
        compatible = "ti,dm8148-evm", "ti,dm8148";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x40000000>;  /* 1 GB */
        };
 
        /* MIC94060YC6 controlled by SD1_POW pin */
-       vmmcsd_fixed: fixedregulator@0 {
+       vmmcsd_fixed: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vmmcsd_fixed";
                regulator-min-microvolt = <3300000>;