commit 5a05e5bf204e729b79e9462785f2fa09d5126855 · tjh.dev/kernel

+1

arch/arm/mach-ixp4xx/nslu2-pci.c

··· 17 17 18 18 #include <linux/pci.h> 19 19 #include <linux/init.h> 20 + #include <linux/irq.h> 20 21 21 22 #include <asm/mach/pci.h> 22 23 #include <asm/mach-types.h>

+1

arch/arm/mach-ixp4xx/nslu2-power.c

··· 19 19 20 20 #include <linux/module.h> 21 21 #include <linux/reboot.h> 22 + #include <linux/irq.h> 22 23 #include <linux/interrupt.h> 23 24 #include <linux/reboot.h> 24 25

+1

arch/arm/mach-s3c2410/Makefile

··· 28 28 29 29 # S3C2412 support 30 30 obj-$(CONFIG_CPU_S3C2412) += s3c2412.o 31 + obj-$(CONFIG_CPU_S3C2412) += s3c2412-irq.o 31 32 obj-$(CONFIG_CPU_S3C2412) += s3c2412-clock.o 32 33 33 34 #

-10

arch/arm/mach-s3c2410/cpu.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Modifications: 13 - * 24-Aug-2004 BJD Start of generic S3C24XX support 14 - * 18-Oct-2004 BJD Moved board struct into this file 15 - * 04-Jan-2005 BJD New uart initialisation 16 - * 10-Jan-2005 BJD Moved generic init here, specific to cpu headers 17 - * 14-Jan-2005 BJD Added s3c24xx_init_clocks() call 18 - * 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} & IODESC_ENT 19 - * 14-Mar-2005 BJD Updated for __iomem 20 - * 15-Jan-2006 LCVR Updated S3C2410_PA_##x to new S3C24XX_PA_##x macro 21 11 */ 22 12 23 13 /* todo - fix when rmk changes iodescs to use `void __iomem *` */

+2 -10

arch/arm/mach-s3c2410/devs.c

··· 1 1 /* linux/arch/arm/mach-s3c2410/devs.c 2 2 * 3 3 * Copyright (c) 2004 Simtec Electronics 4 - * Ben Dooks <ben@simtec.co.uk> 4 + * Ben Dooks <ben@simtec.co.uk> 5 5 * 6 - * Base S3C2410 platform device definitions 6 + * Base S3C24XX platform device definitions 7 7 * 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 11 * 12 - * Modifications: 13 - * 15-Jan-2006 LCVR Using S3C24XX_PA_##x macro for common S3C24XX devices 14 - * 10-Mar-2005 LCVR Changed S3C2410_{VA,SZ} to S3C24XX_{VA,SZ} 15 - * 10-Feb-2005 BJD Added camera from guillaume.gourat@nexvision.tv 16 - * 29-Aug-2004 BJD Added timers 0 through 3 17 - * 29-Aug-2004 BJD Changed index of devices we only have one of to -1 18 - * 21-Aug-2004 BJD Added IRQ_TICK to RTC resources 19 - * 18-Aug-2004 BJD Created initial version 20 12 */ 21 13 22 14 #include <linux/kernel.h>

+2 -2

arch/arm/mach-s3c2410/irq.c

··· 86 86 unsigned long s3c_irqwake_eintallow = 0x0000fff0L; 87 87 unsigned long s3c_irqwake_eintmask = 0xffffffffL; 88 88 89 - static int 89 + int 90 90 s3c_irq_wake(unsigned int irqno, unsigned int state) 91 91 { 92 92 unsigned long irqbit = 1 << (irqno - IRQ_EINT0); ··· 260 260 s3c_irq_unmask((irqno <= (IRQ_EINT7 - EXTINT_OFF)) ? IRQ_EINT4t7 : IRQ_EINT8t23); 261 261 } 262 262 263 - static int 263 + int 264 264 s3c_irqext_type(unsigned int irq, unsigned int type) 265 265 { 266 266 void __iomem *extint_reg;

+5

arch/arm/mach-s3c2410/irq.h

··· 97 97 __raw_writel(parentmask, S3C2410_INTPND); 98 98 } 99 99 } 100 + 101 + /* exported for use in arch/arm/mach-s3c2410 */ 102 + 103 + extern int s3c_irq_wake(unsigned int irqno, unsigned int state); 104 + extern int s3c_irqext_type(unsigned int irq, unsigned int type);

-25

