qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 20:53:22 +02:00
Code

[mcs814x] make hardware.h a forward inclusion of mcs814x.h

Browse Source 
mach/hardware.h is soon to be removed by upstream kernel

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32487 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-06-23 11:03:40 +00:00
parent 4c31778fc4
commit 01532c0031
11 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/board-mcs8140-dt.c
View File

@ -12,7 +12,6 @@
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <mach/hardware.h>
#include "common.h" #include "common.h"
#include <asm/setup.h> #include <asm/setup.h>

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c
View File

@ -14,7 +14,7 @@
#include <linux/clkdev.h> #include <linux/clkdev.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <mach/hardware.h> #include <mach/mcs814x.h>
/* System configuration registers offsets */ /* System configuration registers offsets */
#define SYSDBG_BS1 0x00 #define SYSDBG_BS1 0x00

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
View File

@ -18,7 +18,7 @@
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/hardware.h> #include <mach/mcs814x.h>
#include <mach/cpu.h> #include <mach/cpu.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S
View File

@ -1,4 +1,4 @@
#include <mach/hardware.h> #include <mach/mcs814x.h>
.macro addruart, rp, rv, tmp .macro addruart, rp, rv, tmp
ldr \rp, =_PHYS_CONFADDR ldr \rp, =_PHYS_CONFADDR

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
View File

@ -1,4 +1,4 @@
#include <mach/hardware.h> #include <mach/mcs814x.h>
.macro disable_fiq .macro disable_fiq
.endm .endm

20
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
View File

@ -10,25 +10,7 @@
#ifndef __ASM_ARCH_HARDWARE_H #ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H
#define MCS814X_IO_BASE 0xF0000000 #include "mcs814x.h"
#define MCS814X_IO_START 0x40000000
#define MCS814X_IO_SIZE 0x00100000
/* IRQ controller register offset */
#define MCS814X_IRQ_ICR 0x00
#define MCS814X_IRQ_ISR 0x04
#define MCS814X_IRQ_MASK 0x20
#define MCS814X_IRQ_STS0 0x40
#define _PHYS_CONFADDR 0x40000000
#define _VIRT_CONFADDR MCS814X_IO_BASE
#define _CONFOFFSET_UART 0x000DC000
#define _CONFOFFSET_DBGLED 0x000EC000
#define _CONFOFFSET_SYSDBG 0x000F8000
#define _CONFADDR_DBGLED (_VIRT_CONFADDR + _CONFOFFSET_DBGLED)
#define _CONFADDR_SYSDBG (_VIRT_CONFADDR + _CONFOFFSET_SYSDBG)
#endif #endif

34
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright (C) 2003 Artec Design Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
*/
#ifndef __ASM_ARCH_MCS814X_H
#define __ASM_ARCH_MCS814X_H
#define MCS814X_IO_BASE 0xF0000000
#define MCS814X_IO_START 0x40000000
#define MCS814X_IO_SIZE 0x00100000
/* IRQ controller register offset */
#define MCS814X_IRQ_ICR 0x00
#define MCS814X_IRQ_ISR 0x04
#define MCS814X_IRQ_MASK 0x20
#define MCS814X_IRQ_STS0 0x40
#define _PHYS_CONFADDR 0x40000000
#define _VIRT_CONFADDR MCS814X_IO_BASE
#define _CONFOFFSET_UART 0x000DC000
#define _CONFOFFSET_DBGLED 0x000EC000
#define _CONFOFFSET_SYSDBG 0x000F8000
#define _CONFADDR_DBGLED (_VIRT_CONFADDR + _CONFOFFSET_DBGLED)
#define _CONFADDR_SYSDBG (_VIRT_CONFADDR + _CONFOFFSET_SYSDBG)
#endif /* __ASM_ARCH_MCS814X_H */

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h
View File

@ -11,7 +11,7 @@
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <asm/io.h> #include <asm/io.h>
#include <mach/hardware.h> #include <mach/mcs814x.h>
#include <mach/cpu.h> #include <mach/cpu.h>
#define UART_SHIFT (2) #define UART_SHIFT (2)

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
View File

@ -14,7 +14,7 @@
#include <asm/exception.h> #include <asm/exception.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/hardware.h> #include <mach/mcs814x.h>
void __iomem *mcs814x_intc_base; void __iomem *mcs814x_intc_base;

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
View File

@ -27,7 +27,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/hardware.h> #include <mach/mcs814x.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#define MCS8140_PCI_CONFIG_SIZE SZ_64M #define MCS8140_PCI_CONFIG_SIZE SZ_64M

2
target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/timer.c
View File

@ -17,7 +17,7 @@
#include <linux/of_address.h> #include <linux/of_address.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/hardware.h> #include <mach/mcs814x.h>
/* Timer block registers */ /* Timer block registers */
#define TIMER_VAL 0x00 #define TIMER_VAL 0x00