[kernel] r14168 - in dists/sid/linux-2.6/debian: . config/armel patches/features/arm patches/series
Martin Michlmayr
tbm at alioth.debian.org
Sun Aug 23 13:53:20 UTC 2009
Author: tbm
Date: Sun Aug 23 13:53:19 2009
New Revision: 14168
Log:
add OpenRD-Base support.
Added:
dists/sid/linux-2.6/debian/patches/features/arm/openrd-sata.patch
dists/sid/linux-2.6/debian/patches/features/arm/openrd.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/config/armel/config.kirkwood
dists/sid/linux-2.6/debian/patches/series/7
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Sun Aug 23 13:43:36 2009 (r14167)
+++ dists/sid/linux-2.6/debian/changelog Sun Aug 23 13:53:19 2009 (r14168)
@@ -1,8 +1,12 @@
linux-2.6 (2.6.30-7) UNRELEASED; urgency=low
[ Martin Michlmayr ]
- * Enable eSATA on QNAP TS-219P (John Holland).
+ * Add some patches from git.marvell.com:
+ - Enable eSATA on QNAP TS-219P (John Holland).
+ - Marvell OpenRD-Base board support (Dhaval Vasa).
+ - Initialise SATA for OpenRD-Base (Ron Lee).
* [armel/kirkwood] Enable CONFIG_SATA_AHCI.
+ * [armel/kirkwood] Enable MACH_OPENRD_BASE.
-- Martin Michlmayr <tbm at cyrius.com> Sun, 23 Aug 2009 22:42:34 +0900
Modified: dists/sid/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.kirkwood Sun Aug 23 13:43:36 2009 (r14167)
+++ dists/sid/linux-2.6/debian/config/armel/config.kirkwood Sun Aug 23 13:53:19 2009 (r14168)
@@ -60,6 +60,7 @@
CONFIG_MACH_RD88F6281=y
CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_TS219=y
+MACH_OPENRD_BASE=y
##
## file: arch/arm/mm/Kconfig
Added: dists/sid/linux-2.6/debian/patches/features/arm/openrd-sata.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/arm/openrd-sata.patch Sun Aug 23 13:53:19 2009 (r14168)
@@ -0,0 +1,43 @@
+From: Ron Lee <ron at debian.org>
+Date: Mon, 10 Aug 2009 12:53:48 +0000 (+0530)
+Subject: [ARM] Kirkwood: Initialise SATA for OpenRD-Base
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=decf77079511fc5ef832ead074bb45e4e0b099c0
+
+[ARM] Kirkwood: Initialise SATA for OpenRD-Base
+
+Signed-off-by: Ron Lee <ron at debian.org>
+Signed-off-by: Dhaval Vasa <dhaval.vasa at einfochips.com>
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+---
+
+diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
+index 3144bb8..947dfb8 100644
+--- a/arch/arm/mach-kirkwood/openrd_base-setup.c
++++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
+@@ -12,6 +12,7 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/mtd/partitions.h>
++#include <linux/ata_platform.h>
+ #include <linux/mv643xx_eth.h>
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -40,6 +41,10 @@ static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
+ .phy_addr = MV643XX_ETH_PHY_ADDR(8),
+ };
+
++static struct mv_sata_platform_data openrd_base_sata_data = {
++ .n_ports = 2,
++};
++
+ static struct mvsdio_platform_data openrd_base_mvsdio_data = {
+ .gpio_card_detect = 29, /* MPP29 used as SD card detect */
+ };
+@@ -63,6 +68,7 @@ static void __init openrd_base_init(void)
+ kirkwood_ehci_init();
+
+ kirkwood_ge00_init(&openrd_base_ge00_data);
++ kirkwood_sata_init(&openrd_base_sata_data);
+ kirkwood_sdio_init(&openrd_base_mvsdio_data);
+ }
+
Added: dists/sid/linux-2.6/debian/patches/features/arm/openrd.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/arm/openrd.patch Sun Aug 23 13:53:19 2009 (r14168)
@@ -0,0 +1,134 @@
+From: Dhaval Vasa <dhaval.vasa at einfochips.com>
+Date: Mon, 10 Aug 2009 12:07:34 +0000 (+0530)
+Subject: [ARM] Kirkwood: Marvell OpenRD-Base board support
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=7eeae54c68e91c46ec170e764d1cceac81f35969
+
+[ARM] Kirkwood: Marvell OpenRD-Base board support
+
+reference:
+http://open-rd.org
+http://code.google.com/p/openrd
+
+This patch is tested for:
+1. Boot from DRAM/NAND flash
+2. NAND read/write/erase
+3. GbE0
+4. USB read/write
+
+FIXME:
+1. SD/UART1 selection
+2. MPP configuration (currently, default)
+3. PEX
+
+Signed-off-by: Dhaval Vasa <dhaval.vasa at einfochips.com>
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+---
+
+--- a/arch/arm/mach-kirkwood/Kconfig~ 2009-08-23 13:47:56.000000000 +0000
++++ b/arch/arm/mach-kirkwood/Kconfig 2009-08-23 13:48:03.000000000 +0000
+@@ -32,6 +32,12 @@
+ Say 'Y' here if you want your kernel to support the
+ QNAP TS-119 and TS-219 Turbo NAS devices.
+
++config MACH_OPENRD_BASE
++ bool "Marvell OpenRD Base Board"
++ help
++ Say 'Y' here if you want your kernel to support the
++ Marvell OpenRD Base Board.
++
+ endmenu
+
+ endif
+--- a/arch/arm/mach-kirkwood/Makefile~ 2009-08-23 13:48:00.000000000 +0000
++++ b/arch/arm/mach-kirkwood/Makefile 2009-08-23 13:48:03.000000000 +0000
+@@ -5,5 +5,6 @@
+ obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
+ obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
+ obj-$(CONFIG_MACH_TS219) += ts219-setup.o
++obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o
+
+ obj-$(CONFIG_CPU_IDLE) += cpuidle.o
+diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
+new file mode 100644
+index 0000000..3144bb8
+--- /dev/null
++++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
+@@ -0,0 +1,78 @@
++/*
++ * arch/arm/mach-kirkwood/openrd_base-setup.c
++ *
++ * Marvell OpenRD Base Board Setup
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License version 2. This program is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mv643xx_eth.h>
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <mach/kirkwood.h>
++#include <plat/mvsdio.h>
++#include "common.h"
++#include "mpp.h"
++
++static struct mtd_partition openrd_base_nand_parts[] = {
++ {
++ .name = "u-boot",
++ .offset = 0,
++ .size = SZ_1M
++ }, {
++ .name = "uImage",
++ .offset = MTDPART_OFS_NXTBLK,
++ .size = SZ_4M
++ }, {
++ .name = "root",
++ .offset = MTDPART_OFS_NXTBLK,
++ .size = MTDPART_SIZ_FULL
++ },
++};
++
++static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
++ .phy_addr = MV643XX_ETH_PHY_ADDR(8),
++};
++
++static struct mvsdio_platform_data openrd_base_mvsdio_data = {
++ .gpio_card_detect = 29, /* MPP29 used as SD card detect */
++};
++
++static unsigned int openrd_base_mpp_config[] __initdata = {
++ MPP29_GPIO,
++ 0
++};
++
++static void __init openrd_base_init(void)
++{
++ /*
++ * Basic setup. Needs to be called early.
++ */
++ kirkwood_init();
++ kirkwood_mpp_conf(openrd_base_mpp_config);
++
++ kirkwood_uart0_init();
++ kirkwood_nand_init(ARRAY_AND_SIZE(openrd_base_nand_parts), 25);
++
++ kirkwood_ehci_init();
++
++ kirkwood_ge00_init(&openrd_base_ge00_data);
++ kirkwood_sdio_init(&openrd_base_mvsdio_data);
++}
++
++MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
++ /* Maintainer: Dhaval Vasa <dhaval.vasa at einfochips.com> */
++ .phys_io = KIRKWOOD_REGS_PHYS_BASE,
++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
++ .boot_params = 0x00000100,
++ .init_machine = openrd_base_init,
++ .map_io = kirkwood_map_io,
++ .init_irq = kirkwood_init_irq,
++ .timer = &kirkwood_timer,
++MACHINE_END
Modified: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/7 Sun Aug 23 13:43:36 2009 (r14167)
+++ dists/sid/linux-2.6/debian/patches/series/7 Sun Aug 23 13:53:19 2009 (r14168)
@@ -1 +1,3 @@
+ features/arm/qnap-219p-pci.patch
++ features/arm/openrd.patch
++ features/arm/openrd-sata.patch
More information about the Kernel-svn-changes
mailing list