arch/arm/mach-s3c2410/mach-bast.c

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Modifications: 13 - * 14-Sep-2004 BJD USB power control 14 - * 20-Aug-2004 BJD Added s3c2410_board struct 15 - * 18-Aug-2004 BJD Added platform devices from default set 16 - * 16-May-2003 BJD Created initial version 17 - * 16-Aug-2003 BJD Fixed header files and copyright, added URL 18 - * 05-Sep-2003 BJD Moved to v2.6 kernel 19 - * 06-Jan-2003 BJD Updates for <arch/map.h> 20 - * 18-Jan-2003 BJD Added serial port configuration 21 - * 05-Oct-2004 BJD Power management code 22 - * 04-Nov-2004 BJD Updated serial port clocks 23 - * 04-Jan-2005 BJD New uart init call 24 - * 10-Jan-2005 BJD Removed include of s3c2410.h 25 - * 14-Jan-2005 BJD Add support for muitlple NAND devices 26 - * 03-Mar-2005 BJD Ensured that bast-cpld.h is included 27 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 28 - * 14-Mar-2005 BJD Updated for __iomem changes 29 - * 22-Jun-2005 BJD Added DM9000 platform information 30 - * 28-Jun-2005 BJD Moved pm functionality out to common code 31 - * 17-Jul-2005 BJD Changed to platform device for SuperIO 16550s 32 - * 25-Jul-2005 BJD Removed ASIX static mappings 33 - * 27-Jul-2005 BJD Ensure maximum frequency of i2c bus 34 - * 20-Sep-2005 BJD Added static to non-exported items 35 - * 26-Oct-2005 BJD Added FB platform data 36 11 */ 37 12 38 13 #include <linux/kernel.h>

-17

arch/arm/mach-s3c2410/mach-h1940.c

··· 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 11 * 12 - * Modifications: 13 - * 16-May-2003 BJD Created initial version 14 - * 16-Aug-2003 BJD Fixed header files and copyright, added URL 15 - * 05-Sep-2003 BJD Moved to v2.6 kernel 16 - * 06-Jan-2003 BJD Updates for <arch/map.h> 17 - * 18-Jan-2003 BJD Added serial port configuration 18 - * 17-Feb-2003 BJD Copied to mach-ipaq.c 19 - * 21-Aug-2004 BJD Added struct s3c2410_board 20 - * 04-Sep-2004 BJD Changed uart init, renamed ipaq_ -> h1940_ 21 - * 18-Oct-2004 BJD Updated new board structure name 22 - * 04-Nov-2004 BJD Change for new serial clock 23 - * 04-Jan-2005 BJD Updated uart init call 24 - * 10-Jan-2005 BJD Removed include of s3c2410.h 25 - * 14-Jan-2005 BJD Added clock init 26 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 27 - * 20-Sep-2005 BJD Added static to non-exported items 28 - * 26-Oct-2005 BJD Changed name of fb init call 29 12 */ 30 13 31 14 #include <linux/kernel.h>

-9

arch/arm/mach-s3c2410/mach-rx3715.c

··· 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 11 * 12 - * Modifications: 13 - * 16-Sep-2004 BJD Copied from mach-h1940.c 14 - * 25-Oct-2004 BJD Updates for 2.6.10-rc1 15 - * 10-Jan-2005 BJD Removed include of s3c2410.h s3c2440.h 16 - * 14-Jan-2005 BJD Added new clock init 17 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 18 - * 14-Mar-2005 BJD Fixed __iomem warnings 19 - * 20-Sep-2005 BJD Added static to non-exported items 20 - * 31-Oct-2005 BJD Added LCD setup for framebuffer 21 12 */ 22 13 23 14 #include <linux/kernel.h>

-4

arch/arm/mach-s3c2410/mach-smdk2410.c

··· 27 27 * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by 28 28 * Ben Dooks <ben@simtec.co.uk> 29 29 * 30 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 31 - * 20-Sep-2005 BJD Added static to non-exported items 32 - * 01-Apr-2006 BJD Moved init code to common smdk 33 - * 34 30 ***********************************************************************/ 35 31 36 32 #include <linux/kernel.h>

+14 -1

arch/arm/mach-s3c2410/mach-smdk2413.c

··· 112 112 smdk_machine_init(); 113 113 } 114 114 115 - MACHINE_START(S3C2413, "SMDK2413") 115 + MACHINE_START(S3C2413, "S3C2413") 116 + /* Maintainer: Ben Dooks <ben@fluff.org> */ 117 + .phys_io = S3C2410_PA_UART, 118 + .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, 119 + .boot_params = S3C2410_SDRAM_PA + 0x100, 120 + 121 + .fixup = smdk2413_fixup, 122 + .init_irq = s3c24xx_init_irq, 123 + .map_io = smdk2413_map_io, 124 + .init_machine = smdk2413_machine_init, 125 + .timer = &s3c24xx_timer, 126 + MACHINE_END 127 + 128 + MACHINE_START(SMDK2413, "SMDK2413") 116 129 /* Maintainer: Ben Dooks <ben@fluff.org> */ 117 130 .phys_io = S3C2410_PA_UART, 118 131 .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

-19

arch/arm/mach-s3c2410/mach-vr1000.c

··· 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 12 * 13 - * Modifications: 14 - * 14-Sep-2004 BJD USB Power control 15 - * 04-Sep-2004 BJD Added new uart init, and io init 16 - * 21-Aug-2004 BJD Added struct s3c2410_board 17 - * 06-Aug-2004 BJD Fixed call to time initialisation 18 - * 05-Apr-2004 BJD Copied to make mach-vr1000.c 19 - * 18-Oct-2004 BJD Updated board struct 20 - * 04-Nov-2004 BJD Clock and serial configuration update 21 - * 22 - * 04-Jan-2005 BJD Updated uart init call 23 - * 10-Jan-2005 BJD Removed include of s3c2410.h 24 - * 14-Jan-2005 BJD Added clock init 25 - * 15-Jan-2005 BJD Add serial port device definition 26 - * 20-Jan-2005 BJD Use UPF_IOREMAP for ports 27 - * 10-Feb-2005 BJD Added power-off capability 28 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 29 - * 14-Mar-2006 BJD void __iomem fixes 30 - * 22-Jun-2006 BJD Added DM9000 platform information 31 - * 20-Sep-2005 BJD Added static to non-exported items 32 13 */ 33 14 34 15 #include <linux/kernel.h>

