ARM: dts: sun8i: a23/a33: Change LRADC node names to avoid warnings

One of the usage of the LRADC is to implement buttons. The bindings define
that we should have one subnode per button, with their associated voltage
as a property.

However, there was no reg property but we still used the voltage associated
to the button as the unit-address, which eventually generated warnings in
DTC.

Rename the node names to avoid those warnings.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index 8a93697df3a521f39dad91ce99221f7ffcae655e..b6aeb23b6ee9989f3387665503a13b6145f2b82e 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -80,21 +80,21 @@
        vref-supply = <&reg_vcc3v0>;
        status = "okay";
 
-       button@190 {
+       button-190 {
                label = "Volume Up";
                linux,code = <KEY_VOLUMEUP>;
                channel = <0>;
                voltage = <190000>;
        };
 
-       button@390 {
+       button-390 {
                label = "Volume Down";
                linux,code = <KEY_VOLUMEDOWN>;
                channel = <0>;
                voltage = <390000>;
        };
 
-       button@600 {
+       button-600 {
                label = "Home";
                linux,code = <KEY_HOME>;
                channel = <0>;

diff --git a/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts b/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
index e3c7a25ca37d3efe1b045c9a38011f14f15dfe84..bcbc9b0758f99c1b4cf116e229553860dbb159ef 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
+++ b/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
@@ -63,7 +63,7 @@
 };
 
 &lradc {
-       button@600 {
+       button-600 {
                label = "Back";
                linux,code = <KEY_BACK>;
                channel = <0>;

diff --git a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
index f71159987cacb4d804d3e71ae34c41d94f7eed7a..9ead5e1b7b65ec51faa17656d64f638e3e20fd07 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
+++ b/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
@@ -69,7 +69,7 @@
 };
 
 &lradc {
-       button@600 {
+       button-600 {
                label = "Back";
                linux,code = <KEY_BACK>;
                channel = <0>;

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index ff7244cdfa88f49961b80ff7c5fb3d62b721160d..9d545f8549be8a8ac7169361b0cec52c176e70a6 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -117,21 +117,21 @@
        vref-supply = <&reg_dcdc1>;
        status = "okay";
 
-       button@200 {
+       button-200 {
                label = "Volume Up";
                linux,code = <KEY_VOLUMEUP>;
                channel = <0>;
                voltage = <191011>;
        };
 
-       button@400 {
+       button-400 {
                label = "Volume Down";
                linux,code = <KEY_VOLUMEDOWN>;
                channel = <0>;
                voltage = <391304>;
        };
 
-       button@600 {
+       button-600 {
                label = "Home";
                linux,code = <KEY_HOME>;
                channel = <0>;

diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 2c4d892ea9f105b75b6e64f02dbbd380f4649e23..17868b1eff4e9a0739f503988881b7cac735dc9c 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -109,14 +109,14 @@
        vref-supply = <&reg_aldo3>;
        status = "okay";
 
-       button@0 {
+       button-190 {
                label = "V+";
                linux,code = <KEY_VOLUMEUP>;
                channel = <0>;
                voltage = <190000>;
        };
 
-       button@1 {
+       button-390 {
                label = "V-";
                linux,code = <KEY_VOLUMEDOWN>;
                channel = <0>;