Merge branch 'next/late' with mainline

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / rk3288-firefly.dts

diff --git a/arch/arm/boot/dts/rk3288-firefly.dts b/arch/arm/boot/dts/rk3288-firefly.dts
index c07fe92dc69fda7f713a23fadecd41d4074cca89..14271be72f302731581035ab54eb2fe67f9314ce 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dts
+++ b/arch/arm/boot/dts/rk3288-firefly.dts
@@ -49,7 +49,7 @@
 };
 
 &ir {
-       gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+       gpios = <&gpio7 RK_PA0 GPIO_ACTIVE_LOW>;
 };
 
 &pinctrl {