+1 -4

arch/arm/mach-s3c2410/s3c2400-gpio.c

··· 17 17 * You should have received a copy of the GNU General Public License 18 18 * along with this program; if not, write to the Free Software 19 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 - * 21 - * Changelog 22 - * 15-Jan-2006 LCVR Splitted from gpio.c, adding support for the S3C2400 23 - */ 20 + */ 24 21 25 22 #include <linux/kernel.h> 26 23 #include <linux/init.h>

-8

arch/arm/mach-s3c2410/s3c2410.h

··· 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 11 * 12 - * Modifications: 13 - * 18-Aug-2004 BJD Created initial version 14 - * 20-Aug-2004 BJD Added s3c2410_board struct 15 - * 04-Sep-2004 BJD Added s3c2410_init_uarts() call 16 - * 17-Oct-2004 BJD Moved board out to cpu 17 - * 04-Jan-2005 BJD Changed uart init 18 - * 10-Jan-2005 BJD Removed timer to cpu.h, moved 2410 specific bits here 19 - * 14-Jan-2005 BJD Added s3c2410_init_clocks call 20 12 */ 21 13 22 14 #ifdef CONFIG_CPU_S3C2410

+130

arch/arm/mach-s3c2410/s3c2412-irq.c

··· 1 + /* linux/arch/arm/mach-s3c2412/s3c2412-irq.c 2 + * 3 + * Copyright (c) 2006 Simtec Electronics 4 + * Ben Dooks <ben@simtec.co.uk> 5 + * 6 + * This program is free software; you can redistribute it and/or modify 7 + * it under the terms of the GNU General Public License as published by 8 + * the Free Software Foundation; either version 2 of the License, or 9 + * (at your option) any later version. 10 + * 11 + * This program is distributed in the hope that it will be useful, 12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 + * GNU General Public License for more details. 15 + * 16 + * You should have received a copy of the GNU General Public License 17 + * along with this program; if not, write to the Free Software 18 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 + * 20 + */ 21 + 22 + #include <linux/init.h> 23 + #include <linux/module.h> 24 + #include <linux/interrupt.h> 25 + #include <linux/ioport.h> 26 + #include <linux/ptrace.h> 27 + #include <linux/sysdev.h> 28 + 29 + #include <asm/hardware.h> 30 + #include <asm/irq.h> 31 + #include <asm/io.h> 32 + 33 + #include <asm/mach/irq.h> 34 + 35 + #include <asm/arch/regs-irq.h> 36 + #include <asm/arch/regs-gpio.h> 37 + 38 + #include "cpu.h" 39 + #include "irq.h" 40 + 41 + /* the s3c2412 changes the behaviour of IRQ_EINT0 through IRQ_EINT3 by 42 + * having them turn up in both the INT* and the EINT* registers. Whilst 43 + * both show the status, they both now need to be acked when the IRQs 44 + * go off. 45 + */ 46 + 47 + static void 48 + s3c2412_irq_mask(unsigned int irqno) 49 + { 50 + unsigned long bitval = 1UL << (irqno - IRQ_EINT0); 51 + unsigned long mask; 52 + 53 + mask = __raw_readl(S3C2410_INTMSK); 54 + __raw_writel(mask | bitval, S3C2410_INTMSK); 55 + 56 + mask = __raw_readl(S3C2412_EINTMASK); 57 + __raw_writel(mask | bitval, S3C2412_EINTMASK); 58 + } 59 + 60 + static inline void 61 + s3c2412_irq_ack(unsigned int irqno) 62 + { 63 + unsigned long bitval = 1UL << (irqno - IRQ_EINT0); 64 + 65 + __raw_writel(bitval, S3C2412_EINTPEND); 66 + __raw_writel(bitval, S3C2410_SRCPND); 67 + __raw_writel(bitval, S3C2410_INTPND); 68 + } 69 + 70 + static inline void 71 + s3c2412_irq_maskack(unsigned int irqno) 72 + { 73 + unsigned long bitval = 1UL << (irqno - IRQ_EINT0); 74 + unsigned long mask; 75 + 76 + mask = __raw_readl(S3C2410_INTMSK); 77 + __raw_writel(mask|bitval, S3C2410_INTMSK); 78 + 79 + mask = __raw_readl(S3C2412_EINTMASK); 80 + __raw_writel(mask | bitval, S3C2412_EINTMASK); 81 + 82 + __raw_writel(bitval, S3C2412_EINTPEND); 83 + __raw_writel(bitval, S3C2410_SRCPND); 84 + __raw_writel(bitval, S3C2410_INTPND); 85 + } 86 + 87 + static void 88 + s3c2412_irq_unmask(unsigned int irqno) 89 + { 90 + unsigned long bitval = 1UL << (irqno - IRQ_EINT0); 91 + unsigned long mask; 92 + 93 + mask = __raw_readl(S3C2412_EINTMASK); 94 + __raw_writel(mask & ~bitval, S3C2412_EINTMASK); 95 + 96 + mask = __raw_readl(S3C2410_INTMSK); 97 + __raw_writel(mask & ~bitval, S3C2410_INTMSK); 98 + } 99 + 100 + static struct irqchip s3c2412_irq_eint0t4 = { 101 + .ack = s3c2412_irq_ack, 102 + .mask = s3c2412_irq_mask, 103 + .unmask = s3c2412_irq_unmask, 104 + .set_wake = s3c_irq_wake, 105 + .set_type = s3c_irqext_type, 106 + }; 107 + 108 + static int s3c2412_irq_add(struct sys_device *sysdev) 109 + { 110 + unsigned int irqno; 111 + 112 + for (irqno = IRQ_EINT0; irqno <= IRQ_EINT3; irqno++) { 113 + set_irq_chip(irqno, &s3c2412_irq_eint0t4); 114 + set_irq_handler(irqno, do_edge_IRQ); 115 + set_irq_flags(irqno, IRQF_VALID); 116 + } 117 + 118 + return 0; 119 + } 120 + 121 + static struct sysdev_driver s3c2412_irq_driver = { 122 + .add = s3c2412_irq_add, 123 + }; 124 + 125 + static int s3c2412_irq_init(void) 126 + { 127 + return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_irq_driver); 128 + } 129 + 130 + arch_initcall(s3c2412_irq_init);

