Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ARM] Move include/asm-arm/plat-orion to arch/arm/plat-orion/include/plat

Browse Source 
This patch performs the equivalent include directory shuffle for
plat-orion, and fixes up all users.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
This commit is contained in:
Lennert Buytenhek 2008-08-09 13:44:58 +02:00 committed by Lennert Buytenhek
parent a09e64fbc0
commit 6f088f1d21
27 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-kirkwood/common.c
View File

@ -20,10 +20,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/kirkwood.h> #include <mach/kirkwood.h>
#include <asm/plat-orion/cache-feroceon-l2.h> #include <plat/cache-feroceon-l2.h>
#include <asm/plat-orion/ehci-orion.h> #include <plat/ehci-orion.h>
#include <asm/plat-orion/orion_nand.h> #include <plat/orion_nand.h>
#include <asm/plat-orion/time.h> #include <plat/time.h>
#include "common.h" #include "common.h"
/***************************************************************************** /*****************************************************************************

2
arch/arm/mach-kirkwood/irq.c
View File

@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/plat-orion/irq.h> #include <plat/irq.h>
#include "common.h" #include "common.h"
void __init kirkwood_init_irq(void) void __init kirkwood_init_irq(void)

2
arch/arm/mach-kirkwood/pcie.c
View File

@ -12,7 +12,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/plat-orion/pcie.h> #include <plat/pcie.h>
#include "common.h" #include "common.h"

2
arch/arm/mach-kirkwood/rd88f6281-setup.c
View File

@ -23,7 +23,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/kirkwood.h> #include <mach/kirkwood.h>
#include <asm/plat-orion/orion_nand.h> #include <plat/orion_nand.h>
#include "common.h" #include "common.h"
static struct mtd_partition rd88f6281_nand_parts[] = { static struct mtd_partition rd88f6281_nand_parts[] = {

4
arch/arm/mach-loki/common.c
View File

@ -19,8 +19,8 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/loki.h> #include <mach/loki.h>
#include <asm/plat-orion/orion_nand.h> #include <plat/orion_nand.h>
#include <asm/plat-orion/time.h> #include <plat/time.h>
#include "common.h" #include "common.h"
/***************************************************************************** /*****************************************************************************

2
arch/arm/mach-loki/irq.c
View File

@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/plat-orion/irq.h> #include <plat/irq.h>
#include "common.h" #include "common.h"
void __init loki_init_irq(void) void __init loki_init_irq(void)

8
arch/arm/mach-mv78xx0/common.c
View File

@ -18,10 +18,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/mv78xx0.h> #include <mach/mv78xx0.h>
#include <asm/plat-orion/cache-feroceon-l2.h> #include <plat/cache-feroceon-l2.h>
#include <asm/plat-orion/ehci-orion.h> #include <plat/ehci-orion.h>
#include <asm/plat-orion/orion_nand.h> #include <plat/orion_nand.h>
#include <asm/plat-orion/time.h> #include <plat/time.h>
#include "common.h" #include "common.h"

2
arch/arm/mach-mv78xx0/irq.c
View File

@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <mach/mv78xx0.h> #include <mach/mv78xx0.h>
#include <asm/plat-orion/irq.h> #include <plat/irq.h>
#include "common.h" #include "common.h"
void __init mv78xx0_init_irq(void) void __init mv78xx0_init_irq(void)

2
arch/arm/mach-mv78xx0/pcie.c
View File

@ -12,7 +12,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/plat-orion/pcie.h> #include <plat/pcie.h>
#include "common.h" #include "common.h"
struct pcie_port { struct pcie_port {

6
arch/arm/mach-orion5x/common.c
View File

@ -26,9 +26,9 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/orion5x.h> #include <mach/orion5x.h>
#include <asm/plat-orion/ehci-orion.h> #include <plat/ehci-orion.h>
#include <asm/plat-orion/orion_nand.h> #include <plat/orion_nand.h>
#include <asm/plat-orion/time.h> #include <plat/time.h>
#include "common.h" #include "common.h"
/***************************************************************************** /*****************************************************************************

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

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

2
arch/arm/mach-orion5x/irq.c
View File

@ -16,7 +16,7 @@
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <mach/orion5x.h> #include <mach/orion5x.h>
#include <asm/plat-orion/irq.h> #include <plat/irq.h>
#include "common.h" #include "common.h"
/***************************************************************************** /*****************************************************************************

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

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

2
arch/arm/mach-orion5x/pci.c
View File

@ -14,7 +14,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/plat-orion/pcie.h> #include <plat/pcie.h>
#include "common.h" #include "common.h"
/***************************************************************************** /*****************************************************************************

2
arch/arm/mm/cache-feroceon-l2.c
View File

@ -14,7 +14,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/plat-orion/cache-feroceon-l2.h> #include <plat/cache-feroceon-l2.h>
/* /*

2
include/asm-arm/plat-orion/cache-feroceon-l2.h → arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
View File

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/plat-orion/cache-feroceon-l2.h * arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
* *
* Copyright (C) 2008 Marvell Semiconductor * Copyright (C) 2008 Marvell Semiconductor
* *

6
include/asm-arm/plat-orion/ehci-orion.h → arch/arm/plat-orion/include/plat/ehci-orion.h
View File

@ -1,13 +1,13 @@
/* /*
* include/asm-arm/plat-orion/ehci-orion.h * arch/arm/plat-orion/include/plat/ehci-orion.h
* *
* This file is licensed under the terms of the GNU General Public * 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. * warranty of any kind, whether express or implied.
*/ */
#ifndef __ASM_PLAT_ORION_EHCI_ORION_H #ifndef __PLAT_EHCI_ORION_H
#define __ASM_PLAT_ORION_EHCI_ORION_H #define __PLAT_EHCI_ORION_H
#include <linux/mbus.h> #include <linux/mbus.h>

