diff options
author | Luka Perkov <luka@openwrt.org> | 2013-10-02 00:33:47 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-10-02 00:33:47 +0000 |
commit | 0331657a4f65aef4fb28eb0e537b5d227cc2eb4f (patch) | |
tree | 10ddb2ae149d2400da98f2b48027da097e9b72bc /target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch | |
parent | 7d1e5ae918ad606b6990d700368f4fe18c845773 (diff) | |
download | upstream-0331657a4f65aef4fb28eb0e537b5d227cc2eb4f.tar.gz upstream-0331657a4f65aef4fb28eb0e537b5d227cc2eb4f.tar.bz2 upstream-0331657a4f65aef4fb28eb0e537b5d227cc2eb4f.zip |
kirkwood: add linux 3.10 support
Backport appropriate patches to allow using device tree only board
defintions.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 38280
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 | 54 |
1 files changed, 54 insertions, 0 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 new file mode 100644 index 0000000000..a22bf63b7a --- /dev/null +++ b/target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch @@ -0,0 +1,54 @@ +From b7031bd802336c77a6b330f79b275ccbb55fdc96 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Wed, 10 Apr 2013 21:22:13 +0200 +Subject: [PATCH 12/29] arm: kirkwood: convert Iomega Iconnect to use DT for + the PCIe interface + +Now that the PCIe mvebu driver is usable on Kirkwood, use it instead +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> +--- + 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 @@ + reg = <0x980000 0x1f400000>; + }; + }; ++ ++ pcie-controller { ++ status = "okay"; ++ ++ pcie@1,0 { ++ status = "okay"; ++ }; ++ }; + }; + + 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) + { + kirkwood_ge00_init(&iconnect_ge00_data); + } +- +-static int __init iconnect_pci_init(void) +-{ +- if (of_machine_is_compatible("iom,iconnect")) +- kirkwood_pcie_init(KW_PCIE0); +- return 0; +-} +-subsys_initcall(iconnect_pci_init); +-- +1.8.4.rc1 + |