-3

arch/arm/mach-s3c2410/s3c2440-irq.c

··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 * 20 - * Changelog: 21 - * 25-Jul-2005 BJD Split from irq.c 22 - * 23 20 */ 24 21 25 22 #include <linux/init.h>

+6 -6

arch/arm/mach-s3c2410/s3c244x-irq.c

··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 19 * 20 - * Changelog: 21 - * 25-Jul-2005 BJD Split from irq.c 22 - * 23 20 */ 24 21 25 22 #include <linux/init.h> ··· 119 122 return 0; 120 123 } 121 124 122 - static struct sysdev_driver s3c244x_irq_driver = { 125 + static struct sysdev_driver s3c2440_irq_driver = { 123 126 .add = s3c244x_irq_add, 124 127 }; 125 128 126 129 static int s3c2440_irq_init(void) 127 130 { 128 - return sysdev_driver_register(&s3c2440_sysclass, &s3c244x_irq_driver); 131 + return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_irq_driver); 129 132 } 130 133 131 134 arch_initcall(s3c2440_irq_init); 132 135 136 + static struct sysdev_driver s3c2442_irq_driver = { 137 + .add = s3c244x_irq_add, 138 + }; 133 139 134 140 static int s3c2442_irq_init(void) 135 141 { 136 - return sysdev_driver_register(&s3c2442_sysclass, &s3c244x_irq_driver); 142 + return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_irq_driver); 137 143 } 138 144 139 145 arch_initcall(s3c2442_irq_init);

+1 -1

arch/arm/mm/proc-arm926.S

-3

include/asm-arm/arch-s3c2410/anubis-cpld.h

··· 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 - * 13 - * Changelog: 14 - * 15 12 */ 16 13 17 14 #ifndef __ASM_ARCH_ANUBISCPLD_H

+1 -3

include/asm-arm/arch-s3c2410/anubis-irq.h

··· 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 - * 13 - * Changelog: 14 - */ 12 + */ 15 13 16 14 #ifndef __ASM_ARCH_ANUBISIRQ_H 17 15 #define __ASM_ARCH_ANUBISIRQ_H

-2

include/asm-arm/arch-s3c2410/anubis-map.h

··· 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 - * 13 - * Changelog: 14 12 */ 15 13 16 14 /* needs arch/map.h including with this */

-4

include/asm-arm/arch-s3c2410/audio.h

··· 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 - * 13 - * Changelog: 14 - * 20-Nov-2004 BJD Created file 15 - * 07-Mar-2005 BJD Added suspend/resume calls 16 12 */ 17 13 18 14 #ifndef __ASM_ARCH_AUDIO_H

-5

include/asm-arm/arch-s3c2410/bast-cpld.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 25-May-2003 BJD Created file, added CTRL1 registers 14 - * 30-Aug-2004 BJD Updated definitions from 2.4.26 port 15 - * 30-Aug-2004 BJD Added CTRL3 and CTRL4 definitions 16 11 */ 17 12 18 13 #ifndef __ASM_ARCH_BASTCPLD_H

+1 -5

include/asm-arm/arch-s3c2410/bast-irq.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 14-Sep-2004 BJD Fixed IRQ_USBOC definition 14 - * 06-Jan-2003 BJD Linux 2.6.0 version 15 - */ 11 + */ 16 12 17 13 #ifndef __ASM_ARCH_BASTIRQ_H 18 14 #define __ASM_ARCH_BASTIRQ_H

-4

include/asm-arm/arch-s3c2410/bast-map.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 06-Jan-2003 BJD Linux 2.6.0 version, moved bast specifics from arch/map.h 14 - * 12-Mar-2004 BJD Fixed header include protection 15 11 */ 16 12 17 13 /* needs arch/map.h including with this */

