Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

7cc4e87f · Linus Torvalds <[email protected]> · 2008-10-11 10:09:45 -07:00

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

Commit: 7cc4e87f912bbefa440a51856b8d076e5d1f554a
Parents: 5ba2f67a · 69fc7eed

Merge commit. Changes below are compared with the first parent: 5ba2f67a.

Changes

731 files changed · +24069 −8422

File	Status	Add	Del	Content
Documentation/sound/alsa/soc/dapm.txt	modified	+2	−10	View file
MAINTAINERS	modified	+13	−1	View file
arch/arm/Kconfig	modified	+58	−16	View file
arch/arm/Makefile	modified	+1	−1	View file
arch/arm/boot/compressed/Makefile	modified	+1	−1	View file
arch/arm/boot/compressed/head.S	modified	+2	−1	View file
arch/arm/common/Kconfig	modified	+2	−1	View file
arch/arm/common/dmabounce.c	modified	+84	−203	View file
arch/arm/common/gic.c	modified	+1	−1	View file
arch/arm/common/it8152.c	modified	+3	−11	View file
arch/arm/common/locomo.c	modified	+9	−19	View file
arch/arm/common/sa1111.c	modified	+1	−1	View file
arch/arm/common/scoop.c	modified	+1	−1	View file
arch/arm/common/sharpsl_param.c	modified	+2	−0	View file
arch/arm/common/time-acorn.c	modified	+1	−1	View file
arch/arm/common/uengine.c	modified	+1	−1	View file
arch/arm/common/via82c505.c	modified	+1	−1	View file
arch/arm/common/vic.c	modified	+1	−1	View file
arch/arm/configs/afeb9260_defconfig	added	+1259	−0	View file
arch/arm/configs/at91sam9rlek_defconfig	modified	+1	−0	View file
arch/arm/configs/cm_x300_defconfig	added	+1466	−0	View file
arch/arm/configs/jornada720_defconfig	modified	+612	−445	View file
arch/arm/configs/orion5x_defconfig	modified	+3	−0	View file
arch/arm/configs/palmz72_defconfig	added	+951	−0	View file
arch/arm/configs/viper_defconfig	added	+1678	−0	View file
arch/arm/configs/xm_x270_defconfig → arch/arm/configs/xm_x2xx_defconfig	renamed	+151	−86	View file
arch/arm/include/asm/bug.h	modified	+1	−1	View file
arch/arm/include/asm/cacheflush.h	modified	+0	−90	View file
arch/arm/include/asm/cachetype.h	added	+52	−0	View file
arch/arm/include/asm/cputype.h	added	+64	−0	View file
arch/arm/include/asm/dma-mapping.h	modified	+143	−235	View file
arch/arm/include/asm/elf.h	modified	+34	−38	View file
arch/arm/include/asm/futex.h	modified	+121	−3	View file
arch/arm/include/asm/io.h	modified	+2	−3	View file
arch/arm/include/asm/irq.h	modified	+4	−0	View file
arch/arm/include/asm/kprobes.h	modified	+0	−1	View file
arch/arm/include/asm/mach/map.h	modified	+7	−10	View file
arch/arm/include/asm/mach/udc_pxa2xx.h	modified	+1	−2	View file
arch/arm/include/asm/mc146818rtc.h	modified	+1	−1	View file
arch/arm/include/asm/memory.h	modified	+12	−28	View file
arch/arm/include/asm/mmu_context.h	modified	+1	−0	View file
arch/arm/include/asm/page.h	modified	+3	−2	View file
arch/arm/include/asm/pgtable.h	modified	+54	−34	View file
arch/arm/include/asm/ptrace.h	modified	+1	−6	View file
arch/arm/include/asm/setup.h	modified	+11	−0	View file
arch/arm/include/asm/sparsemem.h	modified	+17	−3	View file
arch/arm/include/asm/system.h	modified	+0	−58	View file
arch/arm/include/asm/thread_info.h	modified	+1	−1	View file
arch/arm/include/asm/uaccess.h	modified	+5	−5	View file
arch/arm/include/asm/vga.h	modified	+1	−1	View file
arch/arm/kernel/Makefile	modified	+1	−1	View file
arch/arm/kernel/armksyms.c	modified	+2	−2	View file
arch/arm/kernel/bios32.c	modified	+1	−1	View file
arch/arm/kernel/crunch.c	modified	+1	−1	View file
arch/arm/kernel/debug.S	modified	+5	−0	View file
arch/arm/kernel/dma-isa.c	modified	+1	−2	View file
arch/arm/kernel/ecard.c	modified	+2	−4	View file
arch/arm/kernel/elf.c	added	+79	−0	View file
arch/arm/kernel/entry-armv.S	modified	+16	−0	View file
arch/arm/kernel/entry-common.S	modified	+23	−2	View file
arch/arm/kernel/fiq.c	modified	+0	−1	View file
arch/arm/kernel/head-common.S	modified	+10	−9	View file
arch/arm/kernel/head-nommu.S	modified	+2	−2	View file
arch/arm/kernel/head.S	modified	+6	−6	View file
arch/arm/kernel/init_task.c	modified	+1	−1	View file
arch/arm/kernel/io.c	modified	+1	−2	View file
arch/arm/kernel/irq.c	modified	+5	−6	View file
arch/arm/kernel/kprobes-decode.c	modified	+2	−2	View file
arch/arm/kernel/kprobes.c	modified	+4	−1	View file
arch/arm/kernel/machine_kexec.c	modified	+1	−1	View file
arch/arm/kernel/module.c	modified	+1	−1	View file
arch/arm/kernel/process.c	modified	+2	−31	View file
arch/arm/kernel/ptrace.c	modified	+4	−6	View file
arch/arm/kernel/setup.c	modified	+58	−221	View file
arch/arm/kernel/signal.c	modified	+1	−1	View file
arch/arm/kernel/sys_arm.c	modified	+1	−2	View file
arch/arm/kernel/sys_oabi-compat.c	modified	+1	−1	View file
arch/arm/kernel/time.c	modified	+1	−1	View file
arch/arm/kernel/traps.c	modified	+3	−15	View file
arch/arm/kernel/xscale-cp0.c	modified	+1	−1	View file
arch/arm/lib/ashldi3.S	modified	+2	−0	View file
arch/arm/lib/ashrdi3.S	modified	+2	−0	View file
arch/arm/lib/backtrace.S	modified	+4	−0	View file
arch/arm/lib/changebit.S	modified	+2	−0	View file
arch/arm/lib/clear_user.S	modified	+2	−1	View file
arch/arm/lib/clearbit.S	modified	+2	−0	View file
arch/arm/lib/copy_from_user.S	modified	+2	−0	View file
arch/arm/lib/copy_page.S	modified	+1	−0	View file
arch/arm/lib/copy_to_user.S	modified	+2	−0	View file
arch/arm/lib/csumipv6.S	modified	+1	−0	View file
arch/arm/lib/csumpartial.S	modified	+1	−0	View file
arch/arm/lib/csumpartialcopy.S	modified	+3	−4	View file
arch/arm/lib/csumpartialcopygeneric.S	modified	+1	−0	View file
arch/arm/lib/csumpartialcopyuser.S	modified	+3	−4	View file
arch/arm/lib/delay.S	modified	+3	−0	View file
arch/arm/lib/div64.S	modified	+1	−0	View file
arch/arm/lib/findbit.S	modified	+8	−0	View file
arch/arm/lib/getuser.S	modified	+8	−6	View file
arch/arm/lib/io-readsb.S	modified	+1	−0	View file
arch/arm/lib/io-readsl.S	modified	+1	−0	View file
arch/arm/lib/io-readsw-armv4.S	modified	+1	−0	View file
arch/arm/lib/io-writesb.S	modified	+1	−0	View file
arch/arm/lib/io-writesl.S	modified	+1	−0	View file
arch/arm/lib/io-writesw-armv4.S	modified	+1	−0	View file
arch/arm/lib/lib1funcs.S	modified	+11	−0	View file
arch/arm/lib/lshrdi3.S	modified	+2	−0	View file
arch/arm/lib/memchr.S	modified	+1	−0	View file
arch/arm/lib/memcpy.S	modified	+1	−0	View file
arch/arm/lib/memmove.S	modified	+1	−0	View file
arch/arm/lib/memset.S	modified	+1	−0	View file
arch/arm/lib/memzero.S	modified	+1	−0	View file
arch/arm/lib/muldi3.S	modified	+2	−0	View file
arch/arm/lib/putuser.S	modified	+10	−8	View file
arch/arm/lib/setbit.S	modified	+2	−0	View file
arch/arm/lib/sha1.S	modified	+3	−0	View file
arch/arm/lib/strchr.S	modified	+1	−0	View file
arch/arm/lib/strncpy_from_user.S	modified	+1	−0	View file
arch/arm/lib/strnlen_user.S	modified	+1	−0	View file
arch/arm/lib/strrchr.S	modified	+1	−0	View file
arch/arm/lib/testchangebit.S	modified	+2	−0	View file
arch/arm/lib/testclearbit.S	modified	+2	−0	View file
arch/arm/lib/testsetbit.S	modified	+2	−0	View file
arch/arm/lib/uaccess.S	modified	+2	−0	View file
arch/arm/lib/ucmpdi2.S	modified	+4	−0	View file
arch/arm/mach-at91/Kconfig	modified	+22	−0	View file
arch/arm/mach-at91/Makefile	modified	+2	−0	View file
arch/arm/mach-at91/at91cap9.c	modified	+3	−3	View file
arch/arm/mach-at91/at91cap9_devices.c	modified	+54	−0	View file
arch/arm/mach-at91/at91sam9263.c	modified	+3	−3	View file
arch/arm/mach-at91/at91sam9263_devices.c	modified	+53	−0	View file
arch/arm/mach-at91/at91sam9rl.c	modified	+3	−3	View file
arch/arm/mach-at91/at91sam9rl_devices.c	modified	+98	−0	View file
arch/arm/mach-at91/at91x40_time.c	modified	+1	−1	View file
arch/arm/mach-at91/board-afeb-9260v1.c	added	+210	−0	View file
arch/arm/mach-at91/board-cap9adk.c	modified	+1	−1	View file
arch/arm/mach-at91/board-carmeva.c	modified	+27	−1	View file
arch/arm/mach-at91/board-csb337.c	modified	+6	−6	View file
arch/arm/mach-at91/board-csb637.c	modified	+2	−2	View file
arch/arm/mach-at91/board-dk.c	modified	+2	−2	View file
arch/arm/mach-at91/board-ecbat91.c	modified	+1	−1	View file
arch/arm/mach-at91/board-ek.c	modified	+2	−2	View file
arch/arm/mach-at91/board-picotux200.c	modified	+1	−1	View file
arch/arm/mach-at91/board-qil-a9260.c	modified	+7	−7	View file
arch/arm/mach-at91/board-sam9-l9260.c	modified	+2	−2	View file
arch/arm/mach-at91/board-sam9260ek.c	modified	+76	−4	View file
arch/arm/mach-at91/board-sam9261ek.c	modified	+11	−7	View file
arch/arm/mach-at91/board-sam9263ek.c	modified	+46	−18	View file
arch/arm/mach-at91/board-sam9g20ek.c	modified	+4	−4	View file
arch/arm/mach-at91/board-sam9rlek.c	modified	+5	−3	View file
arch/arm/mach-at91/board-usb-a9260.c	modified	+7	−7	View file
arch/arm/mach-at91/board-usb-a9263.c	modified	+7	−7	View file
arch/arm/mach-at91/board-yl-9200.c	modified	+25	−25	View file
arch/arm/mach-at91/clock.c	modified	+1	−2	View file
arch/arm/mach-at91/gpio.c	modified	+2	−3	View file
arch/arm/mach-at91/include/mach/at91_pit.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/at91_rstc.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/at91_rtt.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/at91_shdwc.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/at91_wdt.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h	modified	+2	−0	View file
arch/arm/mach-at91/include/mach/at91sam9260_matrix.h	modified	+2	−0	View file
arch/arm/mach-at91/include/mach/at91sam9261_matrix.h	modified	+2	−0	View file
arch/arm/mach-at91/include/mach/at91sam9_sdramc.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/at91sam9_smc.h	modified	+3	−0	View file
arch/arm/mach-at91/include/mach/board.h	modified	+14	−0	View file
arch/arm/mach-at91/include/mach/irqs.h	modified	+1	−1	View file
arch/arm/mach-at91/include/mach/uncompress.h	modified	+1	−1	View file
arch/arm/mach-at91/leds.c	modified	+41	−4	View file
arch/arm/mach-at91/pm.c	modified	+1	−1	View file
arch/arm/mach-at91/pm_slowclock.S	added	+283	−0	View file
arch/arm/mach-clps711x/autcpu12.c	modified	+1	−1	View file
arch/arm/mach-clps711x/cdb89712.c	modified	+1	−1	View file
arch/arm/mach-clps711x/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-clps711x/irq.c	modified	+1	−1	View file
arch/arm/mach-clps711x/p720t-leds.c	modified	+1	−1	View file
arch/arm/mach-clps711x/p720t.c	modified	+1	−1	View file
arch/arm/mach-clps711x/time.c	modified	+1	−1	View file
arch/arm/mach-clps7500/core.c	modified	+1	−1	View file
arch/arm/mach-clps7500/include/mach/irq.h	modified	+1	−1	View file
arch/arm/mach-clps7500/include/mach/memory.h	modified	+8	−0	View file
arch/arm/mach-clps7500/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-davinci/Makefile	modified	+1	−1	View file
arch/arm/mach-davinci/board-evm.c	modified	+324	−17	View file
arch/arm/mach-davinci/clock.c	modified	+1	−1	View file
arch/arm/mach-davinci/devices.c	added	+48	−0	View file
arch/arm/mach-davinci/gpio.c	modified	+72	−66	View file
arch/arm/mach-davinci/id.c	modified	+1	−2	View file
arch/arm/mach-davinci/include/mach/common.h	modified	+3	−0	View file
arch/arm/mach-davinci/include/mach/gpio.h	modified	+34	−39	View file
arch/arm/mach-davinci/include/mach/i2c.h	modified	+5	−2	View file
arch/arm/mach-davinci/include/mach/io.h	modified	+13	−30	View file
arch/arm/mach-davinci/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-davinci/io.c	modified	+1	−1	View file
arch/arm/mach-davinci/irq.c	modified	+1	−1	View file
arch/arm/mach-davinci/psc.c	modified	+1	−1	View file
arch/arm/mach-davinci/serial.c	modified	+1	−1	View file
arch/arm/mach-davinci/time.c	modified	+1	−1	View file
arch/arm/mach-davinci/usb.c	added	+116	−0	View file
arch/arm/mach-ebsa110/core.c	modified	+1	−1	View file
arch/arm/mach-ebsa110/io.c	modified	+1	−1	View file
arch/arm/mach-ep93xx/Kconfig	modified	+14	−0	View file
arch/arm/mach-ep93xx/adssphere.c	modified	+2	−26	View file
arch/arm/mach-ep93xx/clock.c	modified	+1	−1	View file
arch/arm/mach-ep93xx/core.c	modified	+40	−6	View file
arch/arm/mach-ep93xx/edb9302.c	modified	+7	−1	View file
arch/arm/mach-ep93xx/edb9302a.c	modified	+2	−26	View file
arch/arm/mach-ep93xx/edb9307.c	modified	+2	−26	View file
arch/arm/mach-ep93xx/edb9312.c	modified	+7	−1	View file
arch/arm/mach-ep93xx/edb9315.c	modified	+7	−1	View file
arch/arm/mach-ep93xx/edb9315a.c	modified	+2	−26	View file
arch/arm/mach-ep93xx/gesbc9312.c	modified	+4	−25	View file
arch/arm/mach-ep93xx/gpio.c	modified	+3	−3	View file
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h	modified	+34	−0	View file
arch/arm/mach-ep93xx/include/mach/platform.h	modified	+6	−6	View file
arch/arm/mach-ep93xx/include/mach/ts72xx.h	modified	+1	−1	View file
arch/arm/mach-ep93xx/include/mach/uncompress.h	modified	+15	−6	View file
arch/arm/mach-ep93xx/micro9.c	modified	+2	−32	View file
arch/arm/mach-ep93xx/ts72xx.c	modified	+2	−26	View file
arch/arm/mach-footbridge/cats-hw.c	modified	+1	−1	View file
arch/arm/mach-footbridge/common.c	modified	+1	−1	View file
arch/arm/mach-footbridge/dc21285.c	modified	+1	−1	View file
arch/arm/mach-footbridge/dma.c	modified	+1	−1	View file
arch/arm/mach-footbridge/include/mach/memory.h	modified	+0	−10	View file
arch/arm/mach-footbridge/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-footbridge/isa-irq.c	modified	+2	−3	View file
arch/arm/mach-footbridge/isa-timer.c	modified	+1	−1	View file
arch/arm/mach-footbridge/netwinder-hw.c	modified	+1	−1	View file
arch/arm/mach-footbridge/time.c	modified	+1	−1	View file
arch/arm/mach-h720x/common.c	modified	+2	−4	View file
arch/arm/mach-h720x/cpu-h7202.c	modified	+1	−3	View file
arch/arm/mach-imx/clock.c	modified	+1	−1	View file
arch/arm/mach-imx/include/mach/irqs.h	modified	+5	−0	View file
arch/arm/mach-imx/irq.c	modified	+30	−8	View file
arch/arm/mach-imx/leds-mx1ads.c	modified	+1	−1	View file
arch/arm/mach-imx/time.c	modified	+1	−1	View file
arch/arm/mach-integrator/core.c	modified	+1	−1	View file
arch/arm/mach-integrator/cpu.c	modified	+1	−1	View file
arch/arm/mach-integrator/impd1.c	modified	+1	−1	View file
arch/arm/mach-integrator/integrator_ap.c	modified	+1	−1	View file
arch/arm/mach-integrator/integrator_cp.c	modified	+2	−3	View file
arch/arm/mach-integrator/leds.c	modified	+1	−1	View file
arch/arm/mach-integrator/pci_v3.c	modified	+1	−1	View file
arch/arm/mach-iop13xx/include/mach/memory.h	modified	+39	−22	View file
arch/arm/mach-iop13xx/include/mach/pci.h	modified	+1	−1	View file
arch/arm/mach-iop13xx/io.c	modified	+1	−1	View file
arch/arm/mach-iop13xx/msi.c	modified	+1	−2	View file
arch/arm/mach-iop13xx/setup.c	modified	+1	−1	View file
arch/arm/mach-iop13xx/tpmi.c	modified	+1	−1	View file
arch/arm/mach-iop32x/glantank.c	modified	+1	−1	View file
arch/arm/mach-iop32x/iq31244.c	modified	+3	−3	View file
arch/arm/mach-iop32x/iq80321.c	modified	+1	−1	View file
arch/arm/mach-iop32x/n2100.c	modified	+1	−1	View file
arch/arm/mach-iop33x/iq80331.c	modified	+1	−1	View file
arch/arm/mach-iop33x/iq80332.c	modified	+1	−1	View file
arch/arm/mach-iop33x/uart.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/core.c	modified	+12	−21	View file
arch/arm/mach-ixp2000/enp2611.c	modified	+4	−4	View file
arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h	modified	+1	−7	View file
arch/arm/mach-ixp2000/ixdp2400.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/ixdp2800.c	modified	+1	−1	View file
arch/arm/mach-ixp2000/ixdp2x00.c	modified	+2	−4	View file
arch/arm/mach-ixp2000/ixdp2x01.c	modified	+2	−4	View file
arch/arm/mach-ixp2000/pci.c	modified	+1	−1	View file
arch/arm/mach-ixp23xx/core.c	modified	+1	−3	View file
arch/arm/mach-ixp23xx/ixdp2351.c	modified	+2	−6	View file
arch/arm/mach-ixp23xx/pci.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/common-pci.c	modified	+4	−5	View file
arch/arm/mach-ixp4xx/common.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/fsg-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/include/mach/cpu.h	modified	+5	−4	View file
arch/arm/mach-ixp4xx/ixdp425-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/nas100d-setup.c	modified	+1	−1	View file
arch/arm/mach-ixp4xx/nslu2-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/addr-map.c	modified	+8	−0	View file
arch/arm/mach-kirkwood/common.c	modified	+65	−19	View file
arch/arm/mach-kirkwood/common.h	modified	+3	−4	View file
arch/arm/mach-kirkwood/db88f6281-bp-setup.c	modified	+0	−1	View file
arch/arm/mach-kirkwood/include/mach/irqs.h	modified	+1	−0	View file
arch/arm/mach-kirkwood/include/mach/kirkwood.h	modified	+14	−0	View file
arch/arm/mach-kirkwood/include/mach/timex.h	modified	+0	−1	View file
arch/arm/mach-kirkwood/pcie.c	modified	+6	−0	View file
arch/arm/mach-kirkwood/rd88f6281-setup.c	modified	+0	−1	View file
arch/arm/mach-ks8695/cpu.c	modified	+1	−1	View file
arch/arm/mach-ks8695/gpio.c	modified	+11	−11	View file
arch/arm/mach-ks8695/include/mach/memory.h	modified	+2	−2	View file
arch/arm/mach-ks8695/include/mach/regs-gpio.h	modified	+2	−2	View file
arch/arm/mach-ks8695/include/mach/regs-lan.h	modified	+2	−2	View file
arch/arm/mach-ks8695/include/mach/regs-wan.h	modified	+2	−2	View file
arch/arm/mach-ks8695/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-ks8695/include/mach/uncompress.h	modified	+1	−1	View file
arch/arm/mach-ks8695/irq.c	modified	+1	−1	View file
arch/arm/mach-ks8695/pci.c	modified	+2	−2	View file
arch/arm/mach-ks8695/time.c	modified	+1	−1	View file
arch/arm/mach-lh7a40x/Kconfig	modified	+6	−7	View file
arch/arm/mach-lh7a40x/arch-kev7a400.c	modified	+1	−1	View file
arch/arm/mach-lh7a40x/arch-lpd7a40x.c	modified	+2	−2	View file
arch/arm/mach-lh7a40x/common.h	modified	+0	−1	View file
arch/arm/mach-lh7a40x/include/mach/memory.h	modified	+6	−0	View file
arch/arm/mach-lh7a40x/irq-lpd7a40x.c	modified	+2	−2	View file
arch/arm/mach-lh7a40x/ssp-cpld.c	modified	+1	−1	View file
arch/arm/mach-lh7a40x/time.c	modified	+1	−1	View file
arch/arm/mach-loki/addr-map.c	modified	+1	−1	View file
arch/arm/mach-loki/irq.c	modified	+1	−1	View file
arch/arm/mach-msm/board-halibut.c	modified	+2	−3	View file
arch/arm/mach-msm/common.c	modified	+1	−1	View file
arch/arm/mach-msm/dma.c	modified	+1	−1	View file
arch/arm/mach-msm/io.c	modified	+1	−1	View file
arch/arm/mach-msm/irq.c	modified	+2	−3	View file
arch/arm/mach-msm/timer.c	modified	+1	−2	View file
arch/arm/mach-mv78xx0/addr-map.c	modified	+1	−1	View file
arch/arm/mach-mv78xx0/common.c	modified	+6	−1	View file
arch/arm/mach-mv78xx0/include/mach/entry-macro.S	modified	+13	−5	View file
arch/arm/mach-mv78xx0/include/mach/irqs.h	modified	+6	−1	View file
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h	modified	+2	−0	View file
arch/arm/mach-mv78xx0/irq.c	modified	+1	−0	View file
arch/arm/mach-mx2/devices.h	added	+15	−0	View file
arch/arm/mach-mx2/mx27ads.c	modified	+8	−4	View file
arch/arm/mach-mx2/pcm038.c	modified	+5	−3	View file
arch/arm/mach-mx2/serial.c	modified	+6	−45	View file
arch/arm/mach-mx3/devices.c	modified	+5	−38	View file
arch/arm/mach-mx3/devices.h	added	+6	−0	View file
arch/arm/mach-mx3/iomux.c	modified	+4	−2	View file
arch/arm/mach-mx3/mm.c	modified	+1	−1	View file
arch/arm/mach-mx3/mx31ads.c	modified	+116	−4	View file
arch/arm/mach-mx3/mx31lite.c	modified	+3	−3	View file
arch/arm/mach-mx3/pcm037.c	modified	+4	−2	View file
arch/arm/mach-netx/generic.c	modified	+2	−5	View file
arch/arm/mach-netx/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-netx/pfifo.c	modified	+1	−1	View file
arch/arm/mach-netx/time.c	modified	+1	−1	View file
arch/arm/mach-netx/xc.c	modified	+1	−1	View file
arch/arm/mach-ns9xxx/board-a9m9750dev.c	modified	+1	−4	View file
arch/arm/mach-ns9xxx/gpio.c	modified	+1	−1	View file
arch/arm/mach-ns9xxx/include/mach/uncompress.h	modified	+1	−1	View file
arch/arm/mach-ns9xxx/irq.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-voiceblue.c	modified	+1	−0	View file
arch/arm/mach-omap1/clock.c	modified	+1	−1	View file
arch/arm/mach-omap1/devices.c	modified	+1	−1	View file
arch/arm/mach-omap1/fpga.c	modified	+2	−4	View file
arch/arm/mach-omap1/id.c	modified	+1	−2	View file
arch/arm/mach-omap1/io.c	modified	+1	−1	View file
arch/arm/mach-omap1/irq.c	modified	+1	−2	View file
arch/arm/mach-omap1/leds-h2p2-debug.c	modified	+1	−1	View file
arch/arm/mach-omap1/mailbox.c	modified	+1	−1	View file
arch/arm/mach-omap1/mux.c	modified	+3	−2	View file
arch/arm/mach-omap1/pm.c	modified	+1	−1	View file
arch/arm/mach-omap1/serial.c	modified	+1	−1	View file
arch/arm/mach-omap1/time.c	modified	+1	−1	View file
arch/arm/mach-omap1/timer32k.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-2430sdp.c	modified	+1	−2	View file
arch/arm/mach-omap2/board-h4.c	modified	+1	−2	View file
arch/arm/mach-omap2/clock.c	modified	+2	−3	View file
arch/arm/mach-omap2/clock24xx.c	modified	+1	−2	View file
arch/arm/mach-omap2/clock34xx.c	modified	+1	−1	View file
arch/arm/mach-omap2/devices.c	modified	+1	−1	View file
arch/arm/mach-omap2/gpmc.c	modified	+1	−1	View file
arch/arm/mach-omap2/id.c	modified	+2	−1	View file
arch/arm/mach-omap2/io.c	modified	+1	−1	View file
arch/arm/mach-omap2/irq.c	modified	+1	−1	View file
arch/arm/mach-omap2/mailbox.c	modified	+1	−1	View file
arch/arm/mach-omap2/memory.c	modified	+1	−2	View file
arch/arm/mach-omap2/mux.c	modified	+3	−2	View file
arch/arm/mach-omap2/pm.c	modified	+1	−1	View file
arch/arm/mach-omap2/serial.c	modified	+1	−2	View file
arch/arm/mach-orion5x/Kconfig	modified	+26	−0	View file
arch/arm/mach-orion5x/Makefile	modified	+4	−0	View file
arch/arm/mach-orion5x/addr-map.c	modified	+1	−1	View file
arch/arm/mach-orion5x/common.c	modified	+68	−6	View file
arch/arm/mach-orion5x/common.h	modified	+2	−0	View file
arch/arm/mach-orion5x/edmini_v2-setup.c	added	+262	−0	View file
arch/arm/mach-orion5x/gpio.c	modified	+1	−1	View file
arch/arm/mach-orion5x/include/mach/orion5x.h	modified	+5	−1	View file
arch/arm/mach-orion5x/include/mach/timex.h	modified	+0	−2	View file
arch/arm/mach-orion5x/irq.c	modified	+2	−2	View file
arch/arm/mach-orion5x/kurobox_pro-setup.c	modified	+1	−1	View file
arch/arm/mach-orion5x/lsmini-setup.c	added	+279	−0	View file
arch/arm/mach-orion5x/mpp.c	modified	+1	−1	View file
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c	added	+117	−0	View file
arch/arm/mach-orion5x/terastation_pro2-setup.c	added	+369	−0	View file
arch/arm/mach-orion5x/tsx09-common.c	modified	+2	−1	View file
arch/arm/mach-pnx4008/clock.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/core.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/dma.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/gpio.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-pnx4008/include/mach/timex.h	modified	+1	−1	View file
arch/arm/mach-pnx4008/irq.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/pm.c	modified	+1	−1	View file
arch/arm/mach-pnx4008/serial.c	modified	+1	−2	View file
arch/arm/mach-pnx4008/time.c	modified	+1	−1	View file
arch/arm/mach-pxa/Kconfig	modified	+91	−3	View file
arch/arm/mach-pxa/Makefile	modified	+24	−13	View file
arch/arm/mach-pxa/akita-ioexp.c	deleted	+0	−222	View before deletion
arch/arm/mach-pxa/am200epd.c	added	+374	−0	View file
arch/arm/mach-pxa/cm-x255.c	added	+258	−0	View file
arch/arm/mach-pxa/cm-x270-pci.h	deleted	+0	−13	View before deletion
arch/arm/mach-pxa/cm-x270.c	modified	+4	−468	View file
arch/arm/mach-pxa/cm-x270-pci.c → arch/arm/mach-pxa/cm-x2xx-pci.c	renamed	+30	−26	View file
arch/arm/mach-pxa/cm-x2xx-pci.h	added	+13	−0	View file
arch/arm/mach-pxa/cm-x2xx.c	added	+531	−0	View file
arch/arm/mach-pxa/cm-x300.c	added	+465	−0	View file
arch/arm/mach-pxa/colibri.c	modified	+7	−4	View file
arch/arm/mach-pxa/corgi.c	modified	+263	−215	View file
arch/arm/mach-pxa/corgi_lcd.c	deleted	+0	−290	View before deletion
arch/arm/mach-pxa/corgi_pm.c	modified	+0	−1	View file
arch/arm/mach-pxa/corgi_ssp.c	deleted	+0	−276	View before deletion
arch/arm/mach-pxa/cpu-pxa.c → arch/arm/mach-pxa/cpufreq-pxa2xx.c	renamed	+1	−1	View file
arch/arm/mach-pxa/cpufreq-pxa3xx.c	added	+258	−0	View file
arch/arm/mach-pxa/devices.h	modified	+1	−0	View file
arch/arm/mach-pxa/e330.c	added	+43	−0	View file
arch/arm/mach-pxa/e350.c	added	+43	−0	View file
arch/arm/mach-pxa/e400_lcd.c → arch/arm/mach-pxa/e400.c	renamed	+54	−16	View file
arch/arm/mach-pxa/e740_lcd.c → arch/arm/mach-pxa/e740.c	renamed	+83	−37	View file
arch/arm/mach-pxa/e750_lcd.c → arch/arm/mach-pxa/e750.c	renamed	+42	−25	View file
arch/arm/mach-pxa/e800_lcd.c → arch/arm/mach-pxa/e800.c	renamed	+53	−26	View file
arch/arm/mach-pxa/em-x270.c	modified	+1	−4	View file
arch/arm/mach-pxa/eseries.c	modified	+8	−149	View file
arch/arm/mach-pxa/eseries.h	added	+4	−0	View file
arch/arm/mach-pxa/eseries_udc.c	deleted	+0	−57	View before deletion
arch/arm/mach-pxa/generic.c	modified	+2	−7	View file
arch/arm/mach-pxa/generic.h	modified	+1	−0	View file
arch/arm/mach-pxa/gpio.c	modified	+2	−2	View file
arch/arm/mach-pxa/gumstix.c	modified	+83	−17	View file
arch/arm/mach-pxa/idp.c	modified	+47	−31	View file
arch/arm/mach-pxa/include/mach/akita.h	deleted	+0	−32	View before deletion
arch/arm/mach-pxa/include/mach/corgi.h	modified	+10	−1	View file
arch/arm/mach-pxa/include/mach/entry-macro.S	modified	+2	−2	View file
arch/arm/mach-pxa/include/mach/hardware.h	modified	+68	−13	View file
arch/arm/mach-pxa/include/mach/i2c.h	modified	+7	−2	View file
arch/arm/mach-pxa/include/mach/irqs.h	modified	+10	−9	View file
arch/arm/mach-pxa/include/mach/littleton.h	modified	+2	−0	View file
arch/arm/mach-pxa/include/mach/memory.h	modified	+2	−2	View file
arch/arm/mach-pxa/include/mach/mfp-pxa25x.h	modified	+2	−2	View file
arch/arm/mach-pxa/include/mach/mfp-pxa320.h	modified	+4	−4	View file
arch/arm/mach-pxa/include/mach/mfp.h	modified	+3	−2	View file
arch/arm/mach-pxa/include/mach/mioa701.h	added	+67	−0	View file
arch/arm/mach-pxa/include/mach/ohci.h	modified	+16	−0	View file
arch/arm/mach-pxa/include/mach/palmz72.h	added	+80	−0	View file
arch/arm/mach-pxa/include/mach/pm.h	modified	+2	−0	View file
arch/arm/mach-pxa/include/mach/poodle.h	modified	+9	−0	View file
arch/arm/mach-pxa/include/mach/pxa-regs.h	modified	+9	−311	View file
arch/arm/mach-pxa/include/mach/pxa3xx-regs.h	modified	+22	−0	View file
arch/arm/mach-pxa/include/mach/reset.h	modified	+6	−3	View file
arch/arm/mach-pxa/include/mach/spitz.h	modified	+37	−5	View file
arch/arm/mach-pxa/include/mach/ssp.h	modified	+24	−0	View file
arch/arm/mach-pxa/include/mach/trizeps4.h	modified	+70	−14	View file
arch/arm/mach-pxa/include/mach/viper.h	added	+96	−0	View file
arch/arm/mach-pxa/irq.c	modified	+1	−1	View file
arch/arm/mach-pxa/leds-trizeps4.c	deleted	+0	−134	View before deletion
arch/arm/mach-pxa/leds.c	modified	+0	−2	View file
arch/arm/mach-pxa/littleton.c	modified	+49	−156	View file
arch/arm/mach-pxa/lpd270.c	modified	+54	−45	View file
arch/arm/mach-pxa/lubbock.c	modified	+24	−2	View file
arch/arm/mach-pxa/magician.c	modified	+4	−12	View file
arch/arm/mach-pxa/mainstone.c	modified	+2	−13	View file
arch/arm/mach-pxa/mfp-pxa2xx.c	modified	+152	−73	View file
arch/arm/mach-pxa/mioa701.c	added	+905	−0	View file
arch/arm/mach-pxa/mioa701_bootresume.S	added	+36	−0	View file
arch/arm/mach-pxa/mp900.c	added	+100	−0	View file
arch/arm/mach-pxa/palmtx.c	modified	+20	−0	View file
arch/arm/mach-pxa/palmz72.c	added	+554	−0	View file
arch/arm/mach-pxa/pcm027.c	modified	+25	−7	View file
arch/arm/mach-pxa/pcm990-baseboard.c	modified	+3	−30	View file
arch/arm/mach-pxa/pm.c	modified	+18	−0	View file
arch/arm/mach-pxa/poodle.c	modified	+204	−149	View file
arch/arm/mach-pxa/pxa25x.c	modified	+29	−37	View file
arch/arm/mach-pxa/pxa27x.c	modified	+29	−37	View file
arch/arm/mach-pxa/pxa3xx.c	modified	+45	−0	View file
arch/arm/mach-pxa/reset.c	modified	+7	−4	View file
arch/arm/mach-pxa/sharpsl_pm.c	modified	+6	−10	View file
arch/arm/mach-pxa/spitz.c	modified	+280	−257	View file
arch/arm/mach-pxa/spitz_pm.c	modified	+9	−19	View file
arch/arm/mach-pxa/ssp.c	modified	+1	−1	View file
arch/arm/mach-pxa/time.c	modified	+1	−1	View file
arch/arm/mach-pxa/tosa.c	modified	+1	−1	View file
arch/arm/mach-pxa/trizeps4.c	modified	+317	−234	View file
arch/arm/mach-pxa/viper.c	added	+951	−0	View file
arch/arm/mach-pxa/zylonite.c	modified	+17	−0	View file
arch/arm/mach-pxa/zylonite_pxa300.c	modified	+11	−1	View file
arch/arm/mach-pxa/zylonite_pxa320.c	modified	+10	−0	View file
arch/arm/mach-realview/core.c	modified	+1	−1	View file
arch/arm/mach-realview/core.h	modified	+1	−1	View file
arch/arm/mach-realview/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-realview/localtimer.c	modified	+1	−1	View file
arch/arm/mach-realview/platsmp.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_eb.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_pb1176.c	modified	+1	−1	View file
arch/arm/mach-realview/realview_pb11mp.c	modified	+1	−1	View file
arch/arm/mach-rpc/dma.c	modified	+1	−1	View file
arch/arm/mach-rpc/include/mach/memory.h	modified	+8	−0	View file
arch/arm/mach-rpc/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-rpc/include/mach/uncompress.h	modified	+1	−1	View file
arch/arm/mach-rpc/irq.c	modified	+1	−1	View file
arch/arm/mach-rpc/riscpc.c	modified	+1	−1	View file
arch/arm/mach-s3c2400/gpio.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/bast-irq.c	modified	+2	−3	View file
arch/arm/mach-s3c2410/clock.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/gpio.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/include/mach/system-reset.h	modified	+1	−1	View file
arch/arm/mach-s3c2410/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-amlm5900.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-bast.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-h1940.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-n30.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-otom.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-qt2410.c	modified	+1	−2	View file
arch/arm/mach-s3c2410/mach-smdk2410.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-tct_hammer.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/mach-vr1000.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/pm.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/s3c2410.c	modified	+1	−1	View file
arch/arm/mach-s3c2410/usb-simtec.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/clock.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/dma.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/irq.c	modified	+3	−3	View file
arch/arm/mach-s3c2412/mach-smdk2413.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/mach-vstms.c	modified	+1	−2	View file
arch/arm/mach-s3c2412/pm.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/s3c2412.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/clock.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/dsc.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/irq.c	modified	+3	−6	View file
arch/arm/mach-s3c2440/mach-anubis.c	modified	+1	−2	View file
arch/arm/mach-s3c2440/mach-nexcoder.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-osiris.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/mach-rx3715.c	modified	+1	−2	View file
arch/arm/mach-s3c2440/mach-smdk2440.c	modified	+1	−1	View file
arch/arm/mach-s3c2440/s3c2440.c	modified	+1	−1	View file
arch/arm/mach-s3c2442/clock.c	modified	+1	−1	View file
arch/arm/mach-s3c2443/clock.c	modified	+1	−1	View file
arch/arm/mach-s3c2443/dma.c	modified	+1	−1	View file
arch/arm/mach-s3c2443/irq.c	modified	+2	−5	View file
arch/arm/mach-s3c2443/mach-smdk2443.c	modified	+1	−1	View file
arch/arm/mach-s3c2443/s3c2443.c	modified	+1	−1	View file
arch/arm/mach-sa1100/badge4.c	modified	+22	−22	View file
arch/arm/mach-sa1100/cpu-sa1100.c	modified	+3	−1	View file
arch/arm/mach-sa1100/cpu-sa1110.c	modified	+2	−1	View file
arch/arm/mach-sa1100/generic.c	modified	+7	−7	View file
arch/arm/mach-sa1100/include/mach/SA-1100.h	modified	+0	−16	View file
arch/arm/mach-sa1100/include/mach/hardware.h	modified	+18	−0	View file
arch/arm/mach-sa1100/include/mach/memory.h	modified	+7	−9	View file
arch/arm/mach-sa1100/irq.c	modified	+1	−3	View file
arch/arm/mach-sa1100/neponset.c	modified	+3	−8	View file
arch/arm/mach-sa1100/pleb.c	modified	+6	−7	View file
arch/arm/mach-sa1100/simpad.c	modified	+1	−1	View file
arch/arm/mach-sa1100/ssp.c	modified	+1	−1	View file
arch/arm/mach-shark/core.c	modified	+1	−1	View file
arch/arm/mach-shark/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-shark/irq.c	modified	+1	−1	View file
arch/arm/mach-shark/leds.c	modified	+1	−1	View file
arch/arm/mach-versatile/core.c	modified	+2	−3	View file
arch/arm/mach-versatile/include/mach/system.h	modified	+1	−1	View file
arch/arm/mach-versatile/pci.c	modified	+1	−1	View file
arch/arm/mach-versatile/versatile_ab.c	modified	+1	−1	View file
arch/arm/mach-versatile/versatile_pb.c	modified	+1	−1	View file
arch/arm/mm/Kconfig	modified	+8	−0	View file
arch/arm/mm/Makefile	modified	+1	−1	View file
arch/arm/mm/abort-ev7.S	modified	+1	−0	View file
arch/arm/mm/abort-nommu.S	modified	+1	−0	View file
arch/arm/mm/alignment.c	modified	+1	−1	View file
arch/arm/mm/cache-feroceon-l2.c	modified	+25	−17	View file
arch/arm/mm/cache-l2x0.c	modified	+1	−1	View file
arch/arm/mm/cache-v7.S	modified	+10	−0	View file
arch/arm/mm/cache-xsc3l2.c	modified	+2	−1	View file
arch/arm/mm/copypage-v4mc.c	modified	+1	−1	View file
arch/arm/mm/copypage-v6.c	modified	+1	−0	View file
arch/arm/mm/copypage-xscale.c	modified	+1	−1	View file
arch/arm/mm/consistent.c → arch/arm/mm/dma-mapping.c	renamed	+103	−1	View file
arch/arm/mm/extable.c	modified	+1	−1	View file
arch/arm/mm/fault-armv.c	modified	+8	−5	View file
arch/arm/mm/fault.c	modified	+3	−4	View file
arch/arm/mm/flush.c	modified	+1	−0	View file
arch/arm/mm/init.c	modified	+122	−71	View file
arch/arm/mm/iomap.c	modified	+1	−2	View file
arch/arm/mm/ioremap.c	modified	+7	−8	View file
arch/arm/mm/mm.h	modified	+2	−1	View file
arch/arm/mm/mmap.c	modified	+4	−2	View file
arch/arm/mm/mmu.c	modified	+58	−48	View file
arch/arm/mm/nommu.c	modified	+15	−3	View file
arch/arm/mm/proc-arm1020.S	modified	+2	−24	View file
arch/arm/mm/proc-arm1020e.S	modified	+2	−24	View file
arch/arm/mm/proc-arm1022.S	modified	+2	−24	View file
arch/arm/mm/proc-arm1026.S	modified	+2	−24	View file
arch/arm/mm/proc-arm6_7.S	modified	+6	−21	View file
arch/arm/mm/proc-arm720.S	modified	+4	−21	View file
arch/arm/mm/proc-arm740.S	modified	+1	−1	View file
arch/arm/mm/proc-arm7tdmi.S	modified	+1	−1	View file
arch/arm/mm/proc-arm920.S	modified	+3	−25	View file
arch/arm/mm/proc-arm922.S	modified	+2	−24	View file
arch/arm/mm/proc-arm925.S	modified	+2	−24	View file
arch/arm/mm/proc-arm926.S	modified	+2	−24	View file
arch/arm/mm/proc-arm940.S	modified	+1	−1	View file
arch/arm/mm/proc-arm946.S	modified	+1	−1	View file
arch/arm/mm/proc-arm9tdmi.S	modified	+1	−1	View file
arch/arm/mm/proc-feroceon.S	modified	+10	−23	View file
arch/arm/mm/proc-macros.S	modified	+170	−0	View file
arch/arm/mm/proc-sa110.S	modified	+2	−19	View file
arch/arm/mm/proc-sa1100.S	modified	+2	−19	View file
arch/arm/mm/proc-v6.S	modified	+4	−38	View file
arch/arm/mm/proc-v7.S	modified	+21	−18	View file
arch/arm/mm/proc-xsc3.S	modified	+28	−28	View file
arch/arm/mm/proc-xscale.S	modified	+30	−46	View file
arch/arm/mm/tlb-v7.S	modified	+2	−0	View file
arch/arm/nwfpe/fpa11_cpdt.c	modified	+1	−1	View file
arch/arm/oprofile/Makefile	modified	+1	−0	View file
arch/arm/oprofile/backtrace.c	modified	+1	−1	View file
arch/arm/oprofile/common.c	modified	+4	−0	View file
arch/arm/oprofile/op_arm_model.h	modified	+1	−0	View file
arch/arm/oprofile/op_model_mpcore.c	modified	+1	−1	View file
arch/arm/oprofile/op_model_v7.c	added	+411	−0	View file
arch/arm/oprofile/op_model_v7.h	added	+103	−0	View file
arch/arm/oprofile/op_model_xscale.c	modified	+1	−1	View file
arch/arm/plat-iop/i2c.c	modified	+1	−1	View file
arch/arm/plat-iop/io.c	modified	+1	−1	View file
arch/arm/plat-iop/pci.c	modified	+1	−1	View file
arch/arm/plat-iop/time.c	modified	+1	−1	View file
arch/arm/plat-mxc/Kconfig	modified	+11	−0	View file
arch/arm/plat-mxc/Makefile	modified	+2	−2	View file
arch/arm/plat-mxc/devices.c	added	+36	−0	View file
arch/arm/plat-mxc/dma-mx1-mx2.c	added	+840	−0	View file
arch/arm/plat-mxc/include/mach/board-mx31ads.h	modified	+3	−0	View file
arch/arm/plat-mxc/include/mach/clock.h	modified	+1	−1	View file
arch/arm/plat-mxc/include/mach/common.h	modified	+3	−0	View file
arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h	added	+89	−0	View file
arch/arm/plat-mxc/include/mach/entry-macro.S	modified	+11	−1	View file
arch/arm/plat-mxc/include/mach/iomux-mx1-mx2.h	modified	+24	−0	View file
arch/arm/plat-mxc/include/mach/iomux-mx3.h	modified	+20	−0	View file
arch/arm/plat-mxc/include/mach/irqs.h	modified	+1	−0	View file
arch/arm/plat-mxc/include/mach/mx27.h	modified	+1	−0	View file
arch/arm/plat-mxc/include/mach/mx31.h	modified	+1	−0	View file
arch/arm/plat-mxc/include/mach/mxc.h	modified	+6	−0	View file
arch/arm/plat-mxc/irq.c	modified	+23	−13	View file
arch/arm/plat-omap/clock.c	modified	+1	−2	View file
arch/arm/plat-omap/common.c	modified	+1	−1	View file
arch/arm/plat-omap/cpu-omap.c	modified	+1	−1	View file
arch/arm/plat-omap/debug-devices.c	modified	+1	−1	View file
arch/arm/plat-omap/debug-leds.c	modified	+1	−1	View file
arch/arm/plat-omap/devices.c	modified	+1	−1	View file
arch/arm/plat-omap/dmtimer.c	modified	+1	−1	View file
arch/arm/plat-omap/fb.c	modified	+1	−1	View file
arch/arm/plat-omap/gpio.c	modified	+2	−6	View file
arch/arm/plat-omap/include/mach/gpio.h	modified	+1	−1	View file
arch/arm/plat-omap/include/mach/irqs.h	modified	+2	−0	View file
arch/arm/plat-omap/mailbox.c	modified	+1	−1	View file
arch/arm/plat-omap/mux.c	modified	+1	−1	View file
arch/arm/plat-omap/ocpi.c	modified	+1	−1	View file
arch/arm/plat-omap/sram.c	modified	+1	−1	View file
arch/arm/plat-omap/usb.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/clock.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/common-smdk.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/cpu.c	modified	+2	−2	View file
arch/arm/plat-s3c24xx/devs.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/dma.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/gpio.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/irq.c	modified	+8	−18	View file
arch/arm/plat-s3c24xx/pm-simtec.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/pm.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/s3c244x-clock.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/s3c244x-irq.c	modified	+3	−6	View file
arch/arm/plat-s3c24xx/s3c244x.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/time.c	modified	+1	−1	View file
arch/arm/tools/mach-types	modified	+41	−3	View file
arch/arm/vfp/entry.S	modified	+4	−4	View file
arch/arm/vfp/vfphw.S	modified	+12	−13	View file
drivers/hwmon/Kconfig	modified	+9	−0	View file
drivers/hwmon/Makefile	modified	+1	−0	View file
drivers/hwmon/max1111.c	added	+244	−0	View file
drivers/i2c/busses/i2c-pxa.c	modified	+77	−17	View file
drivers/input/keyboard/corgikbd.c	modified	+3	−3	View file
drivers/input/keyboard/spitzkbd.c	modified	+3	−3	View file
drivers/input/keyboard/tosakbd.c	modified	+3	−3	View file
drivers/input/touchscreen/Kconfig	modified	+1	−0	View file
drivers/input/touchscreen/ads7846.c	modified	+54	−14	View file
drivers/input/touchscreen/ucb1400_ts.c	modified	+134	−248	View file
drivers/leds/Kconfig	modified	+0	−14	View file
drivers/leds/Makefile	modified	+0	−2	View file
drivers/leds/leds-corgi.c	deleted	+0	−124	View before deletion
drivers/leds/leds-spitz.c	deleted	+0	−131	View before deletion
drivers/media/video/pxa_camera.c	modified	+6	−6	View file
drivers/mfd/Kconfig	modified	+9	−0	View file
drivers/mfd/Makefile	modified	+1	−0	View file
drivers/mfd/ucb1400_core.c	added	+106	−0	View file
drivers/mmc/host/pxamci.c	modified	+2	−2	View file
drivers/mtd/nand/atmel_nand_ecc.h	modified	+3	−0	View file
drivers/mtd/nand/cmx270_nand.c	modified	+1	−1	View file
drivers/net/Kconfig	modified	+7	−1	View file
drivers/net/cs89x0.c	modified	+10	−2	View file
drivers/net/irda/pxaficp_ir.c	modified	+4	−4	View file
drivers/net/smc91x.c	modified	+8	−1	View file
drivers/net/smc91x.h	modified	+3	−10	View file
drivers/pcmcia/Kconfig	modified	+2	−1	View file
drivers/pcmcia/Makefile	modified	+10	−6	View file
drivers/pcmcia/pxa2xx_base.c	modified	+22	−22	View file
drivers/pcmcia/pxa2xx_cm_x255.c	added	+154	−0	View file
drivers/pcmcia/pxa2xx_cm_x270.c	modified	+2	−12	View file
drivers/pcmcia/pxa2xx_cm_x2xx.c	added	+49	−0	View file
drivers/pcmcia/pxa2xx_palmld.c	added	+151	−0	View file
drivers/pcmcia/pxa2xx_trizeps4.c	added	+256	−0	View file
drivers/pcmcia/pxa2xx_viper.c	added	+179	−0	View file
drivers/power/Kconfig	modified	+4	−4	View file
drivers/power/Makefile	modified	+1	−1	View file
drivers/power/palmtx_battery.c	deleted	+0	−198	View before deletion
drivers/power/wm97xx_battery.c	added	+272	−0	View file
drivers/serial/pxa.c	modified	+5	−0	View file
drivers/serial/serial_ks8695.c	modified	+52	−9	View file
drivers/usb/host/ohci-pxa27x.c	modified	+205	−54	View file
drivers/video/Kconfig	modified	+13	−18	View file
drivers/video/Makefile	modified	+0	−1	View file
drivers/video/am200epd.c	deleted	+0	−295	View before deletion
drivers/video/atmel_lcdfb.c	modified	+4	−0	View file
drivers/video/backlight/Kconfig	modified	+15	−0	View file
drivers/video/backlight/Makefile	modified	+2	−0	View file
drivers/video/backlight/corgi_lcd.c	added	+641	−0	View file
drivers/video/backlight/lcd.c	modified	+15	−3	View file
drivers/video/backlight/tdo24m.c	added	+396	−0	View file
drivers/video/fbmem.c	modified	+1	−0	View file
drivers/video/metronomefb.c	modified	+154	−134	View file
drivers/watchdog/ixp4xx_wdt.c	modified	+1	−3	View file
include/linux/lcd.h	modified	+3	−0	View file
include/linux/smc91x.h	modified	+11	−0	View file
include/linux/spi/ads7846.h	modified	+3	−0	View file
include/linux/spi/corgi_lcd.h	added	+20	−0	View file
include/linux/ucb1400.h	added	+161	−0	View file
include/linux/wm97xx_batt.h	added	+26	−0	View file
include/video/atmel_lcdc.h	modified	+1	−0	View file
include/video/metronomefb.h	modified	+13	−18	View file
sound/arm/pxa2xx-ac97.c	modified	+2	−2	View file
sound/soc/pxa/corgi.c	modified	+13	−21	View file
sound/soc/pxa/pxa2xx-ac97.c	modified	+5	−5	View file
sound/soc/pxa/pxa2xx-i2s.c	modified	+41	−2	View file
sound/soc/pxa/spitz.c	modified	+18	−28	View file

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

