Skip to content

L
linux
Commit 6f26b809 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk 

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents f8659154 926dabe4
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 637 deletions
arch/arm/mach-pxa/Kconfig
View file @ 6f26b809
menu "Intel PXA2xx Implementations" menu "Intel PXA2xx Implementations"
choice
prompt "Select target board"
depends on ARCH_PXA
config ARCH_LUBBOCK config ARCH_LUBBOCK
bool "Intel DBPXA250 Development Platform" bool "Intel DBPXA250 Development Platform"
depends on ARCH_PXA
select PXA25x select PXA25x
config MACH_MAINSTONE config MACH_MAINSTONE
bool "Intel HCDDBBVA0 Development Platform" bool "Intel HCDDBBVA0 Development Platform"
depends on ARCH_PXA
select PXA27x select PXA27x
#select IWMMXT #select IWMMXT
config ARCH_PXA_IDP config ARCH_PXA_IDP
bool "Accelent Xscale IDP" bool "Accelent Xscale IDP"
depends on ARCH_PXA
select PXA25x select PXA25x
endchoice
endmenu endmenu
config PXA25x config PXA25x
......
arch/arm/mach-versatile/core.c
View file @ 6f26b809
...@@ -336,6 +336,7 @@ static struct amba_device name##_device = { \ ...@@ -336,6 +336,7 @@ static struct amba_device name##_device = { \
.end = (VERSATILE_##base##_BASE) + SZ_4K - 1,\ .end = (VERSATILE_##base##_BASE) + SZ_4K - 1,\
.flags = IORESOURCE_MEM, \ .flags = IORESOURCE_MEM, \
}, \ }, \
.dma_mask = ~0, \
.irq = base##_IRQ, \ .irq = base##_IRQ, \
/* .dma = base##_DMA,*/ \ /* .dma = base##_DMA,*/ \
} }
......
include/asm-arm/arch-adifcc/memory.h
View file @ 6f26b809
...@@ -7,35 +7,11 @@ ...@@ -7,35 +7,11 @@
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset. * Physical DRAM offset.
*/ */
#define PHYS_OFFSET (0xC0000000UL) #define PHYS_OFFSET (0xC0000000UL)
/*
* physical vs virtual ram conversion
*/
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-cl7500/keyboard.h deleted 100644 → 0
View file @ f8659154
/*
* linux/include/asm-arm/arch-cl7500/keyboard.h
* from linux/include/asm-arm/arch-rpc/keyboard.h
*
* Keyboard driver definitions for CL7500 architecture
*
* Copyright (C) 1998-2001 Russell King
*/
#include <asm/irq.h>
#define NR_SCANCODES 128
extern int ps2kbd_init_hw(void);
#define kbd_disable_irq() disable_irq(IRQ_KEYBOARDRX)
#define kbd_enable_irq() enable_irq(IRQ_KEYBOARDRX)
#define kbd_init_hw() ps2kbd_init_hw()
include/asm-arm/arch-cl7500/memory.h
View file @ 6f26b809
...@@ -11,30 +11,14 @@ ...@@ -11,30 +11,14 @@
* 21-Mar-1999 RMK Renamed to memory.h * 21-Mar-1999 RMK Renamed to memory.h
* RMK Added TASK_SIZE and PAGE_OFFSET * RMK Added TASK_SIZE and PAGE_OFFSET
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x10000000UL) #define PHYS_OFFSET (0x10000000UL)
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* These are exactly the same on the RiscPC as the * These are exactly the same on the RiscPC as the
* physical memory view. * physical memory view.
......
include/asm-arm/arch-clps711x/keyboard.h deleted 100644 → 0
View file @ f8659154
/*
* linux/include/asm-arm/arch-clps711x/keyboard.h
*
* Copyright (C) 1998-2001 Russell King
*/
#include <asm/mach-types.h>
#define NR_SCANCODES 128
#define kbd_disable_irq() do { } while (0)
#define kbd_enable_irq() do { } while (0)
/*
* EDB7211 keyboard driver
*/
extern void edb7211_kbd_init_hw(void);
extern void clps711x_kbd_init_hw(void);
static inline void kbd_init_hw(void)
{
if (machine_is_edb7211())
edb7211_kbd_init_hw();
if (machine_is_autcpu12())
clps711x_kbd_init_hw();
}
include/asm-arm/arch-clps711x/memory.h
View file @ 6f26b809
/* /*
* linux/include/asm-arm/arch-clps711x/mmu.h * linux/include/asm-arm/arch-clps711x/memory.h
* *
* Copyright (C) 1999 ARM Limited * Copyright (C) 1999 ARM Limited
* *
...@@ -17,35 +17,16 @@ ...@@ -17,35 +17,16 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
#include <linux/config.h> #include <linux/config.h>
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0xc0000000UL) #define PHYS_OFFSET (0xc0000000UL)
/*
* On integrator, the dram is contiguous
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-ebsa110/memory.h
View file @ 6f26b809
...@@ -17,26 +17,10 @@ ...@@ -17,26 +17,10 @@
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x00000000UL) #define PHYS_OFFSET (0x00000000UL)
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET)
/* /*
* We keep this 1:1 so that we don't interfere * We keep this 1:1 so that we don't interfere
* with the PCMCIA memory regions * with the PCMCIA memory regions
......
include/asm-arm/arch-ebsa285/memory.h
View file @ 6f26b809
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Renamed to memory.h * Renamed to memory.h
* Moved PAGE_OFFSET and TASK_SIZE here * Moved PAGE_OFFSET and TASK_SIZE here
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
#include <linux/config.h> #include <linux/config.h>
...@@ -61,7 +61,9 @@ extern unsigned long __bus_to_virt(unsigned long); ...@@ -61,7 +61,9 @@ extern unsigned long __bus_to_virt(unsigned long);
#endif #endif
#define TASK_SIZE_26 (0x04000000UL) /*
* Physical DRAM offset.
*/
#define PHYS_OFFSET (0x00000000UL) #define PHYS_OFFSET (0x00000000UL)
/* /*
...@@ -70,10 +72,4 @@ extern unsigned long __bus_to_virt(unsigned long); ...@@ -70,10 +72,4 @@ extern unsigned long __bus_to_virt(unsigned long);
*/ */
#define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3) #define TASK_UNMAPPED_BASE ((TASK_SIZE + 0x01000000) / 3)
/*
* The DRAM is always contiguous.
*/
#define __virt_to_phys(vpage) ((unsigned long)(vpage) - PAGE_OFFSET)
#define __phys_to_virt(ppage) ((unsigned long)(ppage) + PAGE_OFFSET)
#endif #endif
include/asm-arm/arch-epxa10db/memory.h
View file @ 6f26b809
...@@ -17,33 +17,14 @@ ...@@ -17,33 +17,14 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x00000000UL) #define PHYS_OFFSET (0x00000000UL)
/*
* On epxa10, the dram is contiguous
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-integrator/memory.h
View file @ 6f26b809
/* /*
* linux/include/asm-arm/arch-integrator/mmu.h * linux/include/asm-arm/arch-integrator/memory.h
* *
* Copyright (C) 1999 ARM Limited * Copyright (C) 1999 ARM Limited
* *
...@@ -17,33 +17,13 @@ ...@@ -17,33 +17,13 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x00000000UL) #define PHYS_OFFSET (0x00000000UL)
/*
* On integrator, the dram is contiguous
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET)
#define BUS_OFFSET (0x80000000UL) #define BUS_OFFSET (0x80000000UL)
/* /*
......
include/asm-arm/arch-iop3xx/memory.h
View file @ 6f26b809
...@@ -9,34 +9,11 @@ ...@@ -9,34 +9,11 @@
#include <asm/arch/iop310.h> #include <asm/arch/iop310.h>
#include <asm/arch/iop321.h> #include <asm/arch/iop321.h>
/*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset. * Physical DRAM offset.
*/ */
#define PHYS_OFFSET (0xa0000000UL) #define PHYS_OFFSET (0xa0000000UL)
/*
* physical vs virtual ram conversion
*/
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-ixp4xx/memory.h
View file @ 6f26b809
...@@ -7,29 +7,11 @@ ...@@ -7,29 +7,11 @@
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset. * Physical DRAM offset.
*/ */
#define PHYS_OFFSET (0x00000000UL) #define PHYS_OFFSET (0x00000000UL)
/*
* physical vs virtual ram conversion
*/
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-l7200/keyboard.h deleted 100644 → 0
View file @ f8659154
/*
* linux/include/asm-arm/arch-l7200/keyboard.h
*
* Keyboard driver definitions for LinkUp Systems L7200 architecture
*
* Copyright (C) 2000 Scott A McConnell (samcconn@cotw.com)
* Steve Hill (sjhill@cotw.com)
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive for
* more details.
*
* Changelog:
* 07-18-2000 SAM Created file
* 07-28-2000 SJH Complete rewrite
*/
#include <asm/irq.h>
#error This needs fixing --rmk
/*
* Layout of L7200 keyboard registers
*/
struct KBD_Port {
unsigned int KBDR;
unsigned int KBDMR;
unsigned int KBSBSR;
unsigned int Reserved;
unsigned int KBKSR;
};
#define KBD_BASE IO_BASE_2 + 0x4000
#define l7200kbd_hwregs ((volatile struct KBD_Port *) (KBD_BASE))
extern void l7200kbd_init_hw(void);
extern int l7200kbd_translate(unsigned char scancode, unsigned char *keycode,
char raw_mode);
#define kbd_setkeycode(sc,kc) (-EINVAL)
#define kbd_getkeycode(sc) (-EINVAL)
#define kbd_translate(sc, kcp, rm) ({ *(kcp) = (sc); 1; })
#define kbd_unexpected_up(kc) (0200)
#define kbd_leds(leds) do {} while (0)
#define kbd_init_hw() l7200kbd_init_hw()
#define kbd_sysrq_xlate ((unsigned char *)NULL)
#define kbd_disable_irq() disable_irq(IRQ_GCTC2)
#define kbd_enable_irq() enable_irq(IRQ_GCTC2)
#define SYSRQ_KEY 13
include/asm-arm/arch-l7200/memory.h
View file @ 6f26b809
...@@ -12,34 +12,11 @@ ...@@ -12,34 +12,11 @@
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset on the L7200 SDB. * Physical DRAM offset on the L7200 SDB.
*/ */
#define PHYS_OFFSET (0xf0000000UL) #define PHYS_OFFSET (0xf0000000UL)
/*
* The DRAM is contiguous.
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
#define __virt_to_bus(x) __virt_to_phys(x) #define __virt_to_bus(x) __virt_to_phys(x)
#define __bus_to_virt(x) __phys_to_virt(x) #define __bus_to_virt(x) __phys_to_virt(x)
......
include/asm-arm/arch-lh7a40x/memory.h
View file @ 6f26b809
...@@ -14,34 +14,11 @@ ...@@ -14,34 +14,11 @@
#define BANKS_PER_NODE 1 /* Define as either 1 or 2 */ #define BANKS_PER_NODE 1 /* Define as either 1 or 2 */
/*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL) /* 0xc0000000? */
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset. * Physical DRAM offset.
*/ */
#define PHYS_OFFSET (0xc0000000UL) #define PHYS_OFFSET (0xc0000000UL)
/*
* physical vs virtual ram conversion
*/
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-nexuspci/memory.h
View file @ 6f26b809
...@@ -5,34 +5,15 @@ ...@@ -5,34 +5,15 @@
* Copyright (c) 1999 Russell King * Copyright (c) 1999 Russell King
* *
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x40000000UL) #define PHYS_OFFSET (0x40000000UL)
#define BUS_OFFSET (0xe0000000UL) #define BUS_OFFSET (0xe0000000UL)
/*
* DRAM is contiguous
*/
#define __virt_to_phys(vpage) ((unsigned long)(vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((unsigned long)(ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* On the PCI bus the DRAM appears at address 0xe0000000 * On the PCI bus the DRAM appears at address 0xe0000000
*/ */
......
include/asm-arm/arch-omap/memory.h
View file @ 6f26b809
...@@ -30,25 +30,12 @@ ...@@ -30,25 +30,12 @@
* 675 Mass Ave, Cambridge, MA 02139, USA. * 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xC0000000UL)
#define PHYS_OFFSET (0x10000000UL) #define PHYS_OFFSET (0x10000000UL)
/* /*
...@@ -56,12 +43,6 @@ ...@@ -56,12 +43,6 @@
*/ */
#define OMAP1510_LB_OFFSET (0x30000000UL) #define OMAP1510_LB_OFFSET (0x30000000UL)
/*
* The DRAM is contiguous.
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* Conversion between SDRAM and fake PCI bus, used by USB * Conversion between SDRAM and fake PCI bus, used by USB
* NOTE: Physical address must be converted to Local Bus address * NOTE: Physical address must be converted to Local Bus address
......
include/asm-arm/arch-pxa/hardware.h
View file @ 6f26b809
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* kernel only maps the minimum needed range of this mapping. * kernel only maps the minimum needed range of this mapping.
*/ */
#define io_p2v(x) (0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1)) #define io_p2v(x) (0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
#define io_v2p(x) (0x40000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1)) #define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1))
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
include/asm-arm/arch-pxa/keyboard.h deleted 100644 → 0
View file @ f8659154
/*
* linux/include/asm-arm/arch-pxa/keyboard.h
*
* This file contains the architecture specific keyboard definitions
*/
#ifndef _PXA_KEYBOARD_H
#define _PXA_KEYBOARD_H
#include <asm/mach-types.h>
#include <asm/hardware.h>
extern struct kbd_ops_struct *kbd_ops;
#define kbd_disable_irq() do { } while(0);
#define kbd_enable_irq() do { } while(0);
extern int sa1111_kbd_init_hw(void);
static inline void kbd_init_hw(void)
{
if (machine_is_lubbock())
sa1111_kbd_init_hw();
}
#endif /* _PXA_KEYBOARD_H */
include/asm-arm/arch-pxa/memory.h
View file @ 6f26b809
...@@ -12,35 +12,11 @@ ...@@ -12,35 +12,11 @@
#ifndef __ASM_ARCH_MEMORY_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset. * Physical DRAM offset.
*/ */
#define PHYS_OFFSET (0xa0000000UL) #define PHYS_OFFSET (0xa0000000UL)
/*
* physical vs virtual ram conversion
*/
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-pxa/timex.h
View file @ 6f26b809
...@@ -10,8 +10,16 @@ ...@@ -10,8 +10,16 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
/* #include <linux/config.h>
* PXA250/210 timer
*/ #if defined(CONFIG_PXA25x)
/* PXA250/210 timer base */
#define CLOCK_TICK_RATE 3686400 #define CLOCK_TICK_RATE 3686400
#define CLOCK_TICK_FACTOR 80 #elif defined(CONFIG_PXA27x)
/* PXA27x timer base */
#ifdef CONFIG_MACH_MAINSTONE
#define CLOCK_TICK_RATE 3249600
#else
#define CLOCK_TICK_RATE 3250000
#endif
#endif
include/asm-arm/arch-rpc/memory.h
View file @ 6f26b809
...@@ -15,30 +15,14 @@ ...@@ -15,30 +15,14 @@
* 21-Mar-1999 RMK Renamed to memory.h * 21-Mar-1999 RMK Renamed to memory.h
* RMK Added TASK_SIZE and PAGE_OFFSET * RMK Added TASK_SIZE and PAGE_OFFSET
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x10000000UL) #define PHYS_OFFSET (0x10000000UL)
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* These are exactly the same on the RiscPC as the * These are exactly the same on the RiscPC as the
* physical memory view. * physical memory view.
......
include/asm-arm/arch-s3c2410/memory.h
View file @ 6f26b809
...@@ -23,29 +23,10 @@ ...@@ -23,29 +23,10 @@
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*
* DRAM starts at 0x30000000 * DRAM starts at 0x30000000
*/ */
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x30000000UL) #define PHYS_OFFSET (0x30000000UL)
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* These are exactly the same on the S3C2410 as the * These are exactly the same on the S3C2410 as the
* physical memory view. * physical memory view.
......
include/asm-arm/arch-sa1100/keyboard.h deleted 100644 → 0
View file @ f8659154
/*
* linux/include/asm-arm/arch-sa1100/keyboard.h
* Created 16 Dec 1999 by Nicolas Pitre <nico@cam.org>
* This file contains the SA1100 architecture specific keyboard definitions
*/
#ifndef _SA1100_KEYBOARD_H
#define _SA1100_KEYBOARD_H
#include <linux/config.h>
#include <asm/mach-types.h>
extern void gc_kbd_init_hw(void);
extern void smartio_kbd_init_hw(void);
static inline void kbd_init_hw(void)
{
if (machine_is_graphicsclient())
gc_kbd_init_hw();
if (machine_is_adsbitsy())
smartio_kbd_init_hw();
}
#endif /* _SA1100_KEYBOARD_H */
include/asm-arm/arch-sa1100/memory.h
View file @ 6f26b809
...@@ -9,36 +9,11 @@ ...@@ -9,36 +9,11 @@
#include <linux/config.h> #include <linux/config.h>
/*
* Task size: 3GB
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
/* /*
* Physical DRAM offset is 0xc0000000 on the SA1100 * Physical DRAM offset is 0xc0000000 on the SA1100
*/ */
#define PHYS_OFFSET (0xc0000000UL) #define PHYS_OFFSET (0xc0000000UL)
/*
* We take advantage of the fact that physical and virtual address can be the
* same. The NUMA code is handling the large holes that might exist between
* all memory banks.
*/
#define __virt_to_phys(x) (x)
#define __phys_to_virt(x) (x)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/arch-shark/keyboard.h deleted 100644 → 0
View file @ f8659154
/*
* linux/include/asm-arm/arch-shark/keyboard.h
* by Alexander Schulz
*
* Derived from linux/include/asm-arm/arch-ebsa285/keyboard.h
* (C) 1998 Russell King
* (C) 1998 Phil Blundell
*/
#include <linux/config.h>
#include <linux/ioport.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/system.h>
#define KEYBOARD_IRQ IRQ_ISA_KEYBOARD
#define NR_SCANCODES 128
#define kbd_disable_irq() do { } while (0)
#define kbd_enable_irq() do { } while (0)
extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
extern int pckbd_getkeycode(unsigned int scancode);
extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
char raw_mode);
extern char pckbd_unexpected_up(unsigned char keycode);
extern void pckbd_leds(unsigned char leds);
extern void pckbd_init_hw(void);
extern unsigned char pckbd_sysrq_xlate[128];
static inline void kbd_init_hw(void)
{
k_setkeycode = pckbd_setkeycode;
k_getkeycode = pckbd_getkeycode;
k_translate = pckbd_translate;
k_unexpected_up = pckbd_unexpected_up;
k_leds = pckbd_leds;
#ifdef CONFIG_MAGIC_SYSRQ
k_sysrq_key = 0x54;
k_sysrq_xlate = pckbd_sysrq_xlate;
#endif
pckbd_init_hw();
}
/*
* PC Keyboard specifics
*/
/* resource allocation */
#define kbd_request_region() request_region(0x60, 16, "keyboard")
#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \
"keyboard", NULL)
/* How to access the keyboard macros on this platform. */
#define kbd_read_input() inb(KBD_DATA_REG)
#define kbd_read_status() inb(KBD_STATUS_REG)
#define kbd_write_output(val) outb(val, KBD_DATA_REG)
#define kbd_write_command(val) outb(val, KBD_CNTL_REG)
/* Some stoneage hardware needs delays after some operations. */
#define kbd_pause() do { } while(0)
/*
* Machine specific bits for the PS/2 driver
*/
#define aux_request_irq(hand, dev_id) \
request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id)
#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
include/asm-arm/arch-shark/memory.h
View file @ 6f26b809
...@@ -11,26 +11,10 @@ ...@@ -11,26 +11,10 @@
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: = 3GB
*/
#define PAGE_OFFSET (0xC0000000UL)
#define PHYS_OFFSET (0x08000000UL) #define PHYS_OFFSET (0x08000000UL)
#define __virt_to_phys(vpage) (vpage - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) (ppage - PHYS_OFFSET + PAGE_OFFSET)
#define __virt_to_bus(x) __virt_to_phys(x) #define __virt_to_bus(x) __virt_to_phys(x)
#define __bus_to_virt(x) __phys_to_virt(x) #define __bus_to_virt(x) __phys_to_virt(x)
......
include/asm-arm/arch-tbox/memory.h
View file @ 6f26b809
...@@ -8,29 +8,10 @@ ...@@ -8,29 +8,10 @@
#define __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x80000000UL) #define PHYS_OFFSET (0x80000000UL)
/*
* DRAM is contiguous
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET)
/* /*
* Bus view is the same as physical view * Bus view is the same as physical view
*/ */
......
include/asm-arm/arch-versatile/memory.h
View file @ 6f26b809
...@@ -17,33 +17,14 @@ ...@@ -17,33 +17,14 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __ASM_ARCH_MMU_H #ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MMU_H #define __ASM_ARCH_MEMORY_H
/* /*
* Task size: 3GB * Physical DRAM offset.
*/ */
#define TASK_SIZE (0xbf000000UL)
#define TASK_SIZE_26 (0x04000000UL)
/*
* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
#define TASK_UNMAPPED_BASE (0x40000000)
/*
* Page offset: 3GB
*/
#define PAGE_OFFSET (0xc0000000UL)
#define PHYS_OFFSET (0x00000000UL) #define PHYS_OFFSET (0x00000000UL)
/*
* On Versatile PB, the dram is contiguous
*/
#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET)
#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET)
/* /*
* Virtual view <-> DMA view memory address translations * Virtual view <-> DMA view memory address translations
* virt_to_bus: Used to translate the virtual address to an * virt_to_bus: Used to translate the virtual address to an
......
include/asm-arm/memory.h
View file @ 6f26b809
...@@ -15,6 +15,37 @@ ...@@ -15,6 +15,37 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/arch/memory.h> #include <asm/arch/memory.h>
#ifndef TASK_SIZE
/*
* TASK_SIZE - the maximum size of a user space task.
* TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area
*/
#define TASK_SIZE (0xbf000000UL)
#define TASK_UNMAPPED_BASE (0x40000000UL)
#endif
/*
* The maximum size of a 26-bit user space task.
*/
#define TASK_SIZE_26 (0x04000000UL)
/*
* Page offset: 3GB
*/
#ifndef PAGE_OFFSET
#define PAGE_OFFSET (0xc0000000UL)
#endif
/*
* Physical vs virtual RAM address space conversion. These are
* private definitions which should NOT be used outside memory.h
* files. Use virt_to_phys/phys_to_virt/__pa/__va instead.
*/
#ifndef __virt_to_phys
#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET)
#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET)
#endif
/* /*
* The module space lives between the addresses given by TASK_SIZE * The module space lives between the addresses given by TASK_SIZE
* and PAGE_OFFSET - it must be within 32MB of the kernel text. * and PAGE_OFFSET - it must be within 32MB of the kernel text.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7