-3

include/asm-arm/arch-s3c2410/bast-pmu.h

··· 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 - * 13 - * Changelog: 14 - * 08-Oct-2003 BJD Initial creation 15 12 */ 16 13 17 14 #ifndef __ASM_ARCH_BASTPMU_H

-3

include/asm-arm/arch-s3c2410/debug-macro.S

··· 10 10 * This program is free software; you can redistribute it and/or modify 11 11 * it under the terms of the GNU General Public License version 2 as 12 12 * published by the Free Software Foundation. 13 - * 14 - * Modifications: 15 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 16 13 */ 17 14 18 15 #include <asm/arch/map.h>

-7

include/asm-arm/arch-s3c2410/fb.h

··· 7 7 * This program is free software; you can redistribute it and/or modify 8 8 * it under the terms of the GNU General Public License version 2 as 9 9 * published by the Free Software Foundation. 10 - * 11 - * 12 - * Changelog: 13 - * 07-Sep-2004 RTP Created file 14 - * 03-Nov-2004 BJD Updated and minor cleanups 15 - * 03-Aug-2005 RTP Renamed to fb.h 16 - * 26-Oct-2005 BJD Changed name of platdata init 17 10 */ 18 11 19 12 #ifndef __ASM_ARM_FB_H

-10

include/asm-arm/arch-s3c2410/hardware.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 21-May-2003 BJD Created file 14 - * 06-Jun-2003 BJD Added CPU frequency settings 15 - * 03-Sep-2003 BJD Linux v2.6 support 16 - * 12-Mar-2004 BJD Fixed include protection, fixed type of clock vars 17 - * 14-Sep-2004 BJD Added misccr and getpin to gpio 18 - * 01-Oct-2004 BJD Added the new gpio functions 19 - * 16-Oct-2004 BJD Removed the clock variables 20 - * 15-Jan-2006 LCVR Added s3c2400_gpio_getirq() 21 11 */ 22 12 23 13 #ifndef __ASM_ARCH_HARDWARE_H

-4

include/asm-arm/arch-s3c2410/idle.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 CPU Idle controls 11 - * 12 - * Changelog: 13 - * 28-Oct-2004 BJD Initial version 14 - * 15 11 */ 16 12 17 13 #ifndef __ASM_ARCH_IDLE_H

-4

include/asm-arm/arch-s3c2410/iic.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 05-Oct-2004 BJD Created file 14 - * 19-Oct-2004 BJD Updated for s3c2440 15 11 */ 16 12 17 13 #ifndef __ASM_ARCH_IIC_H

+1 -7

include/asm-arm/arch-s3c2410/io.h

··· 4 4 * 5 5 * Copyright (C) 1997 Russell King 6 6 * (C) 2003 Simtec Electronics 7 - * 8 - * Modifications: 9 - * 06-Dec-1997 RMK Created. 10 - * 02-Sep-2003 BJD Modified for S3C2410 11 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 12 - * 13-Oct-2005 BJD Fixed problems with LDRH/STRH offset range 13 - */ 7 + */ 14 8 15 9 #ifndef __ASM_ARM_ARCH_IO_H 16 10 #define __ASM_ARM_ARCH_IO_H

+1 -8

include/asm-arm/arch-s3c2410/irqs.h

··· 6 6 * This program is free software; you can redistribute it and/or modify 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 - * 10 - * Changelog: 11 - * 12-May-2003 BJD Created file 12 - * 08-Jan-2003 BJD Linux 2.6.0 version, moved BAST bits out 13 - * 12-Mar-2004 BJD Fixed bug in header protection 14 - * 10-Feb-2005 BJD Added camera IRQ from guillaume.gourat@nexvision.tv 15 - * 28-Feb-2005 BJD Updated s3c2440 IRQs 16 - */ 9 + */ 17 10 18 11 19 12 #ifndef __ASM_ARCH_IRQS_H

-7

include/asm-arm/arch-s3c2410/map.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 12-May-2003 BJD Created file 14 - * 06-Jan-2003 BJD Linux 2.6.0 version, moved bast specifics out 15 - * 10-Feb-2005 BJD Added CAMIF definition from guillaume.gourat@nexvision.tv 16 - * 10-Mar-2005 LCVR Added support to S3C2400, changed {VA,SZ} names 17 - * 15-Jan-2006 LCVR Added S3C24XX_PA macros for common S3C24XX resources 18 11 */ 19 12 20 13 #ifndef __ASM_ARCH_MAP_H

+1 -13

include/asm-arm/arch-s3c2410/memory.h

