From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi') diff --git a/kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi index d033bb182..ff41f8355 100644 --- a/kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +++ b/kernel/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi @@ -7,9 +7,8 @@ * whole. * * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License. + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. * * This file is distributed in the hope that it will be useful * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -259,6 +258,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>; vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio1 4 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; }; -- cgit 1.2.3-korg