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

591eb85e · Linus Torvalds <[email protected]> · 2006-03-22 17:32:09 -08:00

* master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
  [ARM] 3389/1: typo and grammar fix
  [ARM] 3386/1: AT91RM9200 Clock update
  [ARM] 3384/1: AT91RM9200: Timer
  [ARM] 3382/1: ixp2000: unify defconfigs
  [ARM] 3381/1: ixp2000: fix slowport write timing control register fields
  [ARM] 3380/1: ixp2000: simplify ixdp2x00_master_npu() check
  [ARM] 3379/1: ixp2000: use generic 8250 debug macros
  [ARM] 3378/1: ixp2000: fix gpio interrupt handling
  [ARM] Quieten spurious IRQ detection
  [ARM] Use kcalloc to allocate counter_config array rather than kmalloc
  [ARM] Oprofile: dynamically allocate counter_config
  [ARM] Oprofile: Convert semaphore to mutex
  [ARM] 3376/2: S3C2410 - update defconfig
  [ARM] 3375/1: S3C2440 - fix osiris machine build
  [ARM] 3374/1: ep93xx: gpio interrupt support
  [ARM] 3361/1: S3C24XX - add USB bus clock source
  [ARM] 3360/1: S3C2440 - add set rate methods and camera clock
  [ARM] 3359/1: S3C24XX - add support for clk_set_rate
  [ARM] Convert kmalloc+memset to kzalloc
  [ARM] 3373/1: move uengine loader to arch/arm/common
  ...

Commit: 591eb85ecd7e6eb8596c6129ae074e16636b99f4
Parents: 4658f79b · 3a2916aa

Merge commit. Changes below are compared with the first parent: 4658f79b.

Changes

151 files changed · +3023 −3913

