Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git] / arch / arm / boot / dts / dra62x-j5eco-evm.dts
index f820573..155eb32 100644 (file)
        model = "DRA62x J5 Eco EVM";
        compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "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>;