··· 1 - /* 2 - * linux/include/asm-arm/arch-s3c2410/memory.h 3 - * 1 + /* linux/include/asm-arm/arch-s3c2410/memory.h 4 2 * from linux/include/asm-arm/arch-rpc/memory.h 5 3 * 6 4 * Copyright (C) 1996,1997,1998 Russell King. ··· 6 8 * This program is free software; you can redistribute it and/or modify 7 9 * it under the terms of the GNU General Public License version 2 as 8 10 * published by the Free Software Foundation. 9 - * 10 - * Changelog: 11 - * 20-Oct-1996 RMK Created 12 - * 31-Dec-1997 RMK Fixed definitions to reduce warnings 13 - * 11-Jan-1998 RMK Uninlined to reduce hits on cache 14 - * 08-Feb-1998 RMK Added __virt_to_bus and __bus_to_virt 15 - * 21-Mar-1999 RMK Renamed to memory.h 16 - * RMK Added TASK_SIZE and PAGE_OFFSET 17 - * 05-Apr-2004 BJD Copied and altered for arch-s3c2410 18 - * 17-Mar-2005 LCVR Modified for S3C2400 19 11 */ 20 12 21 13 #ifndef __ASM_ARCH_MEMORY_H

-3

include/asm-arm/arch-s3c2410/nand.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 23-Sep-2004 BJD Created file 14 11 */ 15 12 16 13 /* struct s3c2410_nand_set

-2

include/asm-arm/arch-s3c2410/osiris-map.h

··· 9 9 * This program is free software; you can redistribute it and/or modify 10 10 * it under the terms of the GNU General Public License version 2 as 11 11 * published by the Free Software Foundation. 12 - * 13 - * Changelog: 14 12 */ 15 13 16 14 /* needs arch/map.h including with this */

-3

include/asm-arm/arch-s3c2410/regs-adc.h

··· 7 7 * published by the Free Software Foundation. 8 8 * 9 9 * S3C2410 ADC registers 10 - * 11 - * Changelog: 12 - * 27-09-2004 SAH Created file 13 10 */ 14 11 15 12 #ifndef __ASM_ARCH_REGS_ADC_H

-12

include/asm-arm/arch-s3c2410/regs-clock.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 clock register definitions 11 - * 12 - * Changelog: 13 - * 18-Aug-2004 Ben Dooks Added 2440 definitions 14 - * 08-Aug-2004 Herbert P�tzl Added CLKCON definitions 15 - * 19-06-2003 Ben Dooks Created file 16 - * 12-03-2004 Ben Dooks Updated include protection 17 - * 29-Sep-2004 Ben Dooks Fixed usage for assembly inclusion 18 - * 10-Feb-2005 Ben Dooks Fixed CAMDIVN address (Guillaume Gourat) 19 - * 10-Mar-2005 Lucas Villa Real Changed S3C2410_VA to S3C24XX_VA 20 - * 27-Aug-2005 Ben Dooks Add clock-slow info 21 - * 20-Oct-2005 Ben Dooks Fixed overflow in PLL (Guillaume Gourat) 22 - * 20-Oct-2005 Ben Dooks Add masks for DCLK (Guillaume Gourat) 23 11 */ 24 12 25 13 #ifndef __ASM_ARM_REGS_CLOCK

-15

include/asm-arm/arch-s3c2410/regs-gpio.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 GPIO register definitions 11 - * 12 - * Changelog: 13 - * 19-06-2003 BJD Created file 14 - * 23-06-2003 BJD Updated GSTATUS registers 15 - * 12-03-2004 BJD Updated include protection 16 - * 20-07-2004 BJD Added GPIO pin numbers, added Port A definitions 17 - * 04-10-2004 BJD Fixed number of bugs, added EXT IRQ filter defs 18 - * 17-10-2004 BJD Added GSTATUS1 register definitions 19 - * 18-11-2004 BJD Fixed definitions of GPE3, GPE4, GPE5 and GPE6 20 - * 18-11-2004 BJD Added S3C2440 AC97 controls 21 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 22 - * 28-Mar-2005 LCVR Fixed definition of GPB10 23 - * 26-Oct-2005 BJD Added generic configuration types 24 - * 27-Nov-2005 LCVR Added definitions to S3C2400 registers 25 - * 15-Jan-2006 LCVR Written S3C24XX_GPIO_BASE() macro 26 11 */ 27 12 28 13

-4

include/asm-arm/arch-s3c2410/regs-gpioj.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2440 GPIO J register definitions 11 - * 12 - * Changelog: 13 - * 11-Aug-2004 BJD Created file 14 - * 10-Feb-2005 BJD Fix GPJ12 definition (Guillaume Gourat) 15 11 */ 16 12 17 13

-4

include/asm-arm/arch-s3c2410/regs-iic.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 I2C Controller 11 - * 12 - * Changelog: 13 - * 03-Oct-2004 BJD Initial include for Linux 14 - * 08-Nov-2004 BJD Added S3C2440 filter register 15 11 */ 16 12 17 13 #ifndef __ASM_ARCH_REGS_IIC_H

+1 -11

include/asm-arm/arch-s3c2410/regs-iis.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 IIS register definition 11 - * 12 - * Changelog: 13 - * 19-06-2003 BJD Created file 14 - * 26-06-2003 BJD Finished off definitions for register addresses 15 - * 12-03-2004 BJD Updated include protection 16 - * 07-03-2005 BJD Added FIFO size flags and S3C2440 MPLL 17 - * 05-04-2005 LCVR Added IISFCON definitions for the S3C2400 18 - * 18-07-2005 DA Change IISCON_MPLL to IISMOD_MPLL 19 - * Correct IISMOD_256FS and IISMOD_384FS 20 - * Add IISCON_PSCEN 21 - */ 11 + */ 22 12 23 13 #ifndef __ASM_ARCH_REGS_IIS_H 24 14 #define __ASM_ARCH_REGS_IIS_H

