Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / renesas / r8a77995-draak.dts

diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
index 0bbd4d70104260acfdbf2f73deeb286f1fdd4317..67634cb01d6b68567e23d1554b969915181df26c 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
@@ -97,7 +97,7 @@
                reg = <0x0 0x48000000 0x0 0x18000000>;
        };
 
                reg = <0x0 0x48000000 0x0 0x18000000>;
        };
 

-       reg_1p8v: regulator0 {
+       reg_1p8v: regulator-1p8v {

                compatible = "regulator-fixed";
                regulator-name = "fixed-1.8V";
                regulator-min-microvolt = <1800000>;
                compatible = "regulator-fixed";
                regulator-name = "fixed-1.8V";
                regulator-min-microvolt = <1800000>;


@@ -106,7 +106,7 @@
                regulator-always-on;
        };
 
                regulator-always-on;
        };
 

-       reg_3p3v: regulator1 {
+       reg_3p3v: regulator-3p3v {

                compatible = "regulator-fixed";
                regulator-name = "fixed-3.3V";
                regulator-min-microvolt = <3300000>;
                compatible = "regulator-fixed";
                regulator-name = "fixed-3.3V";
                regulator-min-microvolt = <3300000>;


@@ -115,7 +115,7 @@
                regulator-always-on;
        };
 
                regulator-always-on;
        };
 

-       reg_12p0v: regulator1 {
+       reg_12p0v: regulator-12p0v {

                compatible = "regulator-fixed";
                regulator-name = "D12.0V";
                regulator-min-microvolt = <12000000>;
                compatible = "regulator-fixed";
                regulator-name = "D12.0V";
                regulator-min-microvolt = <12000000>;