File	Status	Add	Del	Content
Documentation/arm/Samsung-S3C24XX/Overview.txt	modified	+41	−1	View file
arch/arm/Kconfig	modified	+16	−0	View file
arch/arm/Makefile	modified	+1	−0	View file
arch/arm/common/Makefile	modified	+1	−0	View file
arch/arm/common/dmabounce.c	modified	+1	−1	View file
arch/arm/common/locomo.c	modified	+23	−26	View file
arch/arm/common/sa1111.c	modified	+21	−25	View file
arch/arm/common/scoop.c	modified	+2	−4	View file
arch/arm/mach-ixp2000/uengine.c → arch/arm/common/uengine.c	renamed	+1	−1	View file
arch/arm/common/vic.c	modified	+27	−22	View file
arch/arm/configs/ixdp2400_defconfig → arch/arm/configs/ep93xx_defconfig	renamed	+333	−221	View file
arch/arm/configs/ixdp2401_defconfig	deleted	+0	−976	View before deletion
arch/arm/configs/ixdp2800_defconfig	deleted	+0	−975	View before deletion
arch/arm/configs/ixdp2801_defconfig	deleted	+0	−976	View before deletion
arch/arm/configs/enp2611_defconfig → arch/arm/configs/ixp2000_defconfig	renamed	+47	−15	View file
arch/arm/configs/s3c2410_defconfig	modified	+141	−6	View file
arch/arm/kernel/apm.c	modified	+1	−3	View file
arch/arm/kernel/bios32.c	modified	+1	−3	View file
arch/arm/kernel/debug.S	modified	+0	−1	View file
arch/arm/kernel/ecard.c	modified	+1	−3	View file
arch/arm/kernel/entry-armv.S	modified	+1	−1	View file
arch/arm/kernel/head.S	modified	+3	−4	View file
arch/arm/kernel/irq.c	modified	+8	−3	View file
arch/arm/lib/delay.S	modified	+12	−8	View file
arch/arm/lib/io-acorn.S	modified	+0	−1	View file
arch/arm/mach-at91rm9200/clock.c	modified	+73	−12	View file
arch/arm/mach-at91rm9200/gpio.c	modified	+2	−2	View file
arch/arm/mach-at91rm9200/time.c	modified	+2	−2	View file
arch/arm/mach-ep93xx/Kconfig	added	+21	−0	View file
arch/arm/mach-ep93xx/Makefile	added	+10	−0	View file
arch/arm/mach-ep93xx/Makefile.boot	added	+2	−0	View file
arch/arm/mach-ep93xx/core.c	added	+374	−0	View file
arch/arm/mach-ep93xx/gesbc9312.c	added	+40	−0	View file
arch/arm/mach-ep93xx/ts72xx.c	added	+118	−0	View file
arch/arm/mach-footbridge/dc21285.c	modified	+1	−3	View file
arch/arm/mach-integrator/impd1.c	modified	+2	−5	View file
arch/arm/mach-integrator/integrator_ap.c	modified	+1	−3	View file
arch/arm/mach-iop3xx/iq31244-pci.c	modified	+1	−3	View file
arch/arm/mach-iop3xx/iq80321-pci.c	modified	+1	−3	View file
arch/arm/mach-iop3xx/iq80331-pci.c	modified	+1	−3	View file
arch/arm/mach-iop3xx/iq80332-pci.c	modified	+1	−3	View file
arch/arm/mach-ixp2000/Kconfig	modified	+7	−2	View file
arch/arm/mach-ixp2000/Makefile	modified	+1	−1	View file
arch/arm/mach-ixp2000/core.c	modified	+1	−12	View file
arch/arm/mach-ixp2000/ixdp2x01.c	modified	+18	−2	View file
arch/arm/mach-ixp4xx/common-pci.c	modified	+1	−2	View file
arch/arm/mach-ixp4xx/common.c	modified	+4	−1	View file
arch/arm/mach-lh7a40x/common.h	modified	+1	−0	View file
arch/arm/mach-lh7a40x/irq-kev7a400.c	modified	+1	−0	View file
arch/arm/mach-lh7a40x/irq-lh7a400.c	modified	+1	−1	View file
arch/arm/mach-lh7a40x/irq-lh7a404.c	modified	+2	−1	View file
arch/arm/mach-lh7a40x/irq-lpd7a40x.c	modified	+1	−0	View file
arch/arm/mach-pxa/Makefile	modified	+1	−1	View file
arch/arm/mach-pxa/clock.c	added	+124	−0	View file
arch/arm/mach-pxa/corgi.c	modified	+0	−1	View file
arch/arm/mach-pxa/poodle.c	modified	+0	−1	View file
arch/arm/mach-pxa/spitz.c	modified	+0	−1	View file
arch/arm/mach-pxa/tosa.c	modified	+0	−1	View file
arch/arm/mach-s3c2410/Kconfig	modified	+7	−0	View file
arch/arm/mach-s3c2410/Makefile	modified	+1	−0	View file
arch/arm/mach-s3c2410/clock.c	modified	+174	−4	View file
arch/arm/mach-s3c2410/clock.h	modified	+8	−0	View file
arch/arm/mach-s3c2410/mach-osiris.c	added	+294	−0	View file
arch/arm/mach-s3c2410/s3c2440-clock.c	modified	+71	−18	View file
arch/arm/mach-s3c2410/time.c	modified	+7	−1	View file
arch/arm/mach-sa1100/Makefile	modified	+1	−1	View file
arch/arm/mach-sa1100/clock.c	added	+132	−0	View file
arch/arm/mach-versatile/core.c	modified	+1	−1	View file
arch/arm/mm/Kconfig	modified	+1	−1	View file
arch/arm/mm/init.c	modified	+0	−1	View file
arch/arm/mm/ioremap.c	modified	+0	−1	View file
arch/arm/mm/proc-arm1020.S	modified	+0	−1	View file
arch/arm/mm/proc-arm1020e.S	modified	+0	−1	View file
arch/arm/mm/proc-arm720.S	modified	+0	−1	View file
arch/arm/mm/proc-arm920.S	modified	+0	−1	View file
arch/arm/mm/proc-arm922.S	modified	+0	−1	View file
arch/arm/mm/proc-arm925.S	modified	+0	−1	View file
arch/arm/mm/proc-arm926.S	modified	+0	−1	View file
arch/arm/mm/proc-xscale.S	modified	+0	−1	View file
arch/arm/oprofile/common.c	modified	+19	−15	View file
arch/arm/oprofile/op_counter.h	modified	+1	−1	View file
arch/arm/vfp/entry.S	modified	+1	−0	View file
drivers/net/ixp2000/enp2611.c	modified	+1	−1	View file
drivers/net/ixp2000/ixpdev.c	modified	+1	−1	View file
include/asm-arm/arch-aaec2000/param.h	deleted	+0	−15	View before deletion
include/asm-arm/arch-at91rm9200/param.h	deleted	+0	−28	View before deletion
include/asm-arm/arch-cl7500/debug-macro.S	modified	+2	−12	View file
include/asm-arm/arch-cl7500/param.h	deleted	+0	−5	View before deletion
include/asm-arm/arch-clps711x/param.h	deleted	+0	−19	View before deletion
include/asm-arm/arch-ebsa110/debug-macro.S	modified	+3	−16	View file
include/asm-arm/arch-ebsa110/param.h	deleted	+0	−4	View before deletion
include/asm-arm/arch-ebsa285/debug-macro.S	modified	+3	−15	View file
include/asm-arm/arch-ep93xx/debug-macro.S	added	+22	−0	View file
include/asm-arm/arch-ebsa285/param.h → include/asm-arm/arch-ep93xx/dma.h	renamed	+1	−1	View file
include/asm-arm/arch-ep93xx/entry-macro.S	added	+53	−0	View file
include/asm-arm/arch-ep93xx/ep93xx-regs.h	added	+125	−0	View file
include/asm-arm/arch-iop3xx/param.h → include/asm-arm/arch-ep93xx/gesbc9312.h	renamed	+1	−1	View file
include/asm-arm/arch-ep93xx/gpio.h	added	+107	−0	View file
include/asm-arm/arch-ep93xx/hardware.h	added	+12	−0	View file
include/asm-arm/arch-ep93xx/io.h	added	+8	−0	View file
include/asm-arm/arch-ep93xx/irqs.h	added	+80	−0	View file
include/asm-arm/arch-ep93xx/memory.h	added	+14	−0	View file
include/asm-arm/arch-ep93xx/platform.h	added	+14	−0	View file
include/asm-arm/arch-ep93xx/system.h	added	+26	−0	View file
include/asm-arm/arch-ixp2000/param.h → include/asm-arm/arch-ep93xx/timex.h	renamed	+3	−1	View file
include/asm-arm/arch-ep93xx/ts72xx.h	added	+90	−0	View file
include/asm-arm/arch-ep93xx/uncompress.h	added	+53	−0	View file
include/asm-arm/arch-ixp4xx/param.h → include/asm-arm/arch-ep93xx/vmalloc.h	renamed	+3	−1	View file
include/asm-arm/arch-h720x/irq.h	deleted	+0	−14	View before deletion
include/asm-arm/arch-h720x/param.h	deleted	+0	−10	View before deletion
include/asm-arm/arch-imx/irq.h	deleted	+0	−20	View before deletion
include/asm-arm/arch-imx/param.h	deleted	+0	−19	View before deletion
include/asm-arm/arch-integrator/debug-macro.S	modified	+1	−17	View file
include/asm-arm/arch-integrator/param.h	deleted	+0	−19	View before deletion
include/asm-arm/arch-iop3xx/debug-macro.S	modified	+3	−16	View file
include/asm-arm/arch-ixp2000/debug-macro.S	modified	+2	−15	View file
include/asm-arm/arch-ixp2000/irq.h	deleted	+0	−13	View before deletion
include/asm-arm/arch-ixp2000/ixdp2x00.h	modified	+2	−3	View file
include/asm-arm/arch-ixp2000/ixp2000-regs.h	modified	+2	−2	View file
include/asm-arm/arch-ixp2000/system.h	modified	+1	−1	View file
include/asm-arm/arch-ixp4xx/debug-macro.S	modified	+2	−13	View file
include/asm-arm/arch-ixp4xx/irq.h	deleted	+0	−13	View before deletion
include/asm-arm/arch-ixp4xx/platform.h	modified	+27	−0	View file
include/asm-arm/arch-l7200/param.h	deleted	+0	−19	View before deletion
include/asm-arm/arch-lh7a40x/irq.h	deleted	+0	−11	View before deletion
include/asm-arm/arch-lh7a40x/param.h	deleted	+0	−9	View before deletion
include/asm-arm/arch-omap/param.h	deleted	+0	−8	View before deletion
include/asm-arm/arch-pxa/debug-macro.S	modified	+2	−15	View file
include/asm-arm/arch-pxa/irq.h	deleted	+0	−14	View before deletion
include/asm-arm/arch-pxa/param.h	deleted	+0	−3	View before deletion
include/asm-arm/arch-realview/debug-macro.S	modified	+1	−17	View file
include/asm-arm/arch-realview/param.h	deleted	+0	−19	View before deletion
include/asm-arm/arch-rpc/debug-macro.S	modified	+3	−16	View file
include/asm-arm/arch-rpc/param.h	deleted	+0	−3	View before deletion
include/asm-arm/arch-s3c2410/osiris-cpld.h	added	+25	−0	View file
include/asm-arm/arch-s3c2410/osiris-map.h	added	+41	−0	View file
include/asm-arm/arch-s3c2410/param.h	deleted	+0	−27	View before deletion
include/asm-arm/arch-s3c2410/regs-gpio.h	modified	+2	−0	View file
include/asm-arm/arch-sa1100/debug-macro.S	modified	+1	−0	View file
include/asm-arm/arch-sa1100/param.h	deleted	+0	−3	View before deletion
include/asm-arm/arch-shark/param.h	deleted	+0	−5	View before deletion
include/asm-arm/arch-versatile/debug-macro.S	modified	+1	−17	View file
include/asm-arm/arch-versatile/param.h	deleted	+0	−19	View before deletion
include/asm-arm/delay.h	modified	+7	−5	View file
include/asm-arm/hardware/debug-8250.S	added	+29	−0	View file
include/asm-arm/hardware/debug-pl01x.S	added	+29	−0	View file
include/asm-arm/arch-ixp2000/uengine.h → include/asm-arm/hardware/uengine.h	renamed	+0	−0	View file
include/asm-arm/hardware/vic.h	modified	+1	−1	View file
include/asm-arm/mach/arch.h	modified	+1	−4	View file
include/asm-arm/mach/irq.h	modified	+4	−3	View file
include/asm-arm/param.h	modified	+1	−6	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/Samsung-S3C24XX/Overview.txt

