summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-14 18:10:35 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-14 18:11:30 +0200
commit622147fdad5425f6f572f84ce709303e5e0500b7 (patch)
tree9b5adde02ed4481db2dc5011a2c9447c8cac12eb /arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
parentdrm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A (diff)
parentdrm/i915: Commit planes on each crtc separately. (diff)
downloadlinux-622147fdad5425f6f572f84ce709303e5e0500b7.tar.xz
linux-622147fdad5425f6f572f84ce709303e5e0500b7.zip
Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes
Backmerge drm-intel-fixes because a bunch of atomic patch backporting we had to do lead to horrible conflicts. Conflicts: drivers/gpu/drm/drm_crtc.c Just a bit of context conflict between -next and -fixes. drivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c Atomic conflicts, always pick the code from -next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-cubox-i.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-cubox-i.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 59e5d15e3ec4..ff41f83551de 100644
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -258,6 +258,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>;
vmmc-supply = <&reg_3p3v>;
- cd-gpios = <&gpio1 4 0>;
+ cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
status = "okay";
};