+1 -8

include/asm-arm/arch-s3c2410/regs-irq.h

··· 6 6 * This program is free software; you can redistribute it and/or modify 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 - * 10 - * 11 - * 12 - * Changelog: 13 - * 19-06-2003 BJD Created file 14 - * 12-03-2004 BJD Updated include protection 15 - * 10-03-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 16 - */ 9 + */ 17 10 18 11 19 12 #ifndef ___ASM_ARCH_REGS_IRQ_H

-8

include/asm-arm/arch-s3c2410/regs-lcd.h

··· 6 6 * This program is free software; you can redistribute it and/or modify 7 7 * it under the terms of the GNU General Public License version 2 as 8 8 * published by the Free Software Foundation. 9 - * 10 - * 11 - * 12 - * Changelog: 13 - * 12-06-2003 BJD Created file 14 - * 26-06-2003 BJD Updated LCDCON register definitions 15 - * 12-03-2004 BJD Updated include protection 16 - * 10-03-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 17 9 */ 18 10 19 11

-6

include/asm-arm/arch-s3c2410/regs-mem.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 Memory Control register definitions 11 - * 12 - * Changelog: 13 - * 29-Sep-2004 BJD Initial include for Linux 14 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 15 - * 04-Apr-2005 LCVR Added S3C2400 DRAM/BANKSIZE_MASK definitions 16 - * 17 11 */ 18 12 19 13 #ifndef __ASM_ARM_MEMREGS_H

-4

include/asm-arm/arch-s3c2410/regs-nand.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 NAND register definitions 11 - * 12 - * Changelog: 13 - * 18-Aug-2004 BJD Copied file from 2.4 and updated 14 - * 01-May-2005 BJD Added definitions for s3c2440 controller 15 11 */ 16 12 17 13 #ifndef __ASM_ARM_REGS_NAND

-5

include/asm-arm/arch-s3c2410/regs-rtc.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 Internal RTC register definition 11 - * 12 - * Changelog: 13 - * 19-06-2003 BJD Created file 14 - * 12-03-2004 BJD Updated include protection 15 - * 15-01-2005 LCVR Changed S3C2410_VA to S3C24XX_VA (s3c2400 support) 16 11 */ 17 12 18 13 #ifndef __ASM_ARCH_REGS_RTC_H

-5

include/asm-arm/arch-s3c2410/regs-sdi.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 MMC/SDIO register definitions 11 - * 12 - * Changelog: 13 - * 18-Aug-2004 Ben Dooks Created initial file 14 - * 29-Nov-2004 Koen Martens Added some missing defines, fixed duplicates 15 - * 29-Nov-2004 Ben Dooks Updated Koen's patch 16 11 */ 17 12 18 13 #ifndef __ASM_ARM_REGS_SDI

+1 -4

include/asm-arm/arch-s3c2410/regs-serial.h

··· 27 27 * You should have received a copy of the GNU General Public License 28 28 * along with this program; if not, write to the Free Software 29 29 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 30 - * 31 - * Modifications: 32 - * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA (s3c2400 support) 33 - */ 30 + */ 34 31 35 32 #ifndef __ASM_ARM_REGS_SERIAL_H 36 33 #define __ASM_ARM_REGS_SERIAL_H

+1 -7

include/asm-arm/arch-s3c2410/regs-spi.h

··· 7 7 * published by the Free Software Foundation. 8 8 * 9 9 * S3C2410 SPI register definition 10 - * 11 - * Changelog: 12 - * 20-04-2004 KF Created file 13 - * 04-10-2004 BJD Removed VA address (no longer mapped) 14 - * tidied file for submission 15 - * 03-04-2005 LCVR Added S3C2400_SPPIN_nCS definition 16 - */ 10 + */ 17 11 18 12 #ifndef __ASM_ARCH_REGS_SPI_H 19 13 #define __ASM_ARCH_REGS_SPI_H

-7

include/asm-arm/arch-s3c2410/regs-timer.h

··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 Timer configuration 11 - * 12 - * Changelog: 13 - * 05-06-2003 BJD Created file 14 - * 26-06-2003 BJD Added more timer definitions to mux / control 15 - * 12-03-2004 BJD Updated include protection 16 - * 10-02-2005 BJD Added S3C2410_TCFG1_MUX4_SHIFT (Guillaume Gourat) 17 - * 10-03-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 18 11 */ 19 12 20 13

+1 -7

include/asm-arm/arch-s3c2410/regs-udc.h

··· 6 6 * modify it under the terms of the GNU General Public License as 7 7 * published by the Free Software Foundation; either version 2 of 8 8 * the License, or (at your option) any later version. 9 - * 10 - * Changelog: 11 - * 01-08-2004 Initial creation 12 - * 12-09-2004 Cleanup for submission 13 - * 24-10-2004 Fixed S3C2410_UDC_MAXP_REG definition 14 - * 10-03-2005 Changed S3C2410_VA to S3C24XX_VA 15 - */ 9 + */ 16 10 17 11 #ifndef __ASM_ARCH_REGS_UDC_H 18 12 #define __ASM_ARCH_REGS_UDC_H