Documentation/sound/alsa/soc/dapm.txt

View file

diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt
index b2ed698..46f9684 100644
--- a/Documentation/sound/alsa/soc/dapm.txt
+++ b/Documentation/sound/alsa/soc/dapm.txt
@@ -135,11 +135,7 @@ when the Mic is inserted:-
 
 static int spitz_mic_bias(struct snd_soc_dapm_widget* w, int event)
 {
-	if(SND_SOC_DAPM_EVENT_ON(event))
-		set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);
-	else
-		reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_MIC_BIAS);
-
+	gpio_set_value(SPITZ_GPIO_MIC_BIAS, SND_SOC_DAPM_EVENT_ON(event));
 	return 0;
 }
 
@@ -269,11 +265,7 @@ powered only when the spk is in use.
 /* turn speaker amplifier on/off depending on use */
 static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)
 {
-	if (SND_SOC_DAPM_EVENT_ON(event))
-		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
-	else
-		reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
-
+	gpio_set_value(CORGI_GPIO_APM_ON, SND_SOC_DAPM_EVENT_ON(event));
 	return 0;
 }
 

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 46d94ff..85be56a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -466,6 +466,12 @@ M:	[email protected]
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
+ARM/AFEB9260 MACHINE SUPPORT
+P:	Sergey Lapin
+M:	[email protected]
+L:	[email protected] (subscribers-only)
+S:	Maintained
+
 ARM/AJECO 1ARM MACHINE SUPPORT
 P:	Lennert Buytenhek
 M:	[email protected]