View file

diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt
index 89aa89d..8c6ee68 100644
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
@@ -10,6 +10,8 @@ Introduction
   by the 's3c2410' architecture of ARM Linux. Currently the S3C2410 and
   the S3C2440 are supported CPUs.
 
+  Support for the S3C2400 series is in progress.
+
 
 Configuration
 -------------
@@ -32,6 +34,11 @@ Machines
     A general purpose development board, see EB2410ITX.txt for further
     details
 
+  Simtec Electronics IM2440D20 (Osiris)
+
+    CPU Module from Simtec Electronics, with a S3C2440A CPU, nand flash
+    and a PCMCIA controller.
+
   Samsung SMDK2410
 
     Samsung's own development board, geared for PDA work.
@@ -85,6 +92,26 @@ Adding New Machines
   mailing list information.
 
 
+I2C
+---
+
+  The hardware I2C core in the CPU is supported in single master
+  mode, and can be configured via platform data.
+
+
+RTC
+---
+
+  Support for the onboard RTC unit, including alarm function.
+
+
+Watchdog
+--------
+
+  The onchip watchdog is available via the standard watchdog
+  interface.
+
+
 NAND
 ----
 
@@ -121,6 +148,15 @@ Clock Management
   various clock units
 
 
+Suspend to RAM
+--------------
+
+  For boards that provide support for suspend to RAM, the
+  system can be placed into low power suspend.
+
+  See Suspend.txt for more information.
+
+
 Platform Data
 -------------
 
