hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-arm

This commit is contained in:
Linus Torvalds 2005-11-21 19:00:05 -08:00
parent 49bd96c2ca 9b73fcf85f
commit 66b5920f61
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-clps7500/core.c
View File

@ -260,7 +260,7 @@ static void __init clps7500_init_irq(void)
static struct map_desc cl7500_io_desc[] __initdata = { static struct map_desc cl7500_io_desc[] __initdata = {
{ /* IO space */ { /* IO space */
.virtual = IO_BASE, .virtual = (unsigned long)IO_BASE,
.pfn = __phys_to_pfn(IO_START), .pfn = __phys_to_pfn(IO_START),
.length = IO_SIZE, .length = IO_SIZE,
.type = MT_DEVICE .type = MT_DEVICE

2
arch/arm/mach-pxa/tosa.c
View File

@ -14,7 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/device.h> #include <linux/platform_device.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>

3
arch/arm/mach-sa1100/assabet.c
View File

@ -293,7 +293,8 @@ static void __init get_assabet_scr(void)
GPDR |= 0x3fc; /* Configure GPIO 9:2 as outputs */ GPDR |= 0x3fc; /* Configure GPIO 9:2 as outputs */
GPSR = 0x3fc; /* Write 0xFF to GPIO 9:2 */ GPSR = 0x3fc; /* Write 0xFF to GPIO 9:2 */
GPDR &= ~(0x3fc); /* Configure GPIO 9:2 as inputs */ GPDR &= ~(0x3fc); /* Configure GPIO 9:2 as inputs */
for(i = 100; i--; scr = GPLR); /* Read GPIO 9:2 */ for(i = 100; i--; ) /* Read GPIO 9:2 */
scr = GPLR;
GPDR |= 0x3fc; /* restore correct pin direction */ GPDR |= 0x3fc; /* restore correct pin direction */
scr &= 0x3fc; /* save as system configuration byte. */ scr &= 0x3fc; /* save as system configuration byte. */
SCR_value = scr; SCR_value = scr;

2
include/asm-arm/arch-ebsa110/io.h
View File

@ -64,7 +64,7 @@ void __writel(u32 val, void __iomem *addr);
#define writew(v,b) __writew(v,b) #define writew(v,b) __writew(v,b)
#define writel(v,b) __writel(v,b) #define writel(v,b) __writel(v,b)
#define __arch_ioremap(cookie,sz,c,a) ((void __iomem *)(cookie)) #define __arch_ioremap(cookie,sz,c) ((void __iomem *)(cookie))
#define __arch_iounmap(cookie) do { } while (0) #define __arch_iounmap(cookie) do { } while (0)
extern void insb(unsigned int port, void *buf, int sz); extern void insb(unsigned int port, void *buf, int sz);

1
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
View File

@ -47,6 +47,7 @@
* Queue Manager * Queue Manager
*/ */
#define IXP4XX_QMGR_BASE_PHYS (0x60000000) #define IXP4XX_QMGR_BASE_PHYS (0x60000000)
#define IXP4XX_QMGR_REGION_SIZE (0x00004000)
/* /*
* Expansion BUS Configuration registers * Expansion BUS Configuration registers

2
include/asm-arm/numnodes.h
View File

@ -17,6 +17,8 @@
#ifndef __ASM_ARM_NUMNODES_H #ifndef __ASM_ARM_NUMNODES_H
#define __ASM_ARM_NUMNODES_H #define __ASM_ARM_NUMNODES_H
#include <asm/memory.h>
#ifndef NODES_SHIFT #ifndef NODES_SHIFT
# define NODES_SHIFT 2 /* Normally, Max 4 Nodes */ # define NODES_SHIFT 2 /* Normally, Max 4 Nodes */
#endif #endif