Merge git://git.kvack.org/~bcrl/aio-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3188-radxarock.dts

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 7628b4868d2ab3582811262cc67a34f997c661b7..171b610db709f9e4f94355c31d54d858d89a84c2 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -58,6 +58,13 @@
                };
        };
 
+       ir_recv: gpio-ir-receiver {
+               compatible = "gpio-ir-receiver";
+               gpios = <&gpio0 10 1>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&ir_recv_pin>;
+       };
+
        vcc_sd0: sdmmc-regulator {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
@@ -191,6 +198,12 @@
                        rockchip,pins = <RK_GPIO3 27 RK_FUNC_GPIO &pcfg_output_low>;
                };
        };
+
+       ir-receiver {
+               ir_recv_pin: ir-recv-pin {
+                       rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+               };
+       };
 };
 
 &uart0 {
@@ -202,11 +215,13 @@
 };
 
 &uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart2_xfer>;
        status = "okay";
 };
 
 &uart3 {
        status = "okay";
 };
+
+&wdt {
+       status = "okay";
+};