@@ -158,6 +194,7 @@ Platform Data
 	exported outside arch/arm/mach-s3c2410/, or exported to
 	modules via EXPORT_SYMBOL() and related functions.
 
+
 Port Contributors
 -----------------
 
@@ -188,8 +225,11 @@ Document Changes
   08 Mar 2005 - BJD - Added LCVR to list of people, updated introduction
   08 Mar 2005 - BJD - Added section on adding machines
   09 Sep 2005 - BJD - Added section on platform data
+  11 Feb 2006 - BJD - Added I2C, RTC and Watchdog sections
+  11 Feb 2006 - BJD - Added Osiris machine, and S3C2400 information
+
 
 Document Author
 ---------------
 
-Ben Dooks, (c) 2004-2005 Simtec Electronics
+Ben Dooks, (c) 2004-2005,2006 Simtec Electronics

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 32ba00b..0dd24eb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -108,6 +108,13 @@ config ARCH_EBSA110
 	  Ethernet interface, two PCMCIA sockets, two serial ports and a
 	  parallel port.
 
+config ARCH_EP93XX
+	bool "EP93xx-based"
+	select ARM_AMBA
+	select ARM_VIC
+	help
+	  This enables support for the Cirrus EP93xx series of CPUs.
+
 config ARCH_FOOTBRIDGE
 	bool "FootBridge"
 	select FOOTBRIDGE
