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/bcm911360k.dts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'kernel/arch/arm/boot/dts/bcm911360k.dts') diff --git a/kernel/arch/arm/boot/dts/bcm911360k.dts b/kernel/arch/arm/boot/dts/bcm911360k.dts index 9658d4f62..091c73a46 100644 --- a/kernel/arch/arm/boot/dts/bcm911360k.dts +++ b/kernel/arch/arm/boot/dts/bcm911360k.dts @@ -43,11 +43,10 @@ }; chosen { - stdout-path = &uart3; - bootargs = "console=ttyS0,115200"; + stdout-path = "serial0:115200n8"; }; +}; - uart3: serial@18023000 { - status = "okay"; - }; +&uart3 { + status = "okay"; }; -- cgit 1.2.3-korg