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/armada-370-synology-ds213j.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'kernel/arch/arm/boot/dts/armada-370-synology-ds213j.dts') diff --git a/kernel/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/kernel/arch/arm/boot/dts/armada-370-synology-ds213j.dts index b42b76776..836bcc07a 100644 --- a/kernel/arch/arm/boot/dts/armada-370-synology-ds213j.dts +++ b/kernel/arch/arm/boot/dts/armada-370-synology-ds213j.dts @@ -77,7 +77,8 @@ soc { ranges = ; + MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000 + MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>; internal-regs { @@ -92,7 +93,7 @@ spi-flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "micron,n25q064"; + compatible = "micron,n25q064", "jedec,spi-nor"; reg = <0>; /* Chip select 0 */ spi-max-frequency = <20000000>; -- cgit 1.2.3-korg