Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm64 / boot / dts / rockchip / rk3368-r88.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 1f2b642..eed1ef6 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -42,6 +42,7 @@
 
 /dts-v1/;
 #include "rk3368.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
        model = "Rockchip R88";
@@ -65,16 +66,14 @@
 
        keys: gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&pwr_key>;
 
-               button@0 {
+               power {
                        wakeup-source;
                        gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
-                       linux,code = <116>;
+                       linux,code = <KEY_POWER>;
                };
        };
 
@@ -185,7 +184,6 @@
 };
 
 &emmc {
-       broken-cd;
        bus-width = <8>;
        cap-mmc-highspeed;
        disable-wp;
@@ -238,10 +236,18 @@
        };
 };
 
+&io_domains {
+       status = "ok";
+
+       audio-supply = <&vcc_io>;
+       gpio30-supply = <&vcc_io>;
+       gpio1830-supply = <&vcc_io>;
+       wifi-supply = <&vccio_wl>;
+};
+
 &sdio0 {
        assigned-clocks = <&cru SCLK_SDIO0>;
        assigned-clock-parents = <&cru PLL_CPLL>;
-       broken-cd;
        bus-width = <4>;
        cap-sd-highspeed;
        cap-sdio-irq;
@@ -331,6 +337,13 @@
        };
 };
 
+&pmu_io_domains {
+       status = "okay";
+
+       pmu-supply = <&vcc_io>;
+       vop-supply = <&vcc_io>;
+};
+
 &saradc {
        vref-supply = <&vcc_18>;
        status = "okay";