ARM64: dts: meson: enable the saradc node in meson-gx-p23x-q20x.dtsi

meson-gxl-s905d-p230.dts and meson-gxm-q200.dts enable the saradc node
(and configure it's vref-supply "VDDIO_AO18") in their corresponding
.dts file.
Move both (the saradc node as well as the VDDIO_AO18 regulator) to
remove some duplicate code.

As a positive side-effect this enables the saradc also for the P231 (GXL
S905D) and Q201 (GXM S912) development boards which are similar to the
P230/Q200 boards (P231 and Q201 use the internal 100Mbit/s PHY, while
P230 and Q200 have an external RGMII PHY).

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index 88e712ea757a238152c06f932dfecfeb5b36b843..01616982af0d33d4d61cdd3b64ce8eec2e26e5ba 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -35,6 +35,13 @@
                regulator-always-on;
        };
 
+       vddio_ao18: regulator-vddio_ao18 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDDIO_AO18";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+
        vddio_boot: regulator-vddio_boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
@@ -140,6 +147,11 @@
        clock-names = "clkin0";
 };
 
+&saradc {
+       status = "okay";
+       vref-supply = <&vddio_ao18>;
+};
+
 /* Wireless SDIO Module */
 &sd_emmc_a {
        status = "okay";

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
index a9f9bb90a877d36ec9d7aec9f7b792282ac6af7a..9c5be060fd5e08855d94b761866ffcc3672659ae 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
@@ -41,13 +41,6 @@
                };
        };
 
-       vddio_ao18: regulator-vddio_ao18 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO18";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-       };
-
        hdmi-connector {
                compatible = "hdmi-connector";
                type = "a";
@@ -107,8 +100,3 @@
                remote-endpoint = <&hdmi_connector_in>;
        };
 };
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddio_ao18>;
-};

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
index 101417298a1dd726f8986c99d5b229dc38d770c9..432f7a435fbaf35d99aad1993975fff39152ca96 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
@@ -40,13 +40,6 @@
                        gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
                };
        };
-
-       vddio_ao18: regulator-vddio_ao18 {
-               compatible = "regulator-fixed";
-               regulator-name = "VDDIO_AO18";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-       };
 };
 
 /* Q200 has exclusive choice between internal or external PHY */
@@ -78,8 +71,3 @@
                interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
        };
 };
-
-&saradc {
-       status = "okay";
-       vref-supply = <&vddio_ao18>;
-};