@@ -250,6 +257,8 @@ endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
 
+source "arch/arm/mach-ep93xx/Kconfig"
+
 source "arch/arm/mach-footbridge/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
@@ -434,6 +443,13 @@ config NO_IDLE_HZ
 	  Currently at least OMAP, PXA2xx and SA11x0 platforms are known
 	  to have accurate timekeeping with dynamic tick.
 
+config HZ
+	int
+	default 128 if ARCH_L7200
+	default 200 if ARCH_EBSA110 || ARCH_S3C2410
+	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
+	default 100
+
 config AEABI
 	bool "Use the ARM EABI to compile the kernel"
 	help

arch/arm/Makefile

View file

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index fbfc14a..b5b1e40 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -105,6 +105,7 @@ endif
  machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000
  machine-$(CONFIG_ARCH_REALVIEW)   := realview
  machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200
+ machine-$(CONFIG_ARCH_EP93XX)     := ep93xx
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.

arch/arm/common/Makefile

View file

diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index c81a2ff..847e3e6 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -15,3 +15,4 @@ obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o
 obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o
 obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o
 obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o
+obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o

arch/arm/common/dmabounce.c

View file

diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index ad6c89a..7971d0d 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -5,7 +5,7 @@
  *  limited DMA windows. These functions utilize bounce buffers to
  *  copy data to/from buffers located outside the DMA region. This
  *  only works for systems in which DMA memory is at the bottom of
- *  RAM and the remainder of memory is at the top an the DMA memory
+ *  RAM, the remainder of memory is at the top and the DMA memory
  *  can be marked as ZONE_DMA. Anything beyond that such as discontigous
  *  DMA windows will require custom implementations that reserve memory
  *  areas at early bootup.

arch/arm/common/locomo.c

