dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

plat-orion: make orion_nand available for all Orion families 

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
This commit is contained in:
Lennert Buytenhek 2008-03-27 14:51:40 -04:00 committed by Nicolas Pitre
parent 8791ed3295
commit 5d4294c524
9 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-orion/common.c
View File

@ -26,8 +26,8 @@
#include <asm/mach/time.h>
#include <asm/arch/hardware.h>
#include <asm/arch/orion.h>
#include <asm/arch/platform.h>
#include <asm/plat-orion/ehci-orion.h>
#include <asm/plat-orion/orion_nand.h>
#include <asm/plat-orion/time.h>
#include "common.h"

2
arch/arm/mach-orion/db88f5281-setup.c
View File

@ -25,7 +25,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/arch/orion.h>
#include <asm/arch/platform.h>
#include <asm/plat-orion/orion_nand.h>
#include "common.h"
/*****************************************************************************

1
arch/arm/mach-orion/dns323-setup.c
View File

@ -26,7 +26,6 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/arch/orion.h>
#include <asm/arch/platform.h>
#include "common.h"
#define DNS323_GPIO_LED_RIGHT_AMBER 1

2
arch/arm/mach-orion/kurobox_pro-setup.c
View File

@ -23,7 +23,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/arch/orion.h>
#include <asm/arch/platform.h>
#include <asm/plat-orion/orion_nand.h>
#include "common.h"
/*****************************************************************************

1
arch/arm/mach-orion/rd88f5182-setup.c
View File

@ -25,7 +25,6 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/arch/orion.h>
#include <asm/arch/platform.h>
#include "common.h"
/*****************************************************************************

1
arch/arm/mach-orion/ts209-setup.c
View File

@ -27,7 +27,6 @@
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <asm/arch/orion.h>
#include <asm/arch/platform.h>
#include "common.h"
#define QNAP_TS209_NOR_BOOT_BASE 0xf4000000

2
drivers/mtd/nand/Kconfig
View File

@ -314,7 +314,7 @@ config MTD_ALAUDA
config MTD_NAND_ORION
tristate "NAND Flash support for Marvell Orion SoC"
depends on ARCH_ORION && MTD_NAND
depends on PLAT_ORION && MTD_NAND
help
This enables the NAND flash controller on Orion machines.

2
drivers/mtd/nand/orion_nand.c
View File

@ -18,8 +18,8 @@
#include <linux/mtd/partitions.h>
#include <asm/io.h>
#include <asm/sizes.h>
#include <asm/arch/platform.h>
#include <asm/arch/hardware.h>
#include <asm/plat-orion/orion_nand.h>
#ifdef CONFIG_MTD_CMDLINE_PARTS
static const char *part_probes[] = { "cmdlinepart", NULL };

10
include/asm-arm/arch-orion/platform.h → include/asm-arm/plat-orion/orion_nand.h
View File

@ -1,15 +1,13 @@
/*
* asm-arm/arch-orion/platform.h
*
* Tzachi Perelstein <tzachi@marvell.com>
* include/asm-arm/plat-orion/orion_nand.h
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#ifndef __ASM_ARCH_PLATFORM_H__
#define __ASM_ARCH_PLATFORM_H__
#ifndef __ASM_PLAT_ORION_ORION_NAND_H
#define __ASM_PLAT_ORION_ORION_NAND_H
/*
* Device bus NAND private data