@@ -491,7 +497,7 @@ M:	[email protected]
 L:	[email protected] (subscribers-only)
 S:	Maintained
 
-ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 P:	Mike Rapoport
 M:	[email protected]
 L:	[email protected] (subscribers-only)
@@ -623,6 +629,12 @@ M:	[email protected]
 W:	http://hackndev.com
 S:	Maintained
 
+ARM/PALMZ72 SUPPORT
+P:     Sergey Lapin
+M:     [email protected]
+W:     http://hackndev.com
+S:     Maintained
+
 ARM/PLEB SUPPORT
 P:	Peter Chubb
 M:	[email protected]

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70dba16..efeed65 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -148,7 +148,6 @@ config ARCH_MAY_HAVE_PC_FDC
 
 config ZONE_DMA
 	bool
-	default y
 
 config GENERIC_ISA_DMA
 	bool
@@ -178,6 +177,11 @@ config OPROFILE_MPCORE
 config OPROFILE_ARM11_CORE
 	bool
 
+config OPROFILE_ARMV7
+	def_bool y
+	depends on CPU_V7 && !SMP
+	bool
+
 endif
 
 config VECTORS_BASE
@@ -245,6 +249,7 @@ config ARCH_CLPS7500
 	select TIMER_ACORN
 	select ISA
 	select NO_IOPORT
