Merge branches 'dt/next' and 'dt/linus' into for-next

[karo-tx-linux.git] / arch / arm / boot / dts / rk3288-r89.dts

diff --git a/arch/arm/boot/dts/rk3288-r89.dts b/arch/arm/boot/dts/rk3288-r89.dts
index 14b9fc73c8a47f704d0b78a64a1fc42762e1d031..17f13c73fe5e078e1adebbd1932615d41b89bbcb 100644 (file)
--- a/arch/arm/boot/dts/rk3288-r89.dts
+++ b/arch/arm/boot/dts/rk3288-r89.dts
@@ -78,6 +78,13 @@
                };
        };
 
+       ir: ir-receiver {
+               compatible = "gpio-ir-receiver";
+               gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&ir_int>;
+       };
+
        vcc_host: vcc-host-regulator {
                compatible = "regulator-fixed";
                enable-active-high;
@@ -310,6 +317,12 @@
                };
        };
 
+       ir {
+               ir_int: ir-int {
+                       rockchip,pins = <7 0 RK_FUNC_GPIO &pcfg_pull_up>;
+               };
+       };
+
        pmic {
                pmic_int: pmic-int {
                        rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;