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/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch | |
parent | 32654ebc00d0fa87951da1187ff3de0fc3a9b21c (diff) | |
download | upstream-a948ae90c210260106dcb411ed006d2ee13ade21.tar.gz upstream-a948ae90c210260106dcb411ed006d2ee13ade21.tar.bz2 upstream-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/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch')
-rw-r--r-- | target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch b/target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch index a22bf63b7a..8405963787 100644 --- a/target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch +++ b/target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch @@ -1,6 +1,6 @@ -From b7031bd802336c77a6b330f79b275ccbb55fdc96 Mon Sep 17 00:00:00 2001 +From cce41fad080eb7e5f3e3e27bbcc5730d624c5d4b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Wed, 10 Apr 2013 21:22:13 +0200 +Date: Wed, 15 May 2013 15:36:57 +0200 Subject: [PATCH 12/29] arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface @@ -9,13 +9,12 @@ of the legacy PCIe code, since it allows to describe the PCIe interfaces in the Device Tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- arch/arm/boot/dts/kirkwood-iconnect.dts | 8 ++++++++ arch/arm/mach-kirkwood/board-iconnect.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts -index 12ccf74..e591d5d 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts @@ -109,6 +109,14 @@ @@ -33,8 +32,6 @@ index 12ccf74..e591d5d 100644 }; gpio-leds { -diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c -index c8ebde4..98b5ad1 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c @@ -22,11 +22,3 @@ void __init iconnect_init(void) @@ -49,6 +46,3 @@ index c8ebde4..98b5ad1 100644 - return 0; -} -subsys_initcall(iconnect_pci_init); --- -1.8.4.rc1 - |