+	select ARCH_SPARSEMEM_ENABLE
 	help
 	  Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
@@ -306,6 +311,7 @@ config ARCH_IOP13XX
 	select PLAT_IOP
 	select PCI
 	select ARCH_SUPPORTS_MSI
+	select VMSPLIT_1G
 	help
 	  Support for Intel's IOP13XX (XScale) family of processors.
 
@@ -350,6 +356,7 @@ config ARCH_IXP4XX
 	select GENERIC_GPIO
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
+	select ZONE_DMA if PCI
 	help
 	  Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -434,7 +441,7 @@ config ARCH_ORION5X
 	help
 	  Support for the following Marvell Orion 5x series SoCs:
 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
-	  Orion-2 (5281).
+	  Orion-2 (5281), Orion-1-90 (6183).
 
 config ARCH_PNX4008
 	bool "Philips Nexperia PNX4008 Mobile"
@@ -464,6 +471,7 @@ config ARCH_RPC
 	select HAVE_PATA_PLATFORM
 	select ISA_DMA_API
 	select NO_IOPORT
+	select ARCH_SPARSEMEM_ENABLE
 	help
 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and
 	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -471,9 +479,7 @@ config ARCH_RPC
 config ARCH_SA1100
 	bool "SA1100-based"
 	select ISA
