diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
| commit | a948ae90c210260106dcb411ed006d2ee13ade21 (patch) | |
| tree | 8d013582ea989c45b94bd78cc7c5d7ab1c058854 /target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch | |
| parent | 32654ebc00d0fa87951da1187ff3de0fc3a9b21c (diff) | |
| download | master-187ad058-a948ae90c210260106dcb411ed006d2ee13ade21.tar.gz master-187ad058-a948ae90c210260106dcb411ed006d2ee13ade21.tar.bz2 master-187ad058-a948ae90c210260106dcb411ed006d2ee13ade21.zip | |
kirkwood: update patches and configuration (3.10)
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38295 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch')
| -rw-r--r-- | target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch b/target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch index 02ca616ace..ed80dd683e 100644 --- a/target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch +++ b/target/linux/kirkwood/patches-3.10/0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch @@ -1,6 +1,6 @@ -From 0f75608615894c9707e40c0dd3383193fb6c09f6 Mon Sep 17 00:00:00 2001 +From c184303509ea2ee9d519db5dbfb2063efca098f7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Sat, 13 Apr 2013 13:03:56 +0200 +Date: Wed, 15 May 2013 15:37:00 +0200 Subject: [PATCH 15/29] arm: kirkwood: convert QNAP TS219 to use DT for the PCIe interface @@ -10,14 +10,13 @@ interfaces in the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- arch/arm/boot/dts/kirkwood-ts219-6281.dts | 3 ++- arch/arm/boot/dts/kirkwood-ts219-6282.dts | 3 ++- arch/arm/boot/dts/kirkwood-ts219.dtsi | 9 +++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) -diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts -index 8295c83..42648ab 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts @@ -1,7 +1,8 @@ @@ -30,8 +29,6 @@ index 8295c83..42648ab 100644 / { ocp@f1000000 { -diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts -index df3f95d..95ceeb9 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts @@ -1,7 +1,8 @@ @@ -44,8 +41,6 @@ index df3f95d..95ceeb9 100644 / { ocp@f1000000 { -diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi -index 64ea27c..7c022fd 100644 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@ -1,5 +1,3 @@ @@ -67,6 +62,3 @@ index 64ea27c..7c022fd 100644 + }; }; }; --- -1.8.4.rc1 - |