[Netnice-commitlog] netnice : Linux/arch/arm/mach-clps711x Kconfig,1.1.1.2,1.1.1.2.6.1 autcpu12.c,1.
Status: Alpha
Brought to you by:
taost6
Menu
▾
▴
[Netnice-commitlog] netnice : Linux/arch/arm/mach-clps711x Kconfig,1.1.1.2,1.1.1.2.6.1 autcpu12.c,1.1.1.2,1.1.1.2.6.1 cdb89712.c,1.1.1.2,1.1.1.2.6.1 ceiva.c,1.1.1.2,1.1.1.2.6.1 clep7312.c,1.1.1.2,1.1.1.2.6.1 edb7211-arch.c,1.1.1.2,1.1.1.2.6.1 edb7211-mm.c,1.1.1.1,1.1.1.1.8.1 fortunet.c,1.1.1.2,1.1.1.2.6.1 mm.c,1.1.1.1,1.1.1.1.8.1 p720t.c,1.1.1.2,1.1.1.2.6.1 time.c,1.1.1.2,1.1.1.2.6.1
|
From: bhatt k. m. <rou...@us...> - 2006-02-16 10:14:05
|
Update of /cvsroot/netnice/Linux/arch/arm/mach-clps711x In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102/mach-clps711x Modified Files: Tag: netnice2615 Kconfig autcpu12.c cdb89712.c ceiva.c clep7312.c edb7211-arch.c edb7211-mm.c fortunet.c mm.c p720t.c time.c Log Message: netnice patch updated to linux kernel 2.6.15. --Kartikey BHATT Index: time.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/time.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- time.c 5 Nov 2005 19:52:55 -0000 1.1.1.2 +++ time.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -57,8 +57,8 @@ static struct irqaction clps711x_timer_irq = { .name = "CLPS711x Timer Tick", - .flags = SA_INTERRUPT, - .handler = p720t_timer_interrupt + .flags = SA_INTERRUPT | SA_TIMER, + .handler = p720t_timer_interrupt, }; static void __init clps711x_timer_init(void) Index: fortunet.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/fortunet.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- fortunet.c 5 Nov 2005 19:52:55 -0000 1.1.1.2 +++ fortunet.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -31,6 +31,8 @@ #include <asm/mach/arch.h> +#include <asm/memory.h> + #include "common.h" struct meminfo memmap = { @@ -75,11 +77,13 @@ } MACHINE_START(FORTUNET, "ARM-FortuNet") - MAINTAINER("FortuNet Inc.") - BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000) - BOOT_PARAMS(0x00000000) - FIXUP(fortunet_fixup) - MAPIO(clps711x_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: FortuNet Inc. */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc, + .boot_params = 0x00000000, + .fixup = fortunet_fixup, + .map_io = clps711x_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END Index: edb7211-arch.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/edb7211-arch.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- edb7211-arch.c 5 Nov 2005 19:52:55 -0000 1.1.1.2 +++ edb7211-arch.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -51,11 +51,13 @@ } MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") - MAINTAINER("Jon McClintock") - BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) - BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */ - FIXUP(fixup_edb7211) - MAPIO(edb7211_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: Jon McClintock */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, + .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ + .fixup = fixup_edb7211, + .map_io = edb7211_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END Index: Kconfig =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/Kconfig,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- Kconfig 5 Nov 2005 19:52:54 -0000 1.1.1.2 +++ Kconfig 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -28,7 +28,7 @@ config ARCH_EDB7211 bool "EDB7211" select ISA - select DISCONTIGMEM + select ARCH_DISCONTIGMEM_ENABLE help Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211 evaluation board. Index: cdb89712.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/cdb89712.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- cdb89712.c 5 Nov 2005 19:52:54 -0000 1.1.1.2 +++ cdb89712.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -39,7 +39,12 @@ * ethernet driver, perhaps. */ static struct map_desc cdb89712_io_desc[] __initdata = { - { ETHER_BASE, ETHER_START, ETHER_SIZE, MT_DEVICE } + { + .virtual = ETHER_BASE, + .pfn =__phys_to_pfn(ETHER_START), + .length = ETHER_SIZE, + .type = MT_DEVICE + } }; static void __init cdb89712_map_io(void) @@ -49,10 +54,12 @@ } MACHINE_START(CDB89712, "Cirrus-CDB89712") - MAINTAINER("Ray Lehtiniemi") - BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) - BOOT_PARAMS(0xc0000100) - MAPIO(cdb89712_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: Ray Lehtiniemi */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, + .boot_params = 0xc0000100, + .map_io = cdb89712_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END Index: clep7312.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/clep7312.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- clep7312.c 5 Nov 2005 19:52:55 -0000 1.1.1.2 +++ clep7312.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -37,12 +37,14 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") - MAINTAINER("Nobody") - BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) - BOOT_PARAMS(0xc0000100) - FIXUP(fixup_clep7312) - MAPIO(clps711x_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: Nobody */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, + .boot_params = 0xc0000100, + .fixup = fixup_clep7312, + .map_io = clps711x_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END Index: ceiva.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/ceiva.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- ceiva.c 5 Nov 2005 19:52:55 -0000 1.1.1.2 +++ ceiva.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -37,11 +37,13 @@ #include "common.h" static struct map_desc ceiva_io_desc[] __initdata = { - /* virtual, physical, length, type */ - - /* SED1355 controlled video RAM & registers */ - { CEIVA_VIRT_SED1355, CEIVA_PHYS_SED1355, SZ_2M, MT_DEVICE } - + /* SED1355 controlled video RAM & registers */ + { + .virtual = CEIVA_VIRT_SED1355, + .pfn = __phys_to_pfn(CEIVA_PHYS_SED1355), + .length = SZ_2M, + .type = MT_DEVICE + } }; @@ -53,10 +55,12 @@ MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") - MAINTAINER("Rob Scott") - BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) - BOOT_PARAMS(0xc0000100) - MAPIO(ceiva_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: Rob Scott */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, + .boot_params = 0xc0000100, + .map_io = ceiva_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END Index: autcpu12.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/autcpu12.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- autcpu12.c 5 Nov 2005 19:52:54 -0000 1.1.1.2 +++ autcpu12.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -46,10 +46,14 @@ */ static struct map_desc autcpu12_io_desc[] __initdata = { - /* virtual, physical, length, type */ - /* memory-mapped extra io and CS8900A Ethernet chip */ - /* ethernet chip */ - { AUTCPU12_VIRT_CS8900A, AUTCPU12_PHYS_CS8900A, SZ_1M, MT_DEVICE } + /* memory-mapped extra io and CS8900A Ethernet chip */ + /* ethernet chip */ + { + .virtual = AUTCPU12_VIRT_CS8900A, + .pfn = __phys_to_pfn(AUTCPU12_PHYS_CS8900A), + .length = SZ_1M, + .type = MT_DEVICE + } }; void __init autcpu12_map_io(void) @@ -59,11 +63,13 @@ } MACHINE_START(AUTCPU12, "autronix autcpu12") - MAINTAINER("Thomas Gleixner") - BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) - BOOT_PARAMS(0xc0020000) - MAPIO(autcpu12_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: Thomas Gleixner */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, + .boot_params = 0xc0020000, + .map_io = autcpu12_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END Index: mm.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/mm.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.8.1 diff -u -d -r1.1.1.1 -r1.1.1.1.8.1 --- mm.c 13 Jul 2004 07:19:35 -0000 1.1.1.1 +++ mm.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.8.1 @@ -24,6 +24,7 @@ #include <linux/init.h> #include <linux/bootmem.h> +#include <asm/sizes.h> #include <asm/hardware.h> #include <asm/pgtable.h> #include <asm/page.h> @@ -34,7 +35,12 @@ * This maps the generic CLPS711x registers */ static struct map_desc clps711x_io_desc[] __initdata = { - { CLPS7111_VIRT_BASE, CLPS7111_PHYS_BASE, 1048576, MT_DEVICE } + { + .virtual = CLPS7111_VIRT_BASE, + .pfn = __phys_to_pfn(CLPS7111_PHYS_BASE), + .length = SZ_1M, + .type = MT_DEVICE + } }; void __init clps711x_map_io(void) Index: edb7211-mm.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/edb7211-mm.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.8.1 diff -u -d -r1.1.1.1 -r1.1.1.1.8.1 --- edb7211-mm.c 13 Jul 2004 07:19:35 -0000 1.1.1.1 +++ edb7211-mm.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.8.1 @@ -51,15 +51,27 @@ * happens). */ static struct map_desc edb7211_io_desc[] __initdata = { - /* virtual, physical, length, type */ - - /* memory-mapped extra keyboard row and CS8900A Ethernet chip */ - { EP7211_VIRT_EXTKBD, EP7211_PHYS_EXTKBD, SZ_1M, MT_DEVICE }, - { EP7211_VIRT_CS8900A, EP7211_PHYS_CS8900A, SZ_1M, MT_DEVICE }, - - /* flash banks */ - { EP7211_VIRT_FLASH1, EP7211_PHYS_FLASH1, SZ_8M, MT_DEVICE }, - { EP7211_VIRT_FLASH2, EP7211_PHYS_FLASH2, SZ_8M, MT_DEVICE } + { /* memory-mapped extra keyboard row */ + .virtual = EP7211_VIRT_EXTKBD, + .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD), + .length = SZ_1M, + .type = MT_DEVICE, + }, { /* and CS8900A Ethernet chip */ + .virtual = EP7211_VIRT_CS8900A, + .pfn = __phys_to_pfn(EP7211_PHYS_CS8900A), + .length = SZ_1M, + .type = MT_DEVICE, + }, { /* flash banks */ + .virtual = EP7211_VIRT_FLASH1, + .pfn = __phys_to_pfn(EP7211_PHYS_FLASH1), + .length = SZ_8M, + .type = MT_DEVICE, + }, { + .virtual = EP7211_VIRT_FLASH2, + .pfn = __phys_to_pfn(EP7211_PHYS_FLASH2), + .length = SZ_8M, + .type = MT_DEVICE, + } }; void __init edb7211_map_io(void) Index: p720t.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-clps711x/p720t.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.6.1 diff -u -d -r1.1.1.2 -r1.1.1.2.6.1 --- p720t.c 5 Nov 2005 19:52:55 -0000 1.1.1.2 +++ p720t.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -29,6 +29,7 @@ #include <asm/pgtable.h> #include <asm/page.h> #include <asm/setup.h> +#include <asm/sizes.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -42,8 +43,17 @@ * We map both here. */ static struct map_desc p720t_io_desc[] __initdata = { - { SYSPLD_VIRT_BASE, SYSPLD_PHYS_BASE, 1048576, MT_DEVICE }, - { 0xfe400000, 0x10400000, 1048576, MT_DEVICE } + { + .virtual = SYSPLD_VIRT_BASE, + .pfn = __phys_to_pfn(SYSPLD_PHYS_BASE), + .length = SZ_1M, + .type = MT_DEVICE + }, { + .virtual = 0xfe400000, + .pfn = __phys_to_pfn(0x10400000), + .length = SZ_1M, + .type = MT_DEVICE + } }; static void __init @@ -79,12 +89,14 @@ } MACHINE_START(P720T, "ARM-Prospector720T") - MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") - BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) - BOOT_PARAMS(0xc0000100) - FIXUP(fixup_p720t) - MAPIO(p720t_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, + .boot_params = 0xc0000100, + .fixup = fixup_p720t, + .map_io = p720t_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END |