-	select ARCH_DISCONTIGMEM_ENABLE
 	select ARCH_SPARSEMEM_ENABLE
-	select ARCH_SELECT_MEMORY_MODEL
 	select ARCH_MTD_XIP
 	select GENERIC_GPIO
 	select GENERIC_TIME
@@ -497,6 +503,7 @@ config ARCH_SHARK
 	bool "Shark"
 	select ISA
 	select ISA_DMA
+	select ZONE_DMA
 	select PCI
 	help
 	  Support for the StrongARM based Digital DNARD machine, also known
@@ -504,6 +511,8 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
 	bool "Sharp LH7A40X"
+	select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
+	select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
 	help
 	  Say Y here for systems based on one of the Sharp LH7A40X
 	  System on a Chip processors.  These CPUs include an ARM922T
@@ -515,7 +524,9 @@ config ARCH_DAVINCI
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
 	select HAVE_CLK
+	select ZONE_DMA
 	help
 	  Support for TI's DaVinci platform.
 
@@ -734,6 +745,29 @@ config SMP
 
 	  If you don't know what to do here, say N.
 
+choice
+	prompt "Memory split"
+	default VMSPLIT_3G
+	help
+	  Select the desired split between kernel and user memory.
+
+	  If you are not absolutely sure what you are doing, leave this
+	  option alone!
+
+	config VMSPLIT_3G
+		bool "3G/1G user/kernel split"
+	config VMSPLIT_2G
+		bool "2G/2G user/kernel split"
+	config VMSPLIT_1G
+		bool "1G/3G user/kernel split"
+endchoice
+
+config PAGE_OFFSET
+	hex
+	default 0x40000000 if VMSPLIT_1G
+	default 0x80000000 if VMSPLIT_2G
+	default 0xC0000000
+
 config NR_CPUS
 	int "Maximum number of CPUs (2-32)"
 	range 2 32
