Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / arch / arm / boot / dts / am335x-phycore-som.dtsi

diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 1263c9d..75e24ad 100644 (file)
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -25,7 +25,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
@@ -33,7 +33,7 @@
        regulators {
                compatible = "simple-bus";
 
-               vcc5v: fixedregulator@0 {
+               vcc5v: fixedregulator0 {
                        compatible = "regulator-fixed";
                        regulator-name = "vcc5v";
                        regulator-min-microvolt = <5000000>;