[Netnice-commitlog] netnice : Linux/arch/arm/mach-footbridge Kconfig,1.1.1.2,1.1.1.2.6.1 cats-hw.c,1
Status: Alpha
Brought to you by:
taost6
Menu
▾
▴
[Netnice-commitlog] netnice : Linux/arch/arm/mach-footbridge Kconfig,1.1.1.2,1.1.1.2.6.1 cats-hw.c,1.1.1.2,1.1.1.2.6.1 co285.c,1.1.1.1,1.1.1.1.6.1 common.c,1.1.1.1,1.1.1.1.6.1 dc21285-timer.c,1.1.1.1,1.1.1.1.6.1 ebsa285.c,1.1.1.1,1.1.1.1.6.1 isa-irq.c,1.1.1.1,1.1.1.1.8.1 isa-timer.c,1.1.1.1,1.1.1.1.6.1 isa.c,1.1.1.1,1.1.1.1.6.1 netwinder-hw.c,1.1.1.2,1.1.1.2.6.1 personal.c,1.1.1.1,1.1.1.1.6.1
|
From: bhatt k. m. <rou...@us...> - 2006-02-16 10:14:05
|
Update of /cvsroot/netnice/Linux/arch/arm/mach-footbridge In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102/mach-footbridge Modified Files: Tag: netnice2615 Kconfig cats-hw.c co285.c common.c dc21285-timer.c ebsa285.c isa-irq.c isa-timer.c isa.c netwinder-hw.c personal.c Log Message: netnice patch updated to linux kernel 2.6.15. --Kartikey BHATT Index: personal.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/personal.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- personal.c 5 Nov 2005 19:52:58 -0000 1.1.1.1 +++ personal.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -13,11 +13,13 @@ #include "common.h" MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer") - MAINTAINER("Jamey Hicks / George France") - BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) - BOOT_PARAMS(0x00000100) - MAPIO(footbridge_map_io) - INITIRQ(footbridge_init_irq) + /* Maintainer: Jamey Hicks / George France */ + .phys_ram = 0x00000000, + .phys_io = DC21285_ARMCSR_BASE, + .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc, + .boot_params = 0x00000100, + .map_io = footbridge_map_io, + .init_irq = footbridge_init_irq, .timer = &footbridge_timer, MACHINE_END Index: Kconfig =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/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:56 -0000 1.1.1.2 +++ Kconfig 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -87,6 +87,7 @@ # EBSA285 board in either host or addin mode config ARCH_EBSA285 + select ARCH_MAY_HAVE_PC_FDC bool endif Index: common.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/common.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- common.c 5 Nov 2005 19:52:57 -0000 1.1.1.1 +++ common.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -130,8 +130,17 @@ * it means that we have extra bullet protection on our feet. */ static struct map_desc fb_common_io_desc[] __initdata = { - { ARMCSR_BASE, DC21285_ARMCSR_BASE, ARMCSR_SIZE, MT_DEVICE }, - { XBUS_BASE, 0x40000000, XBUS_SIZE, MT_DEVICE } + { + .virtual = ARMCSR_BASE, + .pfn = __phys_to_pfn(DC21285_ARMCSR_BASE), + .length = ARMCSR_SIZE, + .type = MT_DEVICE, + }, { + .virtual = XBUS_BASE, + .pfn = __phys_to_pfn(0x40000000), + .length = XBUS_SIZE, + .type = MT_DEVICE, + } }; /* @@ -140,11 +149,32 @@ */ static struct map_desc ebsa285_host_io_desc[] __initdata = { #if defined(CONFIG_ARCH_FOOTBRIDGE) && defined(CONFIG_FOOTBRIDGE_HOST) - { PCIMEM_BASE, DC21285_PCI_MEM, PCIMEM_SIZE, MT_DEVICE }, - { PCICFG0_BASE, DC21285_PCI_TYPE_0_CONFIG, PCICFG0_SIZE, MT_DEVICE }, - { PCICFG1_BASE, DC21285_PCI_TYPE_1_CONFIG, PCICFG1_SIZE, MT_DEVICE }, - { PCIIACK_BASE, DC21285_PCI_IACK, PCIIACK_SIZE, MT_DEVICE }, - { PCIO_BASE, DC21285_PCI_IO, PCIO_SIZE, MT_DEVICE } + { + .virtual = PCIMEM_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_MEM), + .length = PCIMEM_SIZE, + .type = MT_DEVICE, + }, { + .virtual = PCICFG0_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_TYPE_0_CONFIG), + .length = PCICFG0_SIZE, + .type = MT_DEVICE, + }, { + .virtual = PCICFG1_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_TYPE_1_CONFIG), + .length = PCICFG1_SIZE, + .type = MT_DEVICE, + }, { + .virtual = PCIIACK_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_IACK), + .length = PCIIACK_SIZE, + .type = MT_DEVICE, + }, { + .virtual = PCIO_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_IO), + .length = PCIO_SIZE, + .type = MT_DEVICE, + }, #endif }; @@ -153,8 +183,17 @@ */ static struct map_desc co285_io_desc[] __initdata = { #ifdef CONFIG_ARCH_CO285 - { PCIO_BASE, DC21285_PCI_IO, PCIO_SIZE, MT_DEVICE }, - { PCIMEM_BASE, DC21285_PCI_MEM, PCIMEM_SIZE, MT_DEVICE } + { + .virtual = PCIO_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_IO), + .length = PCIO_SIZE, + .type = MT_DEVICE, + }, { + .virtual = PCIMEM_BASE, + .pfn = __phys_to_pfn(DC21285_PCI_MEM), + .length = PCIMEM_SIZE, + .type = MT_DEVICE, + }, #endif }; Index: ebsa285.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/ebsa285.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- ebsa285.c 5 Nov 2005 19:52:57 -0000 1.1.1.1 +++ ebsa285.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -13,12 +13,15 @@ #include "common.h" MACHINE_START(EBSA285, "EBSA285") - MAINTAINER("Russell King") - BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) - BOOT_PARAMS(0x00000100) - VIDEO(0x000a0000, 0x000bffff) - MAPIO(footbridge_map_io) - INITIRQ(footbridge_init_irq) + /* Maintainer: Russell King */ + .phys_ram = 0x00000000, + .phys_io = DC21285_ARMCSR_BASE, + .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc, + .boot_params = 0x00000100, + .video_start = 0x000a0000, + .video_end = 0x000bffff, + .map_io = footbridge_map_io, + .init_irq = footbridge_init_irq, .timer = &footbridge_timer, MACHINE_END Index: co285.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/co285.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- co285.c 5 Nov 2005 19:52:56 -0000 1.1.1.1 +++ co285.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -28,11 +28,13 @@ } MACHINE_START(CO285, "co-EBSA285") - MAINTAINER("Mark van Doesburg") - BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000) - FIXUP(fixup_coebsa285) - MAPIO(footbridge_map_io) - INITIRQ(footbridge_init_irq) + /* Maintainer: Mark van Doesburg */ + .phys_ram = 0x00000000, + .phys_io = DC21285_ARMCSR_BASE, + .io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc, + .fixup = fixup_coebsa285, + .map_io = footbridge_map_io, + .init_irq = footbridge_init_irq, .timer = &footbridge_timer, MACHINE_END Index: isa.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/isa.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- isa.c 5 Nov 2005 19:52:57 -0000 1.1.1.1 +++ isa.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -34,7 +34,7 @@ static struct platform_device serial_device = { .name = "serial8250", - .id = 0, + .id = PLAT8250_DEV_PLATFORM, .dev = { .platform_data = serial_platform_data, }, Index: netwinder-hw.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/netwinder-hw.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 --- netwinder-hw.c 5 Nov 2005 19:52:58 -0000 1.1.1.2 +++ netwinder-hw.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -647,14 +647,17 @@ } MACHINE_START(NETWINDER, "Rebel-NetWinder") - MAINTAINER("Russell King/Rebel.com") - BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) - BOOT_PARAMS(0x00000100) - VIDEO(0x000a0000, 0x000bffff) - DISABLE_PARPORT(0) - DISABLE_PARPORT(2) - FIXUP(fixup_netwinder) - MAPIO(footbridge_map_io) - INITIRQ(footbridge_init_irq) + /* Maintainer: Russell King/Rebel.com */ + .phys_ram = 0x00000000, + .phys_io = DC21285_ARMCSR_BASE, + .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc, + .boot_params = 0x00000100, + .video_start = 0x000a0000, + .video_end = 0x000bffff, + .reserve_lp0 = 1, + .reserve_lp2 = 1, + .fixup = fixup_netwinder, + .map_io = footbridge_map_io, + .init_irq = footbridge_init_irq, .timer = &isa_timer, MACHINE_END Index: isa-timer.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/isa-timer.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- isa-timer.c 5 Nov 2005 19:52:57 -0000 1.1.1.1 +++ isa-timer.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -72,7 +72,7 @@ static struct irqaction isa_timer_irq = { .name = "ISA timer tick", .handler = isa_timer_interrupt, - .flags = SA_INTERRUPT, + .flags = SA_INTERRUPT | SA_TIMER, }; static void __init isa_timer_init(void) Index: isa-irq.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/isa-irq.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 --- isa-irq.c 13 Jul 2004 07:19:35 -0000 1.1.1.1 +++ isa-irq.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.8.1 @@ -95,7 +95,7 @@ } desc = irq_desc + isa_irq; - desc->handle(isa_irq, desc, regs); + desc_handle_irq(isa_irq, desc, regs); } static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", }; Index: dc21285-timer.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/dc21285-timer.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.6.1 diff -u -d -r1.1.1.1 -r1.1.1.1.6.1 --- dc21285-timer.c 5 Nov 2005 19:52:57 -0000 1.1.1.1 +++ dc21285-timer.c 16 Feb 2006 10:13:14 -0000 1.1.1.1.6.1 @@ -43,7 +43,7 @@ static struct irqaction footbridge_timer_irq = { .name = "Timer1 timer tick", .handler = timer1_interrupt, - .flags = SA_INTERRUPT, + .flags = SA_INTERRUPT | SA_TIMER, }; /* Index: cats-hw.c =================================================================== RCS file: /cvsroot/netnice/Linux/arch/arm/mach-footbridge/cats-hw.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 --- cats-hw.c 5 Nov 2005 19:52:56 -0000 1.1.1.2 +++ cats-hw.c 16 Feb 2006 10:13:14 -0000 1.1.1.2.6.1 @@ -84,12 +84,14 @@ } MACHINE_START(CATS, "Chalice-CATS") - MAINTAINER("Philip Blundell") - BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) - BOOT_PARAMS(0x00000100) - SOFT_REBOOT - FIXUP(fixup_cats) - MAPIO(footbridge_map_io) - INITIRQ(footbridge_init_irq) + /* Maintainer: Philip Blundell */ + .phys_ram = 0x00000000, + .phys_io = DC21285_ARMCSR_BASE, + .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc, + .boot_params = 0x00000100, + .soft_reboot = 1, + .fixup = fixup_cats, + .map_io = footbridge_map_io, + .init_irq = footbridge_init_irq, .timer = &isa_timer, MACHINE_END |