@@ -815,20 +849,18 @@ config ARCH_FLATMEM_HAS_HOLES
 	default y
 	depends on FLATMEM
 
+# Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
 	bool
-	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
-	help
-	  Say Y to support efficient handling of discontiguous physical memory,
-	  for architectures which are either NUMA (Non-Uniform Memory Access)
-	  or have huge holes in the physical address space for other reasons.
-	  See <file:Documentation/vm/numa> for more.
 
 config ARCH_SPARSEMEM_ENABLE
 	bool
 
+config ARCH_SPARSEMEM_DEFAULT
+	def_bool ARCH_SPARSEMEM_ENABLE
+
 config ARCH_SELECT_MEMORY_MODEL
-	bool
+	def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
 
 config NODES_SHIFT
 	int
@@ -845,7 +877,7 @@ config LEDS
 		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+		   ARCH_AT91 || ARCH_DAVINCI || \
 		   ARCH_KS8695 || MACH_RD88F5182
 	help
 	  If you say Y here, the LEDs on your machine will be used
@@ -1005,9 +1037,9 @@ config ATAGS_PROC
 
 endmenu
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
+menu "CPU Power Management"
 
-menu "CPU Frequency scaling"
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
 
 source "drivers/cpufreq/Kconfig"
 
@@ -1047,10 +1079,12 @@ config CPU_FREQ_PXA
 	default y
 	select CPU_FREQ_DEFAULT_GOV_USERSPACE
 
