mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +00:00
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:
parent
8791ed3295
commit
5d4294c524
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -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"
|
||||
|
||||
/*****************************************************************************
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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 };
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user