View file

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 2360940..a7dc137 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -60,7 +60,7 @@ struct locomo {
 	unsigned long phys;
 	unsigned int irq;
 	spinlock_t lock;
-	void *base;
+	void __iomem *base;
 };
 
 struct locomo_dev_info {
@@ -162,7 +162,7 @@ static void locomo_handler(unsigned int irq, struct irqdesc *desc,
 {
 	int req, i;
 	struct irqdesc *d;
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 
 	/* Acknowledge the parent IRQ */
 	desc->chip->ack(irq);
@@ -189,7 +189,7 @@ static void locomo_ack_irq(unsigned int irq)
 
 static void locomo_mask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_ICR);
 	r &= ~(0x0010 << (irq - LOCOMO_IRQ_START));
@@ -198,7 +198,7 @@ static void locomo_mask_irq(unsigned int irq)
 
 static void locomo_unmask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_ICR);
 	r |= (0x0010 << (irq - LOCOMO_IRQ_START));
@@ -215,7 +215,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc,
 			    struct pt_regs *regs)
 {
 	struct irqdesc *d;
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 
 	if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {
 		d = irq_desc + LOCOMO_IRQ_KEY_START;
@@ -225,7 +225,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc,
 
 static void locomo_key_ack_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
 	r &= ~(0x0100 << (irq - LOCOMO_IRQ_KEY_START));
@@ -234,7 +234,7 @@ static void locomo_key_ack_irq(unsigned int irq)
 
 static void locomo_key_mask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
 	r &= ~(0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -243,7 +243,7 @@ static void locomo_key_mask_irq(unsigned int irq)
 
 static void locomo_key_unmask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
 	r |= (0x0010 << (irq - LOCOMO_IRQ_KEY_START));
@@ -261,7 +261,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc,
 {
 	int req, i;
 	struct irqdesc *d;
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 
 	req = 	locomo_readl(mapbase + LOCOMO_GIR) &
 		locomo_readl(mapbase + LOCOMO_GPD) &
@@ -280,7 +280,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc,
 
 static void locomo_gpio_ack_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_GWE);
 	r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -297,7 +297,7 @@ static void locomo_gpio_ack_irq(unsigned int irq)
 
 static void locomo_gpio_mask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_GIE);
 	r &= ~(0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -306,7 +306,7 @@ static void locomo_gpio_mask_irq(unsigned int irq)
 
 static void locomo_gpio_unmask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_GIE);
 	r |= (0x0001 << (irq - LOCOMO_IRQ_GPIO_START));
@@ -323,7 +323,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc,
 			   struct pt_regs *regs)
 {
 	struct irqdesc *d;
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 
 	if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {
 		d = irq_desc + LOCOMO_IRQ_LT_START;
@@ -333,7 +333,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc,
 
 static void locomo_lt_ack_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_LTINT);
 	r &= ~(0x0100 << (irq - LOCOMO_IRQ_LT_START));
@@ -342,7 +342,7 @@ static void locomo_lt_ack_irq(unsigned int irq)
 
 static void locomo_lt_mask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_LTINT);
 	r &= ~(0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -351,7 +351,7 @@ static void locomo_lt_mask_irq(unsigned int irq)
 
 static void locomo_lt_unmask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_LTINT);
 	r |= (0x0010 << (irq - LOCOMO_IRQ_LT_START));
@@ -369,7 +369,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,
 {
 	int req, i;
 	struct irqdesc *d;
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 
 	req = locomo_readl(mapbase + LOCOMO_SPIIR) & 0x000F;
 	if (req) {
@@ -386,7 +386,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc,
 
 static void locomo_spi_ack_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_SPIWE);
 	r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -403,7 +403,7 @@ static void locomo_spi_ack_irq(unsigned int irq)
 
 static void locomo_spi_mask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_SPIIE);
 	r &= ~(0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -412,7 +412,7 @@ static void locomo_spi_mask_irq(unsigned int irq)
 
 static void locomo_spi_unmask_irq(unsigned int irq)
 {
-	void *mapbase = get_irq_chipdata(irq);
+	void __iomem *mapbase = get_irq_chipdata(irq);
 	unsigned int r;
 	r = locomo_readl(mapbase + LOCOMO_SPIIE);
 	r |= (0x0001 << (irq - LOCOMO_IRQ_SPI_START));
@@ -428,7 +428,7 @@ static struct irqchip locomo_spi_chip = {
 static void locomo_setup_irq(struct locomo *lchip)
 {
 	int irq;
-	void *irqbase = lchip->base;
+	void __iomem *irqbase = lchip->base;
 
 	/*
 	 * Install handler for IRQ_LOCOMO_HW.
@@ -501,12 +501,11 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
 	struct locomo_dev *dev;
 	int ret;
 
-	dev = kmalloc(sizeof(struct locomo_dev), GFP_KERNEL);
+	dev = kzalloc(sizeof(struct locomo_dev), GFP_KERNEL);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto out;
 	}
-	memset(dev, 0, sizeof(struct locomo_dev));
 
 	strncpy(dev->dev.bus_id,info->name,sizeof(dev->dev.bus_id));
 	/*
@@ -664,12 +663,10 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)
 	unsigned long r;
 	int i, ret = -ENODEV;
 
-	lchip = kmalloc(sizeof(struct locomo), GFP_KERNEL);
+	lchip = kzalloc(sizeof(struct locomo), GFP_KERNEL);
 	if (!lchip)
 		return -ENOMEM;
 
-	memset(lchip, 0, sizeof(struct locomo));
-
 	spin_lock_init(&lchip->lock);
 
 	lchip->dev = me;

arch/arm/common/sa1111.c

View file

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 93352f6..3f68db8 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/dma-mapping.h>
+#include <linux/clk.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -36,10 +37,6 @@
 
 #include <asm/hardware/sa1111.h>
 
-#ifdef CONFIG_ARCH_PXA
-#include <asm/arch/pxa-regs.h>
-#endif
-
 extern void __init sa1110_mb_enable(void);
 
 /*
@@ -51,6 +48,7 @@ extern void __init sa1110_mb_enable(void);
  */
 struct sa1111 {
 	struct device	*dev;
+	struct clk	*clk;
 	unsigned long	phys;
 	int		irq;
 	spinlock_t	lock;
@@ -451,19 +449,7 @@ static void sa1111_wake(struct sa1111 *sachip)
 
 	spin_lock_irqsave(&sachip->lock, flags);
 
-#ifdef CONFIG_ARCH_SA1100
-	/*
-	 * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111:
-	 * (SA-1110 Developer's Manual, section 9.1.2.1)
-	 */
-	GAFR |= GPIO_32_768kHz;
-	GPDR |= GPIO_32_768kHz;
-	TUCR = TUCR_3_6864MHz;
-#elif CONFIG_ARCH_PXA
-	pxa_gpio_mode(GPIO11_3_6MHz_MD);
-#else
-#error missing clock setup
-#endif
+	clk_enable(sachip->clk);
 
 	/*
 	 * Turn VCO on, and disable PLL Bypass.
@@ -555,12 +541,11 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 	struct sa1111_dev *dev;
 	int ret;
 
-	dev = kmalloc(sizeof(struct sa1111_dev), GFP_KERNEL);
+	dev = kzalloc(sizeof(struct sa1111_dev), GFP_KERNEL);
 	if (!dev) {
 		ret = -ENOMEM;
 		goto out;
 	}
-	memset(dev, 0, sizeof(struct sa1111_dev));
 
 	snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
 		 "%4.4lx", info->offset);
@@ -635,11 +620,15 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 	unsigned int has_devs, val;
 	int i, ret = -ENODEV;
 
-	sachip = kmalloc(sizeof(struct sa1111), GFP_KERNEL);
+	sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL);
 	if (!sachip)
 		return -ENOMEM;
 
-	memset(sachip, 0, sizeof(struct sa1111));
+	sachip->clk = clk_get(me, "GPIO27_CLK");
+	if (!sachip->clk) {
+		ret = PTR_ERR(sachip->clk);
+		goto err_free;
+	}
 
 	spin_lock_init(&sachip->lock);
 
@@ -656,7 +645,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 	sachip->base = ioremap(mem->start, PAGE_SIZE * 2);
 	if (!sachip->base) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_clkput;
 	}
 
 	/*
@@ -666,7 +655,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 	if ((id & SKID_ID_MASK) != SKID_SA1111_ID) {
 		printk(KERN_DEBUG "SA1111 not detected: ID = %08lx\n", id);
 		ret = -ENODEV;
-		goto unmap;
+		goto err_unmap;
 	}
 
 	printk(KERN_INFO "SA1111 Microprocessor Companion Chip: "
@@ -726,9 +715,11 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
 
 	return 0;
 
- unmap:
+ err_unmap:
 	iounmap(sachip->base);
- out:
+ err_clkput:
+	clk_put(sachip->clk);
+ err_free:
 	kfree(sachip);
 	return ret;
 }
@@ -751,6 +742,8 @@ static void __sa1111_remove(struct sa1111 *sachip)
 	sa1111_writel(0, irqbase + SA1111_WAKEEN0);
 	sa1111_writel(0, irqbase + SA1111_WAKEEN1);
 
+	clk_disable(sachip->clk);
+
 	if (sachip->irq != NO_IRQ) {
 		set_irq_chained_handler(sachip->irq, NULL);
 		set_irq_data(sachip->irq, NULL);
@@ -759,6 +752,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
 	}
 
 	iounmap(sachip->base);
+	clk_put(sachip->clk);
 	kfree(sachip);
 }
 
@@ -857,6 +851,8 @@ static int sa1111_suspend(struct platform_device *dev, pm_message_t state)
 	sa1111_writel(0, sachip->base + SA1111_SKPWM0);
 	sa1111_writel(0, sachip->base + SA1111_SKPWM1);
 
+	clk_disable(sachip->clk);
+
 	spin_unlock_irqrestore(&sachip->lock, flags);
 
 	return 0;

arch/arm/common/scoop.c

View file

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index a2dfe0b..5e830f4 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -132,12 +132,10 @@ int __init scoop_probe(struct platform_device *pdev)
 	if (!mem)
 		return -EINVAL;
 
-	devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL);
-
+	devptr = kzalloc(sizeof(struct scoop_dev), GFP_KERNEL);
 	if (!devptr)
-		return  -ENOMEM;
+		return -ENOMEM;
 
-	memset(devptr, 0, sizeof(struct scoop_dev));
 	spin_lock_init(&devptr->scoop_lock);
 
 	inf = pdev->dev.platform_data;

arch/arm/common/uengine.c

View file

diff --git a/arch/arm/mach-ixp2000/uengine.c b/arch/arm/common/uengine.c
similarity index 99%
rename from arch/arm/mach-ixp2000/uengine.c
rename to arch/arm/common/uengine.c
index ec4e007..a1310b7 100644
--- a/arch/arm/mach-ixp2000/uengine.c
+++ b/arch/arm/common/uengine.c
@@ -19,7 +19,7 @@
 #include <linux/string.h>
 #include <asm/hardware.h>
 #include <asm/arch/ixp2000-regs.h>
-#include <asm/arch/uengine.h>
+#include <asm/hardware/uengine.h>
 #include <asm/io.h>
 
 #define USTORE_ADDRESS			0x000

arch/arm/common/vic.c

View file

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index a45ed16..a19bc4a 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -22,22 +22,21 @@
 #include <linux/list.h>
 
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/hardware/vic.h>
 
-static void __iomem *vic_base;
-
 static void vic_mask_irq(unsigned int irq)
 {
-	irq -= IRQ_VIC_START;
-	writel(1 << irq, vic_base + VIC_INT_ENABLE_CLEAR);
+	void __iomem *base = get_irq_chipdata(irq);
+	irq &= 31;
+	writel(1 << irq, base + VIC_INT_ENABLE_CLEAR);
 }
 
 static void vic_unmask_irq(unsigned int irq)
 {
-	irq -= IRQ_VIC_START;
-	writel(1 << irq, vic_base + VIC_INT_ENABLE);
+	void __iomem *base = get_irq_chipdata(irq);
+	irq &= 31;
+	writel(1 << irq, base + VIC_INT_ENABLE);
 }
 
 static struct irqchip vic_chip = {
@@ -46,43 +45,49 @@ static struct irqchip vic_chip = {
 	.unmask	= vic_unmask_irq,
 };
 
-void __init vic_init(void __iomem *base, u32 vic_sources)