-endmenu
-
 endif
 
+source "drivers/cpuidle/Kconfig"
+
+endmenu
+
 menu "Floating point emulation"
 
 comment "At least one emulation must be selected"
@@ -1202,6 +1236,8 @@ source "drivers/power/Kconfig"
 
 source "drivers/hwmon/Kconfig"
 
+source "drivers/thermal/Kconfig"
+
 source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"
@@ -1222,6 +1258,10 @@ source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"
 
+source "drivers/memstick/Kconfig"
+
+source "drivers/accessibility/Kconfig"
+
 source "drivers/leds/Kconfig"
 
 source "drivers/rtc/Kconfig"
@@ -1230,6 +1270,8 @@ source "drivers/dma/Kconfig"
 
 source "drivers/dca/Kconfig"
 
+source "drivers/auxdisplay/Kconfig"
+
 source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"

arch/arm/Makefile

View file

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 703a44f..e2274bc 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -47,7 +47,7 @@ comma = ,
 # Note that GCC does not numerically define an architecture version
 # macro, but instead defines a whole series of macros which makes
 # testing for a specific architecture or later rather impossible.
-arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
+arch-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
 arch-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
 # Only override the compiler option if ARMv6. The ARMv6K extensions are
 # always available in ARMv7

arch/arm/boot/compressed/Makefile

View file

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 94462a0..7a03f20 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -76,7 +76,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
 
 EXTRA_CFLAGS  := -fpic -fno-builtin
-EXTRA_AFLAGS  :=
+EXTRA_AFLAGS  := -Wa,-march=all
 
 # Supply ZRELADDR, INITRD_PHYS and PARAMS_PHYS to the decompressor via
 # linker symbols.  We only define initrd_phys and params_phys if the

arch/arm/boot/compressed/head.S

View file

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index d42f89b..84a1e04 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -421,6 +421,7 @@ __setup_mmu:	sub	r3, r4, #16384		@ Page directory size
 		add	r1, r1, #1048576
 		str	r1, [r0]
 		mov	pc, lr