+1 -6

include/asm-arm/arch-s3c2410/regs-watchdog.h

··· 1 - /* linux/include/asm/arch-s3c2410/regs0watchdog.h 1 + /* linux/include/asm/arch-s3c2410/regs-watchdog.h 2 2 * 3 3 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> 4 4 * http://www.simtec.co.uk/products/SWLINUX/ ··· 8 8 * published by the Free Software Foundation. 9 9 * 10 10 * S3C2410 Watchdog timer control 11 - * 12 - * Changelog: 13 - * 21-06-2003 BJD Created file 14 - * 12-03-2004 BJD Updated include protection 15 - * 10-03-2005 LCVR Changed S3C2410_VA to S3C24XX_VA 16 11 */ 17 12 18 13

+1 -8

include/asm-arm/arch-s3c2410/system.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 12-May-2003 BJD Created file 14 - * 14-May-2003 BJD Removed idle to aid debugging 15 - * 12-Jun-2003 BJD Added reset via watchdog 16 - * 04-Sep-2003 BJD Moved to v2.6 17 - * 28-Oct-2004 BJD Added over-ride for idle, and fixed reset panic() 18 - */ 11 + */ 19 12 20 13 #include <asm/hardware.h> 21 14 #include <asm/io.h>

-6

include/asm-arm/arch-s3c2410/timex.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 02-Sep-2003 BJD Created file 14 - * 05-Jan-2004 BJD Updated for Linux 2.6.0 15 - * 22-Nov-2004 BJD Fixed CLOCK_TICK_RATE 16 - * 10-Jan-2004 BJD Removed s3c2410_clock_tick_rate 17 11 */ 18 12 19 13 #ifndef __ASM_ARCH_TIMEX_H

-9

include/asm-arm/arch-s3c2410/uncompress.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 22-May-2003 BJD Created 14 - * 08-Sep-2003 BJD Moved to linux v2.6 15 - * 12-Mar-2004 BJD Updated header protection 16 - * 12-Oct-2004 BJD Take account of debug uart configuration 17 - * 15-Nov-2004 BJD Fixed uart configuration 18 - * 22-Feb-2005 BJD Added watchdog to uncompress 19 - * 04-Apr-2005 LCVR Added support to S3C2400 (no cpuid at GSTATUS1) 20 11 */ 21 12 22 13 #ifndef __ASM_ARCH_UNCOMPRESS_H

-5

include/asm-arm/arch-s3c2410/usb-control.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 11-Sep-2004 BJD Created file 14 - * 21-Sep-2004 BJD Updated port info 15 - * 09-Aug-2005 BJD Renamed s3c2410_report_oc s3c2410_usb_report_oc 16 11 */ 17 12 18 13 #ifndef __ASM_ARCH_USBCONTROL_H

+1 -5

include/asm-arm/arch-s3c2410/vmalloc.h

··· 10 10 * published by the Free Software Foundation. 11 11 * 12 12 * S3C2410 vmalloc definition 13 - * 14 - * Changelog: 15 - * 12-Mar-2004 BJD Fixed header, added include protection 16 - * 12=Mar-2004 BJD Fixed VMALLOC_END definitions 17 - */ 13 + */ 18 14 19 15 #ifndef __ASM_ARCH_VMALLOC_H 20 16 #define __ASM_ARCH_VMALLOC_H

-4

include/asm-arm/arch-s3c2410/vr1000-cpld.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 25-May-2003 BJD Created file, added CTRL1 registers 14 - * 19-Mar-2004 BJD Added VR1000 CPLD definitions 15 11 */ 16 12 17 13 #ifndef __ASM_ARCH_VR1000CPLD_H

+1 -5

include/asm-arm/arch-s3c2410/vr1000-irq.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 06-Jan-2003 BJD Linux 2.6.0 version 14 - * 19-Mar-2004 BJD Updates for VR1000 15 - */ 11 + */ 16 12 17 13 #ifndef __ASM_ARCH_VR1000IRQ_H 18 14 #define __ASM_ARCH_VR1000IRQ_H

-6

include/asm-arm/arch-s3c2410/vr1000-map.h

··· 8 8 * This program is free software; you can redistribute it and/or modify 9 9 * it under the terms of the GNU General Public License version 2 as 10 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * 06-Jan-2003 BJD Linux 2.6.0 version, split specifics from arch/map.h 14 - * 12-Mar-2004 BJD Fixed header include protection 15 - * 19-Mar-2004 BJD Copied to VR1000 machine headers. 16 - * 19-Jan-2005 BJD Updated map definitions 17 11 */ 18 12 19 13 /* needs arch/map.h including with this */

+1 -1

include/asm-arm/spinlock.h

··· 201 201 202 202 static inline int __raw_read_trylock(raw_rwlock_t *rw) 203 203 { 204 - unsigned long tmp tmp2 = 1; 204 + unsigned long tmp, tmp2 = 1; 205 205 206 206 __asm__ __volatile__( 207 207 "1: ldrex %0, [%2]\n"