6
include/asm-arm/plat-orion/irq.h → arch/arm/plat-orion/include/plat/irq.h
View File

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/plat-orion/irq.h * arch/arm/plat-orion/include/plat/irq.h
* *
* Marvell Orion SoC IRQ handling. * Marvell Orion SoC IRQ handling.
* *
@ -8,8 +8,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#ifndef __ASM_PLAT_ORION_IRQ_H #ifndef __PLAT_IRQ_H
#define __ASM_PLAT_ORION_IRQ_H #define __PLAT_IRQ_H
void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr); void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr);

6
include/asm-arm/plat-orion/mv_xor.h → arch/arm/plat-orion/include/plat/mv_xor.h
View File

@ -1,9 +1,11 @@
/* /*
* arch/arm/plat-orion/include/plat/mv_xor.h
*
* Marvell XOR platform device data definition file. * Marvell XOR platform device data definition file.
*/ */
#ifndef __ASM_PLAT_ORION_MV_XOR_H #ifndef __PLAT_MV_XOR_H
#define __ASM_PLAT_ORION_MV_XOR_H #define __PLAT_MV_XOR_H
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/mbus.h> #include <linux/mbus.h>

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

@ -1,13 +1,13 @@
/* /*
* include/asm-arm/plat-orion/orion_nand.h * arch/arm/plat-orion/include/plat/orion_nand.h
* *
* This file is licensed under the terms of the GNU General Public * 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. * warranty of any kind, whether express or implied.
*/ */
#ifndef __ASM_PLAT_ORION_ORION_NAND_H #ifndef __PLAT_ORION_NAND_H
#define __ASM_PLAT_ORION_ORION_NAND_H #define __PLAT_ORION_NAND_H
/* /*
* Device bus NAND private data * Device bus NAND private data

6
include/asm-arm/plat-orion/pcie.h → arch/arm/plat-orion/include/plat/pcie.h
View File

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/plat-orion/pcie.h * arch/arm/plat-orion/include/plat/pcie.h
* *
* Marvell Orion SoC PCIe handling. * Marvell Orion SoC PCIe handling.
* *
@ -8,8 +8,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#ifndef __ASM_PLAT_ORION_PCIE_H #ifndef __PLAT_PCIE_H
#define __ASM_PLAT_ORION_PCIE_H #define __PLAT_PCIE_H
u32 orion_pcie_dev_id(void __iomem *base); u32 orion_pcie_dev_id(void __iomem *base);
u32 orion_pcie_rev(void __iomem *base); u32 orion_pcie_rev(void __iomem *base);

6
include/asm-arm/plat-orion/time.h → arch/arm/plat-orion/include/plat/time.h
View File

@ -1,5 +1,5 @@
/* /*
* include/asm-arm/plat-orion/time.h * arch/arm/plat-orion/include/plat/time.h
* *
* Marvell Orion SoC time handling. * Marvell Orion SoC time handling.
* *
@ -8,8 +8,8 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#ifndef __ASM_PLAT_ORION_TIME_H #ifndef __PLAT_TIME_H
#define __ASM_PLAT_ORION_TIME_H #define __PLAT_TIME_H
void orion_time_init(unsigned int irq, unsigned int tclk); void orion_time_init(unsigned int irq, unsigned int tclk);

2
arch/arm/plat-orion/irq.c
View File

@ -12,7 +12,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/plat-orion/irq.h> #include <plat/irq.h>
static void orion_irq_mask(u32 irq) static void orion_irq_mask(u32 irq)
{ {

2
arch/arm/plat-orion/pcie.c
View File

@ -12,7 +12,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/plat-orion/pcie.h> #include <plat/pcie.h>
/* /*
* PCIe unit register offsets. * PCIe unit register offsets.

2
drivers/dma/mv_xor.c
View File

@ -25,7 +25,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/memory.h> #include <linux/memory.h>
#include <asm/plat-orion/mv_xor.h> #include <plat/mv_xor.h>
#include "mv_xor.h" #include "mv_xor.h"
static void mv_xor_issue_pending(struct dma_chan *chan); static void mv_xor_issue_pending(struct dma_chan *chan);

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

@ -19,7 +19,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/plat-orion/orion_nand.h> #include <plat/orion_nand.h>
#ifdef CONFIG_MTD_CMDLINE_PARTS #ifdef CONFIG_MTD_CMDLINE_PARTS
static const char *part_probes[] = { "cmdlinepart", NULL }; static const char *part_probes[] = { "cmdlinepart", NULL };

2
drivers/usb/host/ehci-orion.c
View File

@ -12,7 +12,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mbus.h> #include <linux/mbus.h>
#include <asm/plat-orion/ehci-orion.h> #include <plat/ehci-orion.h>
#define rdl(off) __raw_readl(hcd->regs + (off)) #define rdl(off) __raw_readl(hcd->regs + (off))
#define wrl(off, val) __raw_writel((val), hcd->regs + (off)) #define wrl(off, val) __raw_writel((val), hcd->regs + (off))