+ENDPROC(__setup_mmu)
 
 __armv4_mmu_cache_on:
 		mov	r12, lr
@@ -801,7 +802,7 @@ loop1:
 		add	r2, r2, #4		@ add 4 (line length offset)
 		ldr	r4, =0x3ff
 		ands	r4, r4, r1, lsr #3	@ find maximum number on the way size
-		.word	0xe16f5f14		@ clz r5, r4 - find bit position of way size increment
+		clz	r5, r4			@ find bit position of way size increment
 		ldr	r7, =0x7fff
 		ands	r7, r7, r1, lsr #13	@ extract max number of the index size
 loop2:

arch/arm/common/Kconfig

View file

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 3e07346..2e32acc 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -12,7 +12,8 @@ config ICST307
 
 config SA1111
 	bool
-	select DMABOUNCE
+	select DMABOUNCE if !ARCH_PXA
+	select ZONE_DMA if !ARCH_PXA
 
 config DMABOUNCE
 	bool

arch/arm/common/dmabounce.c

View file

diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index aecc6c3..f030f07 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -154,9 +154,7 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
 #endif
 
 	write_lock_irqsave(&device_info->lock, flags);
-
 	list_add(&buf->node, &device_info->safe_buffers);
-
 	write_unlock_irqrestore(&device_info->lock, flags);
 
 	return buf;
@@ -205,8 +203,22 @@ free_safe_buffer(struct dmabounce_device_info *device_info, struct safe_buffer *
 
 /* ************************************************** */
 
-static inline dma_addr_t
-map_single(struct device *dev, void *ptr, size_t size,
+static struct safe_buffer *find_safe_buffer_dev(struct device *dev,
+		dma_addr_t dma_addr, const char *where)
+{
+	if (!dev || !dev->archdata.dmabounce)
+		return NULL;
+	if (dma_mapping_error(dev, dma_addr)) {
+		if (dev)
+			dev_err(dev, "Trying to %s invalid mapping\n", where);
+		else
+			pr_err("unknown device: Trying to %s invalid mapping\n", where);
+		return NULL;
+	}
+	return find_safe_buffer(dev->archdata.dmabounce, dma_addr);
+}
+
+static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,
 		enum dma_data_direction dir)
 {
 	struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
@@ -270,33 +282,21 @@ map_single(struct device *dev, void *ptr, size_t size,
 	return dma_addr;
 }
 
-static inline void
-unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-		enum dma_data_direction dir)
+static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
+		size_t size, enum dma_data_direction dir)
 {
-	struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
-	struct safe_buffer *buf = NULL;
-
-	/*
-	 * Trying to unmap an invalid mapping
-	 */
-	if (dma_mapping_error(dev, dma_addr)) {
-		dev_err(dev, "Trying to unmap invalid mapping\n");
-		return;
-	}
-
-	if (device_info)
-		buf = find_safe_buffer(device_info, dma_addr);
+	struct safe_buffer *buf = find_safe_buffer_dev(dev, dma_addr, "unmap");
 
 	if (buf) {
 		BUG_ON(buf->size != size);
+		BUG_ON(buf->direction != dir);
 
 		dev_dbg(dev,
 			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
 			__func__, buf->ptr, virt_to_dma(dev, buf->ptr),
 			buf->safe, buf->safe_dma_addr);
 
-		DO_STATS ( device_info->bounce_count++ );
+		DO_STATS(dev->archdata.dmabounce->bounce_count++);
 
 		if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {
 			void *ptr = buf->ptr;
@@ -317,74 +317,7 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
 			dmac_clean_range(ptr, ptr + size);
 			outer_clean_range(__pa(ptr), __pa(ptr) + size);
 		}
-		free_safe_buffer(device_info, buf);
-	}
-}
-
-static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-			enum dma_data_direction dir)
-{
-	struct dmabounce_device_info *device_info = dev->archdata.dmabounce;
-	struct safe_buffer *buf = NULL;
-
-	if (device_info)
-		buf = find_safe_buffer(device_info, dma_addr);
-
-	if (buf) {
-		/*
-		 * Both of these checks from original code need to be
-		 * commented out b/c some drivers rely on the following:
-		 *
-		 * 1) Drivers may map a large chunk of memory into DMA space
-		 *    but only sync a small portion of it. Good example is
-		 *    allocating a large buffer, mapping it, and then
-		 *    breaking it up into small descriptors. No point
-		 *    in syncing the whole buffer if you only have to
-		 *    touch one descriptor.
-		 *
-		 * 2) Buffers that are mapped as DMA_BIDIRECTIONAL are
-		 *    usually only synced in one dir at a time.
-		 *
-		 * See drivers/net/eepro100.c for examples of both cases.
-		 *
-		 * -ds
-		 *
-		 * BUG_ON(buf->size != size);
-		 * BUG_ON(buf->direction != dir);
-		 */
-
-		dev_dbg(dev,
-			"%s: unsafe buffer %p (dma=%#x) mapped to %p (dma=%#x)\n",
-			__func__, buf->ptr, virt_to_dma(dev, buf->ptr),
-			buf->safe, buf->safe_dma_addr);
-
-		DO_STATS ( device_info->bounce_count++ );
-
-		switch (dir) {
-		case DMA_FROM_DEVICE:
-			dev_dbg(dev,
-				"%s: copy back safe %p to unsafe %p size %d\n",
-				__func__, buf->safe, buf->ptr, size);
-			memcpy(buf->ptr, buf->safe, size);
-			break;
-		case DMA_TO_DEVICE:
-			dev_dbg(dev,
-				"%s: copy out unsafe %p to safe %p, size %d\n",
-				__func__,buf->ptr, buf->safe, size);
-			memcpy(buf->safe, buf->ptr, size);
-			break;
-		case DMA_BIDIRECTIONAL:
-			BUG();	/* is this allowed?  what does it mean? */
-		default:
-			BUG();
-		}
-		/*
-		 * No need to sync the safe buffer - it was allocated
-		 * via the coherent allocators.
-		 */
-		return 0;
-	} else {
-		return 1;
+		free_safe_buffer(dev->archdata.dmabounce, buf);
 	}
 }
 
@@ -396,21 +329,29 @@ static int sync_single(struct device *dev, dma_addr_t dma_addr, size_t size,
  * substitute the safe buffer for the unsafe one.
  * (basically move the buffer from an unsafe area to a safe one)
  */
-dma_addr_t
-dma_map_single(struct device *dev, void *ptr, size_t size,
+dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
 		enum dma_data_direction dir)
 {
-	dma_addr_t dma_addr;
-
 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
 		__func__, ptr, size, dir);
 
-	BUG_ON(dir == DMA_NONE);
+	BUG_ON(!valid_dma_direction(dir));
 
-	dma_addr = map_single(dev, ptr, size, dir);
+	return map_single(dev, ptr, size, dir);
+}
+EXPORT_SYMBOL(dma_map_single);
 
-	return dma_addr;
+dma_addr_t dma_map_page(struct device *dev, struct page *page,
+		unsigned long offset, size_t size, enum dma_data_direction dir)
+{
+	dev_dbg(dev, "%s(page=%p,off=%#lx,size=%zx,dir=%x)\n",
+		__func__, page, offset, size, dir);
+
+	BUG_ON(!valid_dma_direction(dir));
+
+	return map_single(dev, page_address(page) + offset, size, dir);
 }
+EXPORT_SYMBOL(dma_map_page);
 
 /*
  * see if a mapped address was really a "safe" buffer and if so, copy
@@ -419,126 +360,76 @@ dma_map_single(struct device *dev, void *ptr, size_t size,
  * should be)
  */
 
-void
-dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-			enum dma_data_direction dir)
+void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
+		enum dma_data_direction dir)
 {
 	dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
 		__func__, (void *) dma_addr, size, dir);
 
-	BUG_ON(dir == DMA_NONE);
-
 	unmap_single(dev, dma_addr, size, dir);
 }
+EXPORT_SYMBOL(dma_unmap_single);
 
-int
-dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
-		enum dma_data_direction dir)
+int dmabounce_sync_for_cpu(struct device *dev, dma_addr_t addr,
+		unsigned long off, size_t sz, enum dma_data_direction dir)
 {
-	int i;
-
-	dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
-		__func__, sg, nents, dir);
-
-	BUG_ON(dir == DMA_NONE);
-
-	for (i = 0; i < nents; i++, sg++) {
-		struct page *page = sg_page(sg);
-		unsigned int offset = sg->offset;
-		unsigned int length = sg->length;
-		void *ptr = page_address(page) + offset;
+	struct safe_buffer *buf;
 
-		sg->dma_address =
-			map_single(dev, ptr, length, dir);
-	}
+	dev_dbg(dev, "%s(dma=%#x,off=%#lx,sz=%zx,dir=%x)\n",
+		__func__, addr, off, sz, dir);
 
-	return nents;
-}
-
-void
-dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
-		enum dma_data_direction dir)
-{
-	int i;
+	buf = find_safe_buffer_dev(dev, addr, __func__);
+	if (!buf)
+		return 1;