Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:06:29 +0000 (10:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 17:06:29 +0000 (10:06 -0700)
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c: I2C bus multiplexer driver pca954x
  i2c: Multiplexed I2C bus core support
  i2c: Use a separate mutex for userspace client lists
  i2c: Make i2c_default_probe self-sufficient
  i2c: Drop dummy variable
  i2c: Move adapter locking helpers to i2c-core
  V4L/DVB: Use custom I2C probing function mechanism
  i2c: Add support for custom probe function
  i2c-dev: Use memdup_user
  i2c-dev: Remove unnecessary kmalloc casts

1007 files changed:
Documentation/00-INDEX
Documentation/DMA-API-HOWTO.txt
Documentation/DMA-API.txt
Documentation/DocBook/Makefile
Documentation/DocBook/kernel-api.tmpl
Documentation/cpu-hotplug.txt
Documentation/feature-removal-schedule.txt
Documentation/filesystems/squashfs.txt
Documentation/gpio.txt
Documentation/kernel-parameters.txt
Documentation/mmc/00-INDEX [new file with mode: 0644]
Documentation/mmc/mmc-dev-attrs.txt [new file with mode: 0644]
Documentation/networking/wavelan.txt [deleted file]
Documentation/padata.txt
Documentation/powerpc/dts-bindings/fsl/esdhc.txt
Documentation/sound/alsa/HD-Audio-Models.txt
MAINTAINERS
arch/alpha/include/asm/dma-mapping.h
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/boot/compressed/head.S
arch/arm/common/it8152.c
arch/arm/configs/s5pc110_defconfig [deleted file]
arch/arm/configs/s5pv210_defconfig
arch/arm/include/asm/cache.h
arch/arm/include/asm/dma-mapping.h
arch/arm/include/asm/elf.h
arch/arm/include/asm/hardware/coresight.h
arch/arm/include/asm/hardware/scoop.h
arch/arm/include/asm/tlbflush.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/etm.c
arch/arm/kernel/module.c
arch/arm/mach-at91/board-cam60.c
arch/arm/mach-clps711x/include/mach/hardware.h
arch/arm/mach-gemini/Kconfig
arch/arm/mach-gemini/Makefile
arch/arm/mach-gemini/board-nas4220b.c [new file with mode: 0644]
arch/arm/mach-gemini/board-wbd111.c [new file with mode: 0644]
arch/arm/mach-gemini/board-wbd222.c [new file with mode: 0644]
arch/arm/mach-h720x/include/mach/hardware.h
arch/arm/mach-imx/mach-pca100.c
arch/arm/mach-integrator/include/mach/hardware.h
arch/arm/mach-ixp23xx/include/mach/hardware.h
arch/arm/mach-ixp4xx/Kconfig
arch/arm/mach-ixp4xx/Makefile
arch/arm/mach-ixp4xx/include/mach/debug-macro.S
arch/arm/mach-ixp4xx/include/mach/io.h
arch/arm/mach-ixp4xx/vulcan-pci.c [new file with mode: 0644]
arch/arm/mach-ixp4xx/vulcan-setup.c [new file with mode: 0644]
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-mmp/avengers_lite.c
arch/arm/mach-mmp/common.c
arch/arm/mach-mmp/common.h
arch/arm/mach-mmp/flint.c
arch/arm/mach-mmp/include/mach/devices.h
arch/arm/mach-mmp/include/mach/mmp2.h
arch/arm/mach-mmp/include/mach/pxa168.h
arch/arm/mach-mmp/include/mach/pxa910.h
arch/arm/mach-mmp/irq-mmp2.c
arch/arm/mach-mmp/jasper.c
arch/arm/mach-mmp/mmp2.c
arch/arm/mach-mmp/tavorevb.c
arch/arm/mach-mmp/time.c
arch/arm/mach-mmp/ttc_dkb.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/hsmmc.h
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
arch/arm/mach-pxa/balloon3.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/colibri-pxa270-evalboard.c [new file with mode: 0644]
arch/arm/mach-pxa/colibri-pxa270-income.c [new file with mode: 0644]
arch/arm/mach-pxa/colibri-pxa270.c
arch/arm/mach-pxa/colibri-pxa320.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/corgi_pm.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/devices.h
arch/arm/mach-pxa/e330.c [deleted file]
arch/arm/mach-pxa/e350.c [deleted file]
arch/arm/mach-pxa/e400.c [deleted file]
arch/arm/mach-pxa/e740.c [deleted file]
arch/arm/mach-pxa/e750.c [deleted file]
arch/arm/mach-pxa/e800.c [deleted file]
arch/arm/mach-pxa/eseries.c
arch/arm/mach-pxa/imote2.c [deleted file]
arch/arm/mach-pxa/include/mach/balloon3.h
arch/arm/mach-pxa/include/mach/colibri.h
arch/arm/mach-pxa/include/mach/corgi.h
arch/arm/mach-pxa/include/mach/gumstix.h
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/include/mach/palm27x.h [new file with mode: 0644]
arch/arm/mach-pxa/include/mach/pata_pxa.h [new file with mode: 0644]
arch/arm/mach-pxa/include/mach/sharpsl.h [deleted file]
arch/arm/mach-pxa/include/mach/sharpsl_pm.h
arch/arm/mach-pxa/include/mach/spitz.h
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/palm27x.c [new file with mode: 0644]
arch/arm/mach-pxa/palmld.c
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmte2.c
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/palmtx.c
arch/arm/mach-pxa/palmz72.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/sharpsl.h [deleted file]
arch/arm/mach-pxa/sharpsl_pm.c
arch/arm/mach-pxa/sleep.S
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/spitz_pm.c
arch/arm/mach-pxa/stargate2.c
arch/arm/mach-pxa/trizeps4.c
arch/arm/mach-pxa/vpac270.c
arch/arm/mach-pxa/z2.c
arch/arm/mach-s3c2416/s3c2416.c
arch/arm/mach-s3c2440/mach-gta02.c
arch/arm/mach-s3c2443/s3c2443.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s3c64xx/clock.c
arch/arm/mach-s3c64xx/dev-audio.c
arch/arm/mach-s3c64xx/dev-spi.c
arch/arm/mach-s3c64xx/gpiolib.c
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/mach-s3c64xx/include/mach/regs-clock.h
arch/arm/mach-s3c64xx/include/mach/regs-fb.h
arch/arm/mach-s3c64xx/mach-anw6410.c
arch/arm/mach-s3c64xx/mach-hmt.c
arch/arm/mach-s3c64xx/mach-smartq5.c
arch/arm/mach-s3c64xx/mach-smartq7.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s3c64xx/s3c6410.c
arch/arm/mach-s3c64xx/setup-fb-24bpp.c
arch/arm/mach-s3c64xx/setup-i2c0.c
arch/arm/mach-s3c64xx/setup-i2c1.c
arch/arm/mach-s3c64xx/setup-ide.c [new file with mode: 0644]
arch/arm/mach-s3c64xx/setup-keypad.c [new file with mode: 0644]
arch/arm/mach-s3c64xx/setup-sdhci-gpio.c
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6440/Makefile
arch/arm/mach-s5p6440/cpu.c
arch/arm/mach-s5p6440/dev-audio.c
arch/arm/mach-s5p6440/dev-spi.c
arch/arm/mach-s5p6440/gpio.c
arch/arm/mach-s5p6440/include/mach/irqs.h
arch/arm/mach-s5p6440/include/mach/map.h
arch/arm/mach-s5p6440/include/mach/system.h
arch/arm/mach-s5p6440/mach-smdk6440.c
arch/arm/mach-s5p6440/setup-i2c0.c
arch/arm/mach-s5p6440/setup-i2c1.c [new file with mode: 0644]
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5p6442/clock.c
arch/arm/mach-s5p6442/dev-audio.c
arch/arm/mach-s5p6442/dev-spi.c
arch/arm/mach-s5p6442/include/mach/irqs.h
arch/arm/mach-s5p6442/include/mach/map.h
arch/arm/mach-s5p6442/include/mach/system.h
arch/arm/mach-s5p6442/mach-smdk6442.c
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pc100/dev-audio.c
arch/arm/mach-s5pc100/dev-spi.c
arch/arm/mach-s5pc100/include/mach/irqs.h
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pc100/include/mach/regs-clock.h
arch/arm/mach-s5pc100/include/mach/regs-fb.h
arch/arm/mach-s5pc100/include/mach/system.h
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pc100/setup-ide.c [new file with mode: 0644]
arch/arm/mach-s5pc100/setup-keypad.c [new file with mode: 0644]
arch/arm/mach-s5pc100/setup-sdhci-gpio.c
arch/arm/mach-s5pc100/setup-sdhci.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/dev-audio.c
arch/arm/mach-s5pv210/dev-onenand.c
arch/arm/mach-s5pv210/dev-spi.c
arch/arm/mach-s5pv210/gpiolib.c
arch/arm/mach-s5pv210/include/mach/gpio.h
arch/arm/mach-s5pv210/include/mach/irqs.h
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/mach-s5pv210/include/mach/memory.h
arch/arm/mach-s5pv210/include/mach/regs-clock.h
arch/arm/mach-s5pv210/include/mach/system.h
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkc110.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-s5pv210/setup-fb-24bpp.c
arch/arm/mach-s5pv210/setup-i2c0.c
arch/arm/mach-s5pv210/setup-i2c1.c
arch/arm/mach-s5pv210/setup-i2c2.c
arch/arm/mach-s5pv210/setup-ide.c [new file with mode: 0644]
arch/arm/mach-s5pv210/setup-keypad.c [new file with mode: 0644]
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
arch/arm/mach-s5pv210/setup-sdhci.c
arch/arm/mach-s5pv310/Kconfig [new file with mode: 0644]
arch/arm/mach-s5pv310/Makefile [new file with mode: 0644]
arch/arm/mach-s5pv310/Makefile.boot [new file with mode: 0644]
arch/arm/mach-s5pv310/clock.c [new file with mode: 0644]
arch/arm/mach-s5pv310/cpu.c [new file with mode: 0644]
arch/arm/mach-s5pv310/headsmp.S [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/debug-macro.S [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/entry-macro.S [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/gpio.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/hardware.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/io.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/irqs.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/map.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/memory.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/pwm-clock.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/regs-clock.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/regs-irq.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/smp.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/system.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/timex.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/uncompress.h [new file with mode: 0644]
arch/arm/mach-s5pv310/include/mach/vmalloc.h [new file with mode: 0644]
arch/arm/mach-s5pv310/init.c [new file with mode: 0644]
arch/arm/mach-s5pv310/irq-combiner.c [new file with mode: 0644]
arch/arm/mach-s5pv310/localtimer.c [new file with mode: 0644]
arch/arm/mach-s5pv310/mach-smdkv310.c [new file with mode: 0644]
arch/arm/mach-s5pv310/mach-universal_c210.c [new file with mode: 0644]
arch/arm/mach-s5pv310/platsmp.c [new file with mode: 0644]
arch/arm/mach-s5pv310/setup-i2c0.c [new file with mode: 0644]
arch/arm/mach-s5pv310/setup-i2c1.c [new file with mode: 0644]
arch/arm/mach-s5pv310/setup-i2c2.c [new file with mode: 0644]
arch/arm/mach-s5pv310/time.c [new file with mode: 0644]
arch/arm/mach-sa1100/include/mach/irqs.h
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-g3evm.c
arch/arm/mach-shmobile/board-g4evm.c
arch/arm/mach-shmobile/clock-sh7367.c
arch/arm/mach-shmobile/clock-sh7372.c [new file with mode: 0644]
arch/arm/mach-shmobile/clock-sh7377.c [new file with mode: 0644]
arch/arm/mach-shmobile/clock.c [new file with mode: 0644]
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-shmobile/include/mach/irqs.h
arch/arm/mach-shmobile/include/mach/memory.h
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/include/mach/vmalloc.h
arch/arm/mach-shmobile/intc-sh7367.c
arch/arm/mach-shmobile/intc-sh7372.c
arch/arm/mach-shmobile/intc-sh7377.c
arch/arm/mach-shmobile/pfc-sh7372.c
arch/arm/mach-shmobile/setup-sh7367.c
arch/arm/mach-shmobile/setup-sh7372.c
arch/arm/mach-shmobile/setup-sh7377.c
arch/arm/mach-u300/clock.c
arch/arm/mach-u300/clock.h
arch/arm/mach-u300/core.c
arch/arm/mach-u300/mmc.c
arch/arm/mach-u300/timer.c
arch/arm/mach-versatile/include/mach/hardware.h
arch/arm/mm/Kconfig
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/include/plat/mmc.h
arch/arm/plat-pxa/Makefile
arch/arm/plat-pxa/pmu.c [deleted file]
arch/arm/plat-s5p/Kconfig
arch/arm/plat-s5p/Makefile
arch/arm/plat-s5p/cpu.c
arch/arm/plat-s5p/dev-fimc0.c [new file with mode: 0644]
arch/arm/plat-s5p/dev-fimc1.c [new file with mode: 0644]
arch/arm/plat-s5p/dev-fimc2.c [new file with mode: 0644]
arch/arm/plat-s5p/dev-pmu.c [new file with mode: 0644]
arch/arm/plat-s5p/include/plat/map-s5p.h
arch/arm/plat-s5p/include/plat/pll.h
arch/arm/plat-s5p/include/plat/reset.h [new file with mode: 0644]
arch/arm/plat-s5p/include/plat/s5pv310.h [new file with mode: 0644]
arch/arm/plat-s5p/include/plat/system-reset.h [new file with mode: 0644]
arch/arm/plat-s5p/irq.c
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/dev-hsmmc.c
arch/arm/plat-samsung/dev-hsmmc1.c
arch/arm/plat-samsung/dev-hsmmc2.c
arch/arm/plat-samsung/dev-hsmmc3.c [new file with mode: 0644]
arch/arm/plat-samsung/dev-ide.c [new file with mode: 0644]
arch/arm/plat-samsung/dev-keypad.c [new file with mode: 0644]
arch/arm/plat-samsung/dev-wdt.c
arch/arm/plat-samsung/gpiolib.c
arch/arm/plat-samsung/include/plat/adc-core.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/ata-core.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/ata.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/devs.h
arch/arm/plat-samsung/include/plat/fb-core.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/fb.h
arch/arm/plat-samsung/include/plat/fimc-core.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/keypad-core.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/keypad.h
arch/arm/plat-samsung/include/plat/regs-ata.h [new file with mode: 0644]
arch/arm/plat-samsung/include/plat/regs-fb-v4.h
arch/arm/plat-samsung/include/plat/regs-fb.h
arch/arm/plat-samsung/include/plat/regs-rtc.h
arch/arm/plat-samsung/include/plat/regs-serial.h
arch/arm/plat-samsung/include/plat/sdhci.h
arch/arm/plat-samsung/platformdata.c [new file with mode: 0644]
arch/avr32/include/asm/cache.h
arch/avr32/include/asm/dma-mapping.h
arch/blackfin/include/asm/cache.h
arch/blackfin/include/asm/dma-mapping.h
arch/cris/include/asm/dma-mapping.h
arch/frv/include/asm/dma-mapping.h
arch/frv/include/asm/mem-layout.h
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/rwsem.h
arch/ia64/kernel/perfmon.c
arch/ia64/kernel/setup.c
arch/m68k/include/asm/cache.h
arch/m68k/include/asm/dma-mapping.h
arch/microblaze/include/asm/dma-mapping.h
arch/microblaze/include/asm/page.h
arch/mips/include/asm/dma-mapping.h
arch/mips/include/asm/mach-generic/kmalloc.h
arch/mips/include/asm/mach-ip27/kmalloc.h
arch/mips/include/asm/mach-ip32/kmalloc.h
arch/mips/mm/dma-default.c
arch/mn10300/boot/compressed/misc.c
arch/mn10300/include/asm/cache.h
arch/mn10300/include/asm/dma-mapping.h
arch/mn10300/include/asm/gdb-stub.h
arch/mn10300/include/asm/posix_types.h
arch/mn10300/kernel/mn10300-serial.c
arch/mn10300/kernel/rtc.c
arch/parisc/include/asm/cache.h
arch/parisc/include/asm/dma-mapping.h
arch/parisc/mm/ioremap.c
arch/powerpc/boot/dts/p4080ds.dts
arch/powerpc/include/asm/dma-mapping.h
arch/powerpc/include/asm/page_32.h
arch/powerpc/platforms/83xx/mpc837x_mds.c
arch/powerpc/platforms/83xx/mpc837x_rdb.c
arch/powerpc/sysdev/fsl_rio.c
arch/score/mm/tlb-score.c
arch/sh/boards/mach-ap325rxa/setup.c
arch/sh/boards/mach-kfr2r09/Makefile
arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
arch/sh/include/asm/dma-mapping.h
arch/sh/include/asm/page.h
arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
arch/sparc/include/asm/dma-mapping.h
arch/tile/include/asm/dma-mapping.h
arch/um/drivers/hostaudio_kern.c
arch/um/include/asm/dma-mapping.h
arch/x86/include/asm/dma-mapping.h
arch/x86/include/asm/xen/page.h
arch/x86/include/asm/xen/swiotlb-xen.h [new file with mode: 0644]
arch/x86/kernel/hpet.c
arch/x86/kernel/pci-dma.c
arch/x86/xen/Makefile
arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c
arch/x86/xen/pci-swiotlb-xen.c [new file with mode: 0644]
arch/xtensa/include/asm/cache.h
arch/xtensa/include/asm/dma-mapping.h
block/blk-core.c
block/blk-lib.c
block/compat_ioctl.c
block/elevator.c
block/ioctl.c
drivers/acpi/apei/erst.c
drivers/acpi/debug.c
drivers/ata/Kconfig
drivers/ata/Makefile
drivers/ata/pata_mpc52xx.c
drivers/ata/pata_of_platform.c
drivers/ata/pata_pxa.c [new file with mode: 0644]
drivers/ata/sata_fsl.c
drivers/atm/fore200e.c
drivers/block/xsysace.c
drivers/char/Kconfig
drivers/char/hvc_iucv.c
drivers/char/hw_random/n2-drv.c
drivers/char/hw_random/n2rng.h
drivers/char/hw_random/pasemi-rng.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/char/ipmi/ipmi_watchdog.c
drivers/char/n_gsm.c
drivers/char/nozomi.c
drivers/char/rtc.c
drivers/char/xilinx_hwicap/xilinx_hwicap.c
drivers/crypto/amcc/crypto4xx_core.c
drivers/crypto/amcc/crypto4xx_core.h
drivers/crypto/ixp4xx_crypto.c
drivers/crypto/n2_core.c
drivers/crypto/talitos.c
drivers/dma/Kconfig
drivers/dma/fsldma.c
drivers/dma/mpc512x_dma.c
drivers/dma/ppc4xx/adma.c
drivers/dma/shdma.c
drivers/edac/i5000_edac.c
drivers/edac/i5400_edac.c
drivers/edac/mpc85xx_edac.c
drivers/edac/ppc4xx_edac.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpiolib.c
drivers/gpio/max730x.c
drivers/gpio/pcf857x.c
drivers/gpio/stmpe-gpio.c [new file with mode: 0644]
drivers/gpio/sx150x.c [new file with mode: 0644]
drivers/gpio/wm831x-gpio.c
drivers/gpu/drm/ati_pcigart.c
drivers/gpu/drm/drm_bufs.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_edid_modes.h [new file with mode: 0644]
drivers/gpu/drm/drm_fops.c
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/drm_ioctl.c
drivers/gpu/drm/i2c/ch7006_drv.c
drivers/gpu/drm/i2c/ch7006_mode.c
drivers/gpu/drm/i2c/ch7006_priv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_tiling.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_bios.h
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_dp.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_encoder.h
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/nouveau/nouveau_gem.c
drivers/gpu/drm/nouveau/nouveau_hw.c
drivers/gpu/drm/nouveau/nouveau_i2c.c
drivers/gpu/drm/nouveau/nouveau_i2c.h
drivers/gpu/drm/nouveau/nouveau_irq.c
drivers/gpu/drm/nouveau/nouveau_mem.c
drivers/gpu/drm/nouveau/nouveau_reg.h
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/nouveau/nv04_crtc.c
drivers/gpu/drm/nouveau/nv04_dfp.c
drivers/gpu/drm/nouveau/nv04_tv.c
drivers/gpu/drm/nouveau/nv10_graph.c
drivers/gpu/drm/nouveau/nv30_fb.c
drivers/gpu/drm/nouveau/nv50_crtc.c
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/nouveau/nvc0_fb.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvc0_fifo.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvc0_graph.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvc0_instmem.c [new file with mode: 0644]
drivers/gpu/drm/radeon/r600_cp.c
drivers/gpu/drm/radeon/r600_cs.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_clocks.c
drivers/gpu/drm/radeon/radeon_combios.c
drivers/gpu/drm/radeon/radeon_connectors.c
drivers/gpu/drm/radeon/radeon_cs.c
drivers/gpu/drm/radeon/radeon_cursor.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_gem.c
drivers/gpu/drm/radeon/radeon_i2c.c
drivers/gpu/drm/radeon/radeon_kms.c
drivers/gpu/drm/radeon/radeon_mode.h
drivers/gpu/drm/radeon/radeon_pm.c
drivers/gpu/drm/radeon/reg_srcs/rv515
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
drivers/hwmon/ams/ams.h
drivers/hwmon/coretemp.c
drivers/hwmon/mc13783-adc.c
drivers/hwmon/ultra45_env.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-ibm_iic.c
drivers/i2c/busses/i2c-mpc.c
drivers/i2c/busses/i2c-sh_mobile.c
drivers/ide/ide.c
drivers/infiniband/hw/ehca/ehca_classes.h
drivers/infiniband/hw/ehca/ehca_main.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/keyboard/stmpe-keypad.c [new file with mode: 0644]
drivers/input/misc/ati_remote2.c
drivers/input/misc/sparcspkr.c
drivers/input/mouse/psmouse-base.c
drivers/input/serio/i8042-sparcio.h
drivers/input/serio/i8042.c
drivers/input/serio/xilinx_ps2.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/stmpe-ts.c [new file with mode: 0644]
drivers/leds/leds-gpio.c
drivers/macintosh/macio_sysfs.c
drivers/macintosh/smu.c
drivers/macintosh/therm_adt746x.c
drivers/macintosh/therm_pm72.c
drivers/macintosh/therm_windtunnel.c
drivers/media/video/fsl-viu.c
drivers/memstick/core/mspro_block.c
drivers/message/fusion/mptbase.c
drivers/message/fusion/mptbase.h
drivers/message/i2o/exec-osm.c
drivers/message/i2o/i2o_block.c
drivers/message/i2o/i2o_config.c
drivers/message/i2o/i2o_scsi.c
drivers/mfd/88pm860x-core.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/ab3100-otp.c
drivers/mfd/ab3550-core.c
drivers/mfd/ab8500-core.c
drivers/mfd/ab8500-spi.c
drivers/mfd/abx500-core.c
drivers/mfd/davinci_voicecodec.c
drivers/mfd/janz-cmodio.c
drivers/mfd/jz4740-adc.c [new file with mode: 0644]
drivers/mfd/max8925-core.c
drivers/mfd/max8998.c [new file with mode: 0644]
drivers/mfd/mc13783-core.c
drivers/mfd/menelaus.c
drivers/mfd/mfd-core.c
drivers/mfd/stmpe.c [new file with mode: 0644]
drivers/mfd/stmpe.h [new file with mode: 0644]
drivers/mfd/t7l66xb.c
drivers/mfd/tc6387xb.c
drivers/mfd/tc6393xb.c
drivers/mfd/tps6507x.c
drivers/mfd/tps6586x.c [new file with mode: 0644]
drivers/mfd/twl6030-pwm.c [new file with mode: 0644]
drivers/mfd/ucb1400_core.c
drivers/mfd/wm831x-core.c
drivers/mfd/wm8350-core.c
drivers/mfd/wm8994-core.c
drivers/misc/cs5535-mfgpt.c
drivers/misc/lkdtm.c
drivers/mmc/card/block.c
drivers/mmc/card/mmc_test.c
drivers/mmc/card/queue.c
drivers/mmc/core/bus.c
drivers/mmc/core/core.c
drivers/mmc/core/core.h
drivers/mmc/core/host.c
drivers/mmc/core/mmc.c
drivers/mmc/core/sd.c
drivers/mmc/core/sd.h [new file with mode: 0644]
drivers/mmc/core/sd_ops.c
drivers/mmc/core/sd_ops.h
drivers/mmc/core/sdio.c
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
drivers/mmc/host/mmc_spi.c
drivers/mmc/host/msm_sdcc.c
drivers/mmc/host/msm_sdcc.h
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/sdhci-cns3xxx.c [new file with mode: 0644]
drivers/mmc/host/sdhci-of-core.c
drivers/mmc/host/sdhci-pci.c
drivers/mmc/host/sdhci-pltfm.c
drivers/mmc/host/sdhci-pltfm.h [new file with mode: 0644]
drivers/mmc/host/sdhci-s3c.c
drivers/mmc/host/sdhci.c
drivers/mmc/host/sdhci.h
drivers/mtd/maps/physmap_of.c
drivers/mtd/maps/sun_uflash.c
drivers/mtd/nand/fsl_elbc_nand.c
drivers/mtd/nand/fsl_upm.c
drivers/mtd/nand/mpc5121_nfc.c
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/ndfc.c
drivers/mtd/nand/pasemi_nand.c
drivers/mtd/nand/socrates_nand.c
drivers/net/arm/ixp4xx_eth.c
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/can/sja1000/sja1000_of_platform.c
drivers/net/ehea/ehea.h
drivers/net/ehea/ehea_main.c
drivers/net/fec_mpc52xx.c
drivers/net/fec_mpc52xx_phy.c
drivers/net/fs_enet/fs_enet-main.c
drivers/net/fs_enet/mac-fcc.c
drivers/net/fs_enet/mac-fec.c
drivers/net/fs_enet/mac-scc.c
drivers/net/fs_enet/mii-bitbang.c
drivers/net/fs_enet/mii-fec.c
drivers/net/fsl_pq_mdio.c
drivers/net/gianfar.c
drivers/net/gianfar.h
drivers/net/greth.c
drivers/net/greth.h
drivers/net/ibm_newemac/core.c
drivers/net/ibm_newemac/core.h
drivers/net/ibm_newemac/mal.c
drivers/net/ibm_newemac/mal.h
drivers/net/ibm_newemac/rgmii.c
drivers/net/ibm_newemac/rgmii.h
drivers/net/ibm_newemac/tah.c
drivers/net/ibm_newemac/tah.h
drivers/net/ibm_newemac/zmii.c
drivers/net/ibm_newemac/zmii.h
drivers/net/irda/sh_irda.c
drivers/net/ll_temac_main.c
drivers/net/myri10ge/myri10ge.c
drivers/net/myri_sbus.c
drivers/net/myri_sbus.h
drivers/net/niu.c
drivers/net/phy/mdio-gpio.c
drivers/net/sunbmac.c
drivers/net/sunbmac.h
drivers/net/sunhme.c
drivers/net/sunhme.h
drivers/net/sunlance.c
drivers/net/sunqe.c
drivers/net/sunqe.h
drivers/net/ucc_geth.c
drivers/net/wan/ixp4xx_hss.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas_tf/if_usb.c
drivers/net/xilinx_emaclite.c
drivers/of/device.c
drivers/parport/parport_serial.c
drivers/parport/parport_sunbpp.c
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile
drivers/pcmcia/electra_cf.c
drivers/pcmcia/m8xx_pcmcia.c
drivers/pcmcia/pxa2xx_balloon3.c [new file with mode: 0644]
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/intel_mid_battery.c [new file with mode: 0644]
drivers/power/olpc_battery.c
drivers/power/s3c_adc_battery.c [new file with mode: 0644]
drivers/power/wm97xx_battery.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/ab8500.c [new file with mode: 0644]
drivers/regulator/ad5398.c [new file with mode: 0644]
drivers/regulator/isl6271a-regulator.c [new file with mode: 0644]
drivers/regulator/lp3971.c
drivers/regulator/max1586.c
drivers/regulator/max8660.c
drivers/regulator/max8998.c [new file with mode: 0644]
drivers/regulator/tps65023-regulator.c
drivers/regulator/tps6507x-regulator.c
drivers/regulator/tps6586x-regulator.c [new file with mode: 0644]
drivers/regulator/wm8994-regulator.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/rtc/rtc-cmos.c
drivers/rtc/rtc-ds3232.c [new file with mode: 0644]
drivers/rtc/rtc-fm3130.c
drivers/rtc/rtc-imxdi.c [new file with mode: 0644]
drivers/rtc/rtc-isl12022.c [new file with mode: 0644]
drivers/rtc/rtc-m41t80.c
drivers/rtc/rtc-m48t59.c
drivers/rtc/rtc-m48t86.c
drivers/rtc/rtc-max6900.c
drivers/rtc/rtc-mpc5121.c
drivers/rtc/rtc-mxc.c
drivers/rtc/rtc-nuc900.c
drivers/rtc/rtc-pcf8563.c
drivers/rtc/rtc-pl031.c
drivers/rtc/rtc-pxa.c
drivers/rtc/rtc-rp5c01.c
drivers/rtc/rtc-s3c.c
drivers/sbus/char/bbc_envctrl.c
drivers/sbus/char/bbc_i2c.c
drivers/sbus/char/bbc_i2c.h
drivers/sbus/char/display7seg.c
drivers/sbus/char/envctrl.c
drivers/sbus/char/flash.c
drivers/sbus/char/uctrl.c
drivers/scsi/53c700.c
drivers/scsi/Kconfig
drivers/scsi/NCR5380.c
drivers/scsi/aacraid/rx.c
drivers/scsi/aic94xx/aic94xx_init.c
drivers/scsi/bfa/bfa_fcport.c
drivers/scsi/bfa/bfad.c
drivers/scsi/bfa/bfad_im.c
drivers/scsi/bfa/include/protocol/fcp.h
drivers/scsi/bnx2i/Kconfig
drivers/scsi/ch.c
drivers/scsi/dc395x.c
drivers/scsi/fnic/fnic.h
drivers/scsi/g_NCR5380.c
drivers/scsi/g_NCR5380.h
drivers/scsi/gdth.c
drivers/scsi/initio.c
drivers/scsi/lpfc/lpfc_attr.c
drivers/scsi/osst.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qlogicpti.c
drivers/scsi/qlogicpti.h
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_transport_fc.c
drivers/scsi/sd.c
drivers/scsi/sg.c
drivers/scsi/sun_esp.c
drivers/serial/Kconfig
drivers/serial/apbuart.c
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/serial/mpc52xx_uart.c
drivers/serial/nwpserial.c
drivers/serial/of_serial.c
drivers/serial/s5pv210.c
drivers/serial/samsung.c
drivers/serial/sh-sci.c
drivers/serial/sh-sci.h
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/serial/uartlite.c
drivers/serial/ucc_uart.c
drivers/sh/Makefile
drivers/sh/clk-cpg.c
drivers/spi/mpc512x_psc_spi.c
drivers/spi/mpc52xx_psc_spi.c
drivers/spi/mpc52xx_spi.c
drivers/spi/spi_mpc8xxx.c
drivers/spi/spi_ppc4xx.c
drivers/spi/xilinx_spi_of.c
drivers/staging/rtl8187se/r8180_core.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/rtl8192su/r8192U_core.c
drivers/usb/atm/ueagle-atm.c
drivers/usb/gadget/fsl_qe_udc.c
drivers/usb/host/ehci-ppc-of.c
drivers/usb/host/ehci-xilinx-of.c
drivers/usb/host/fhci-hcd.c
drivers/usb/host/isp1760-if.c
drivers/usb/host/ohci-ppc-of.c
drivers/video/Kconfig
drivers/video/Makefile
drivers/video/bw2.c
drivers/video/cg14.c
drivers/video/cg3.c
drivers/video/cg6.c
drivers/video/console/bitblit.c
drivers/video/console/fbcon.c
drivers/video/console/fbcon_ccw.c
drivers/video/console/fbcon_cw.c
drivers/video/console/fbcon_ud.c
drivers/video/efifb.c
drivers/video/fbmem.c
drivers/video/ffb.c
drivers/video/fsl-diu-fb.c
drivers/video/igafb.c
drivers/video/imxfb.c
drivers/video/leo.c
drivers/video/mb862xx/mb862xxfb.c
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/p9100.c
drivers/video/platinumfb.c
drivers/video/s3c-fb.c
drivers/video/sh_mipi_dsi.c [new file with mode: 0644]
drivers/video/sh_mobile_hdmi.c [new file with mode: 0644]
drivers/video/sh_mobile_lcdcfb.c
drivers/video/sunxvr1000.c
drivers/video/tcx.c
drivers/video/uvesafb.c
drivers/video/vt8623fb.c
drivers/video/xilinxfb.c
drivers/watchdog/cpwd.c
drivers/watchdog/gef_wdt.c
drivers/watchdog/mpc8xxx_wdt.c
drivers/watchdog/riowd.c
drivers/xen/Kconfig
drivers/xen/Makefile
drivers/xen/balloon.c
drivers/xen/swiotlb-xen.c [new file with mode: 0644]
fs/9p/vfs_inode.c
fs/afs/internal.h
fs/afs/rxrpc.c
fs/autofs4/root.c
fs/block_dev.c
fs/cachefiles/daemon.c
fs/cachefiles/internal.h
fs/ceph/Makefile
fs/ceph/addr.c
fs/ceph/armor.c
fs/ceph/auth.c
fs/ceph/auth_x.c
fs/ceph/buffer.c
fs/ceph/caps.c
fs/ceph/ceph_frag.h
fs/ceph/ceph_fs.c
fs/ceph/ceph_fs.h
fs/ceph/ceph_hash.h
fs/ceph/ceph_strings.c
fs/ceph/crush/crush.h
fs/ceph/crush/hash.h
fs/ceph/crush/mapper.h
fs/ceph/crypto.c
fs/ceph/crypto.h
fs/ceph/debugfs.c
fs/ceph/decode.h
fs/ceph/dir.c
fs/ceph/file.c
fs/ceph/inode.c
fs/ceph/ioctl.c
fs/ceph/ioctl.h
fs/ceph/locks.c [new file with mode: 0644]
fs/ceph/mds_client.c
fs/ceph/mds_client.h
fs/ceph/mdsmap.c
fs/ceph/mdsmap.h
fs/ceph/messenger.c
fs/ceph/mon_client.c
fs/ceph/mon_client.h
fs/ceph/msgr.h
fs/ceph/osd_client.c
fs/ceph/osdmap.c
fs/ceph/rados.h
fs/ceph/super.c
fs/ceph/super.h
fs/ceph/xattr.c
fs/dcache.c
fs/exofs/file.c
fs/exofs/inode.c
fs/exofs/ios.c
fs/exofs/super.c
fs/fcntl.c
fs/file.c
fs/file_table.c
fs/fs-writeback.c
fs/fs_struct.c
fs/fscache/internal.h
fs/isofs/inode.c
fs/namei.c
fs/namespace.c
fs/nfs/callback.c
fs/open.c
fs/partitions/acorn.c
fs/partitions/amiga.c
fs/partitions/atari.c
fs/partitions/check.c
fs/partitions/check.h
fs/partitions/efi.c
fs/partitions/ibm.c
fs/partitions/karma.c
fs/partitions/ldm.c
fs/partitions/mac.c
fs/partitions/msdos.c
fs/partitions/osf.c
fs/partitions/sgi.c
fs/partitions/sun.c
fs/partitions/sysv68.c
fs/partitions/ultrix.c
fs/proc/Makefile
fs/proc/base.c
fs/reiserfs/journal.c
fs/signalfd.c
fs/squashfs/Kconfig
fs/squashfs/Makefile
fs/squashfs/decompressor.c
fs/squashfs/lzo_wrapper.c [new file with mode: 0644]
fs/squashfs/squashfs.h
fs/squashfs/squashfs_fs.h
fs/squashfs/xattr.c
fs/squashfs/xattr.h
fs/sysv/super.c
include/acpi/platform/aclinux.h
include/asm-generic/dma-mapping-broken.h
include/asm-generic/fcntl.h
include/drm/drmP.h
include/drm/drm_core.h
include/drm/drm_crtc.h
include/drm/drm_edid.h
include/linux/backing-dev.h
include/linux/blk_types.h
include/linux/blkdev.h
include/linux/dcache.h
include/linux/dma-mapping.h
include/linux/fs.h
include/linux/fs_struct.h
include/linux/i2c/sx150x.h [new file with mode: 0644]
include/linux/io-mapping.h
include/linux/jz4740-adc.h [new file with mode: 0644]
include/linux/kernel.h
include/linux/kfifo.h
include/linux/memcontrol.h
include/linux/mfd/ab8500.h
include/linux/mfd/max8998-private.h [new file with mode: 0644]
include/linux/mfd/max8998.h [new file with mode: 0644]
include/linux/mfd/mc13783-private.h [deleted file]
include/linux/mfd/mc13783.h
include/linux/mfd/stmpe.h [new file with mode: 0644]
include/linux/mfd/tps6586x.h [new file with mode: 0644]
include/linux/mfd/wm8994/gpio.h
include/linux/mmc/card.h
include/linux/mmc/core.h
include/linux/mmc/host.h
include/linux/mmc/mmc.h
include/linux/mmc/sd.h
include/linux/moduleparam.h
include/linux/mount.h
include/linux/of_device.h
include/linux/of_platform.h
include/linux/oom.h
include/linux/path.h
include/linux/regulator/ab8500.h [new file with mode: 0644]
include/linux/s3c_adc_battery.h [new file with mode: 0644]
include/linux/serial_core.h
include/linux/sh_clk.h
include/linux/slab_def.h
include/linux/slob_def.h
include/linux/slub_def.h
include/linux/spi/max7301.h
include/linux/swap.h
include/linux/sysv_fs.h
include/linux/time.h
include/linux/vgaarb.h
include/linux/virtio_9p.h
include/linux/vmalloc.h
include/linux/wm97xx_batt.h [deleted file]
include/linux/writeback.h
include/scsi/scsi.h
include/scsi/scsi_netlink.h
include/video/mipi_display.h [new file with mode: 0644]
include/video/sh_mipi_dsi.h [new file with mode: 0644]
include/video/sh_mobile_hdmi.h [new file with mode: 0644]
include/video/sh_mobile_lcdc.h
include/xen/interface/memory.h
include/xen/swiotlb-xen.h [new file with mode: 0644]
include/xen/xen-ops.h
init/Kconfig
init/main.c
kernel/auditsc.c
kernel/cgroup.c
kernel/cred.c
kernel/exit.c
kernel/kexec.c
kernel/kfifo.c
kernel/panic.c
kernel/params.c
kernel/pid.c
kernel/ptrace.c
kernel/time/timekeeping.c
kernel/trace/blktrace.c
lib/bug.c
lib/decompress_bunzip2.c
lib/inflate.c
mm/backing-dev.c
mm/memcontrol.c
mm/oom_kill.c
mm/page-writeback.c
mm/vmalloc.c
mm/vmscan.c
net/mac80211/rate.c
net/rxrpc/ar-internal.h
net/sunrpc/auth.c
net/sunrpc/xprtsock.c
samples/Kconfig
samples/Makefile
samples/kfifo/Makefile [new file with mode: 0644]
samples/kfifo/bytestream-example.c [new file with mode: 0644]
samples/kfifo/dma-example.c [new file with mode: 0644]
samples/kfifo/inttype-example.c [new file with mode: 0644]
samples/kfifo/record-example.c [new file with mode: 0644]
scripts/kernel-doc
scripts/mod/modpost.c
security/apparmor/lsm.c
security/keys/internal.h
sound/aoa/soundbus/core.c
sound/aoa/soundbus/soundbus.h
sound/aoa/soundbus/sysfs.c
sound/oss/ad1848.c
sound/oss/au1550_ac97.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.h
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_nvhdmi.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c
sound/soc/blackfin/Kconfig
sound/soc/blackfin/bf5xx-ad1980.c
sound/soc/codecs/ad1980.c
sound/soc/codecs/ad1980.h
sound/soc/codecs/wm8580.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc5200_psc_ac97.c
sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/imx/Kconfig
sound/soc/soc-cache.c
sound/sparc/amd7930.c
sound/sparc/cs4231.c
sound/sparc/dbri.c

index 5405f7aecefc334b7d16c0f2764a8757e845ad43..8dfc6708a257219d5a39ef1fd1021064cb29d553 100644 (file)
@@ -130,8 +130,6 @@ edac.txt
        - information on EDAC - Error Detection And Correction
 eisa.txt
        - info on EISA bus support.
-exception.txt
-       - how Linux v2.2 handles exceptions without verify_area etc.
 fault-injection/
        - dir with docs about the fault injection capabilities infrastructure.
 fb/
@@ -234,6 +232,8 @@ memory.txt
        - info on typical Linux memory problems.
 mips/
        - directory with info about Linux on MIPS architecture.
+mmc/
+       - directory with info about the MMC subsystem
 mono.txt
        - how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
 mutex-design.txt
index 98ce51796f711317f567a3b5144955178d0fd8da..3c4e07123e59a6d441319a4f96cbf2730e4fde1c 100644 (file)
@@ -753,6 +753,16 @@ to "Closing".
    alignment constraints (e.g. the alignment constraints about 64-bit
    objects).
 
+3) Supporting multiple types of IOMMUs
+
+   If your architecture needs to support multiple types of IOMMUs, you
+   can use include/linux/asm-generic/dma-mapping-common.h. It's a
+   library to support the DMA API with multiple types of IOMMUs. Lots
+   of architectures (x86, powerpc, sh, alpha, ia64, microblaze and
+   sparc) use it. Choose one to see how it can be used. If you need to
+   support multiple types of IOMMUs in a single system, the example of
+   x86 or powerpc helps.
+
                           Closing
 
 This document, and the API itself, would not be in its current
index 05e2ae236865edf6b56e2357c6089432793be077..fe2326906610d15c25b928000d343b7917046bce 100644 (file)
@@ -455,12 +455,6 @@ Free memory allocated by the nonconsistent API.  All parameters must
 be identical to those passed in (and returned by
 dma_alloc_noncoherent()).
 
-int
-dma_is_consistent(struct device *dev, dma_addr_t dma_handle)
-
-Returns true if the device dev is performing consistent DMA on the memory
-area pointed to by the dma_handle.
-
 int
 dma_get_cache_alignment(void)
 
index 4b603c5c3cc163ba90e7f5b6821d35609fc8e8f0..34929f24c2846010bded3b426f20cdb54d4abc57 100644 (file)
@@ -35,7 +35,7 @@ PS_METHOD     = $(prefer-db2x)
 PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS) xmldoclinks
+xmldocs: $(BOOKS)
 sgmldocs: xmldocs
 
 PS := $(patsubst %.xml, %.ps, $(BOOKS))
@@ -95,7 +95,7 @@ define rule_docproc
         ) > $(dir $@).$(notdir $@).cmd
 endef
 
-%.xml: %.tmpl FORCE
+%.xml: %.tmpl xmldoclinks FORCE
        $(call if_changed_rule,docproc)
 
 ###
index 44b3def961a24c85ead76a4ed713a1675dd28e58..a20c6f6fffc32aabb214c24ff9f53d477a265f69 100644 (file)
@@ -132,7 +132,6 @@ X!Ilib/string.c
      <title>FIFO Buffer</title>
      <sect1><title>kfifo interface</title>
 !Iinclude/linux/kfifo.h
-!Ekernel/kfifo.c
      </sect1>
   </chapter>
 
index a99d7031cdf978f321dce744a3a1f22d0bf7206e..45d5a217484f76b12e03bae77d93ef3eb44fe374 100644 (file)
@@ -2,7 +2,7 @@
 
                Maintainers:
                CPU Hotplug Core:
-                       Rusty Russell <rusty@rustycorp.com.au>
+                       Rusty Russell <rusty@rustcorp.com.au>
                        Srivatsa Vaddagiri <vatsa@in.ibm.com>
                i386:
                        Zwane Mwaikambo <zwane@arm.linux.org.uk>
index b16cbe4152ea3560e32a98624c53cc77b22fc659..842aa9de84a603298f74f9f4b8c036e0104001cf 100644 (file)
@@ -547,3 +547,20 @@ Why:       superseded by acpi_sleep=nonvs
 Who:   Rafael J. Wysocki <rjw@sisk.pl>
 
 ----------------------------
+
+What:  PCI DMA unmap state API
+When:  August 2012
+Why:   PCI DMA unmap state API (include/linux/pci-dma.h) was replaced
+       with DMA unmap state API (DMA unmap state API can be used for
+       any bus).
+Who:   FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
+
+----------------------------
+
+What:  DMA_xxBIT_MASK macros
+When:  Jun 2011
+Why:   DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
+Who:   FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
+
+----------------------------
+
index 203f7202cc9e3439607d4131b5b0196b83ab7ea1..66699afd66cad8bd1941a2a5b2de8cee360767b5 100644 (file)
@@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM
 =======================
 
 Squashfs is a compressed read-only filesystem for Linux.
-It uses zlib compression to compress files, inodes and directories.
+It uses zlib/lzo compression to compress files, inodes and directories.
 Inodes in the system are very small and all blocks are packed to minimise
 data overhead. Block sizes greater than 4K are supported up to a maximum
 of 1Mbytes (default block size 128K).
index c2c6e9b39bbe39e747fbfe7ffed869bff9cdfff7..d96a6dba57489bc6bbf3e747d82cd450084e5609 100644 (file)
@@ -158,10 +158,11 @@ and configure pullups/pulldowns appropriately.)
 Spinlock-Safe GPIO access
 -------------------------
 Most GPIO controllers can be accessed with memory read/write instructions.
-That doesn't need to sleep, and can safely be done from inside IRQ handlers.
-(That includes hardirq contexts on RT kernels.)
+Those don't need to sleep, and can safely be done from inside hard
+(nonthreaded) IRQ handlers and similar contexts.
 
-Use these calls to access such GPIOs:
+Use the following calls to access such GPIOs,
+for which gpio_cansleep() will always return false (see below):
 
        /* GPIO INPUT:  return zero or nonzero */
        int gpio_get_value(unsigned gpio);
@@ -210,9 +211,31 @@ To access such GPIOs, a different set of accessors is defined:
        /* GPIO OUTPUT, might sleep */
        void gpio_set_value_cansleep(unsigned gpio, int value);
 
-Other than the fact that these calls might sleep, and will not be ignored
-for GPIOs that can't be accessed from IRQ handlers, these calls act the
-same as the spinlock-safe calls.
+
+Accessing such GPIOs requires a context which may sleep,  for example
+a threaded IRQ handler, and those accessors must be used instead of
+spinlock-safe accessors without the cansleep() name suffix.
+
+Other than the fact that these accessors might sleep, and will work
+on GPIOs that can't be accessed from hardIRQ handlers, these calls act
+the same as the spinlock-safe calls.
+
+  ** IN ADDITION ** calls to setup and configure such GPIOs must be made
+from contexts which may sleep, since they may need to access the GPIO
+controller chip too:  (These setup calls are usually made from board
+setup or driver probe/teardown code, so this is an easy constraint.)
+
+       gpio_direction_input()
+       gpio_direction_output()
+       gpio_request()
+
+##     gpio_request_one()
+##     gpio_request_array()
+##     gpio_free_array()
+
+       gpio_free()
+       gpio_set_debounce()
+
 
 
 Claiming and Releasing GPIOs
index d529b1363e95b633a39e22a8e442a7806921789d..873b68090098459a3fd0983793c9005d59727f77 100644 (file)
@@ -915,9 +915,6 @@ and is between 256 and 4096 characters. It is defined in the file
                             controller
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
                             controllers
-       i8042.panicblink=
-                       [HW] Frequency with which keyboard LEDs should blink
-                            when kernel panics (default is 0.5 sec)
        i8042.reset     [HW] Reset the controller during init and cleanup
        i8042.unlock    [HW] Unlock (ignore) the keylock
 
diff --git a/Documentation/mmc/00-INDEX b/Documentation/mmc/00-INDEX
new file mode 100644 (file)
index 0000000..fca586f
--- /dev/null
@@ -0,0 +1,4 @@
+00-INDEX
+        - this file
+mmc-dev-attrs.txt
+        - info on SD and MMC device attributes
diff --git a/Documentation/mmc/mmc-dev-attrs.txt b/Documentation/mmc/mmc-dev-attrs.txt
new file mode 100644 (file)
index 0000000..ff2bd68
--- /dev/null
@@ -0,0 +1,56 @@
+SD and MMC Device Attributes
+============================
+
+All attributes are read-only.
+
+       cid                     Card Identifaction Register
+       csd                     Card Specific Data Register
+       scr                     SD Card Configuration Register (SD only)
+       date                    Manufacturing Date (from CID Register)
+       fwrev                   Firmware/Product Revision (from CID Register) (SD and MMCv1 only)
+       hwrev                   Hardware/Product Revision (from CID Register) (SD and MMCv1 only)
+       manfid                  Manufacturer ID (from CID Register)
+       name                    Product Name (from CID Register)
+       oemid                   OEM/Application ID (from CID Register)
+       serial                  Product Serial Number (from CID Register)
+       erase_size              Erase group size
+       preferred_erase_size    Preferred erase size
+
+Note on Erase Size and Preferred Erase Size:
+
+       "erase_size" is the  minimum size, in bytes, of an erase
+       operation.  For MMC, "erase_size" is the erase group size
+       reported by the card.  Note that "erase_size" does not apply
+       to trim or secure trim operations where the minimum size is
+       always one 512 byte sector.  For SD, "erase_size" is 512
+       if the card is block-addressed, 0 otherwise.
+
+       SD/MMC cards can erase an arbitrarily large area up to and
+       including the whole card.  When erasing a large area it may
+       be desirable to do it in smaller chunks for three reasons:
+               1. A single erase command will make all other I/O on
+               the card wait.  This is not a problem if the whole card
+               is being erased, but erasing one partition will make
+               I/O for another partition on the same card wait for the
+               duration of the erase - which could be a several
+               minutes.
+               2. To be able to inform the user of erase progress.
+               3. The erase timeout becomes too large to be very
+               useful.  Because the erase timeout contains a margin
+               which is multiplied by the size of the erase area,
+               the value can end up being several minutes for large
+               areas.
+
+       "erase_size" is not the most efficient unit to erase
+       (especially for SD where it is just one sector),
+       hence "preferred_erase_size" provides a good chunk
+       size for erasing large areas.
+
+       For MMC, "preferred_erase_size" is the high-capacity
+       erase size if a card specifies one, otherwise it is
+       based on the capacity of the card.
+
+       For SD, "preferred_erase_size" is the allocation unit
+       size specified by the card.
+
+       "preferred_erase_size" is in bytes.
diff --git a/Documentation/networking/wavelan.txt b/Documentation/networking/wavelan.txt
deleted file mode 100644 (file)
index 90e0ac4..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-       The Wavelan drivers saga
-       ------------------------
-
-       By Jean Tourrilhes <jt@hpl.hp.com>
-
-       The Wavelan is a Radio network adapter designed by
-Lucent. Under this generic name is hidden quite a variety of hardware,
-and many Linux driver to support it.
-       The get the full story on Wireless LANs, please consult :
-               http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-
-"wavelan" driver (old ISA Wavelan)
-----------------
-       o Config :      Network device -> Wireless LAN -> AT&T WaveLAN
-       o Location :    .../drivers/net/wireless/wavelan*
-       o in-line doc : .../drivers/net/wireless/wavelan.p.h
-       o on-line doc :
-           http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html
-
-       This is the driver for the ISA version of the first generation
-of the Wavelan, now discontinued. The device is 2 Mb/s, composed of a
-Intel 82586 controller and a Lucent Modem, and is NOT 802.11 compliant.
-       The driver has been tested with the following hardware :
-       o Wavelan ISA 915 MHz (full length ISA card) 
-       o Wavelan ISA 915 MHz 2.0 (half length ISA card) 
-       o Wavelan ISA 2.4 GHz (full length ISA card, fixed frequency) 
-       o Wavelan ISA 2.4 GHz 2.0 (half length ISA card, frequency selectable) 
-       o Above cards with the optional DES encryption feature 
-
-"wavelan_cs" driver (old Pcmcia Wavelan)
--------------------
-       o Config :      Network device -> PCMCIA network ->
-                               Pcmcia Wireless LAN -> AT&T/Lucent WaveLAN
-       o Location :    .../drivers/net/pcmcia/wavelan*
-       o in-line doc : .../drivers/net/pcmcia/wavelan_cs.h
-       o on-line doc :
-           http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html
-
-       This is the driver for the PCMCIA version of the first
-generation of the Wavelan, now discontinued. The device is 2 Mb/s,
-composed of a Intel 82593 controller (totally different from the 82586)
-and a Lucent Modem, and NOT 802.11 compatible.
-       The driver has been tested with the following hardware :
-       o Wavelan Pcmcia 915 MHz 2.0 (Pcmcia card + separate
-                                       modem/antenna block) 
-       o Wavelan Pcmcia 2.4 GHz 2.0 (Pcmcia card + separate
-                                       modem/antenna block) 
-
-"wvlan_cs" driver (Wavelan IEEE, GPL)
------------------
-       o Config :      Not yet in kernel
-       o Location :    Pcmcia package 3.1.10+
-       o on-line doc :
-       http://web.archive.org/web/*/http://www.fasta.fh-dortmund.de/users/andy/wvlan/  
-
-       This is the driver for the current generation of Wavelan IEEE,
-which is 802.11 compatible. Depending on version, it is 2 Mb/s or 11
-Mb/s, with or without encryption, all implemented in Lucent specific
-DSP (the Hermes).
-       This is a GPL full source PCMCIA driver (ISA is just a Pcmcia
-card with ISA-Pcmcia bridge).
-
-"wavelan2_cs" driver (Wavelan IEEE, binary)
---------------------
-       o Config :      Not yet in kernel
-       o Location :    ftp://sourceforge.org/pcmcia/contrib/
-
-       This driver support exactly the same hardware as the previous
-driver, the main difference is that it is based on a binary library
-and supported by Lucent.
-
-       I hope it clears the confusion ;-)
-
-       Jean
index 473ebf22cd6987b04abf840e0ed1f87f8152a06b..7ddfe216a0aa787a52421de6dc8ebc0f3b9002b2 100644 (file)
@@ -19,7 +19,7 @@ overall control of how tasks are to be run:
 
 The pcpumask describes which processors will be used to execute work
 submitted to this instance in parallel. The cbcpumask defines which
-processors are allowed to use as the serialization callback processor.
+processors are allowed to be used as the serialization callback processor.
 The workqueue wq is where the work will actually be done; it should be
 a multithreaded queue, naturally.
 
@@ -30,10 +30,10 @@ cpumasks this helper function can be used:
 
 Note: Padata maintains two kinds of cpumasks internally. The user supplied
 cpumasks, submitted by padata_alloc/padata_alloc_possible and the 'usable'
-cpumasks. The usable cpumasks are always the subset of active cpus in the
-user supplied cpumasks, these are the cpumasks padata actually use. So
-it is legal to supply a cpumask to padata that contains offline cpus.
-Once a offline cpu in the user supplied cpumask comes online, padata
+cpumasks. The usable cpumasks are always a subset of active CPUs in the
+user supplied cpumasks; these are the cpumasks padata actually uses. So
+it is legal to supply a cpumask to padata that contains offline CPUs.
+Once an offline CPU in the user supplied cpumask comes online, padata
 is going to use it.
 
 There are functions for enabling and disabling the instance:
@@ -44,7 +44,7 @@ There are functions for enabling and disabling the instance:
 These functions are setting or clearing the "PADATA_INIT" flag;
 if that flag is not set, other functions will refuse to work.
 padata_start returns zero on success (flag set) or -EINVAL if the
-padata cpumask contains no active cpu (flag not set).
+padata cpumask contains no active CPU (flag not set).
 padata_stop clears the flag and blocks until the padata instance
 is unused.
 
@@ -63,11 +63,11 @@ done with great frequency.
 
 It's possible to change both cpumasks of a padata instance with
 padata_set_cpumasks by specifying the cpumasks for parallel execution (pcpumask)
-and for the serial callback function (cbcpumask). padata_set_cpumask is to
+and for the serial callback function (cbcpumask). padata_set_cpumask is used to
 change just one of the cpumasks. Here cpumask_type is one of PADATA_CPU_SERIAL,
 PADATA_CPU_PARALLEL and cpumask specifies the new cpumask to use.
-To simply add or remove one cpu from a certain cpumask the functions
-padata_add_cpu/padata_remove_cpu are used. cpu specifies the cpu to add or
+To simply add or remove one CPU from a certain cpumask the functions
+padata_add_cpu/padata_remove_cpu are used. cpu specifies the CPU to add or
 remove and mask is one of PADATA_CPU_SERIAL, PADATA_CPU_PARALLEL.
 
 If a user is interested in padata cpumask changes, he can register to
@@ -82,7 +82,7 @@ To unregister from that notifier:
                                           struct notifier_block *nblock);
 
 The padata cpumask change notifier notifies about changes of the usable
-cpumasks, i.e. the subset of active cpus in the user supplied cpumask.
+cpumasks, i.e. the subset of active CPUs in the user supplied cpumask.
 
 Padata calls the notifier chain with:
 
@@ -92,7 +92,7 @@ Padata calls the notifier chain with:
 
 Here cpumask_change_notifier is registered notifier, notification_mask
 is one of PADATA_CPU_SERIAL, PADATA_CPU_PARALLEL and cpumask is a pointer
-to a struct padata_cpumask that contains the new cpumask informations.
+to a struct padata_cpumask that contains the new cpumask information.
 
 Actually submitting work to the padata instance requires the creation of a
 padata_priv structure:
@@ -104,7 +104,7 @@ padata_priv structure:
     };
 
 This structure will almost certainly be embedded within some larger
-structure specific to the work to be done.  Most its fields are private to
+structure specific to the work to be done.  Most of its fields are private to
 padata, but the structure should be zeroed at initialisation time, and the
 parallel() and serial() functions should be provided.  Those functions will
 be called in the process of getting the work done as we will see
index 8a0040738969a222ad1b77527fb053196aff537c..64bcb8be973c0574ee0b835b2698f7d7501d8ff3 100644 (file)
@@ -14,6 +14,8 @@ Required properties:
     reports inverted write-protect state;
   - sdhci,1-bit-only : (optional) specifies that a controller can
     only handle 1-bit data transfers.
+  - sdhci,auto-cmd12: (optional) specifies that a controller can
+    only handle auto CMD12.
 
 Example:
 
index 03771d7c5dd7c05448a5612d7ee87250ba37bbf9..ce46fa1e643e876344071d480e1e6d6d54b89856 100644 (file)
@@ -83,8 +83,8 @@ ALC269
 ======
   basic                Basic preset
   quanta       Quanta FL1
-  eeepc-p703   ASUS Eeepc P703 P900A
-  eeepc-p901   ASUS Eeepc P901 S101
+  laptop-amic  Laptops with analog-mic input
+  laptop-dmic  Laptops with digital-mic input
   fujitsu      FSC Amilo
   lifebook     Fujitsu Lifebook S6420
   auto         auto-config reading BIOS (default)
@@ -109,6 +109,8 @@ ALC662/663/272
   asus-mode4   ASUS
   asus-mode5   ASUS
   asus-mode6   ASUS
+  asus-mode7   ASUS
+  asus-mode8   ASUS
   dell         Dell with ALC272
   dell-zm1     Dell ZM1 with ALC272
   samsung-nc10 Samsung NC10 mini notebook
@@ -295,8 +297,10 @@ Conexant 5066
 =============
   laptop       Basic Laptop config (default)
   dell-laptop  Dell laptops
+  dell-vostro  Dell Vostro
   olpc-xo-1_5  OLPC XO 1.5
   ideapad       Lenovo IdeaPad U150
+  thinkpad     Lenovo Thinkpad
 
 STAC9200
 ========
@@ -404,6 +408,7 @@ STAC92HD83*
   mic-ref      Reference board with power management for ports
   dell-s14     Dell laptop
   hp           HP laptops with (inverted) mute-LED
+  hp-dv7-4000  HP dv-7 4000
   auto         BIOS setup (default)
 
 STAC9872
@@ -416,3 +421,7 @@ Cirrus Logic CS4206/4207
   mbp55                MacBook Pro 5,5
   imac27       IMac 27 Inch
   auto         BIOS setup (default)
+
+VIA VT17xx/VT18xx/VT20xx
+========================
+  auto         BIOS setup (default)
index 89399474d91f188826df41fbff753721d3448a0f..39d8c5ce99139dd23c7435263ce68d1ebcf2095b 100644 (file)
@@ -616,10 +616,10 @@ M:        Richard Purdie <rpurdie@rpsys.net>
 S:     Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
-M:     Paulius Zaleckas <paulius.zaleckas@gmail.com>
+M:     Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:     git git://gitorious.org/linux-gemini/mainline.git
-S:     Odd Fixes
+T:     git git://git.berlios.de/gemini-board
+S:     Maintained
 F:     arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -641,9 +641,10 @@ T: topgit git://git.openezx.org/openezx.git
 F:     arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
-M:     Paulius Zaleckas <paulius.zaleckas@gmail.com>
+M:     Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Odd Fixes
+S:     Maintained
+T:     git://git.berlios.de/gemini-board
 F:     arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
@@ -692,6 +693,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
 F:     arch/arm/mach-sa1100/jornada720.c
 F:     arch/arm/mach-sa1100/include/mach/jornada720.h
 
+ARM/INCOME PXA270 SUPPORT
+M:     Marek Vasut <marek.vasut@gmail.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-pxa/income.c
+F:     arch/arm/mach-pxa/include/mach-pxa/income.h
+
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 M:     Dan Williams <dan.j.williams@intel.com>
@@ -947,8 +955,9 @@ ARM/SHMOBILE ARM ARCHITECTURE
 M:     Paul Mundt <lethal@linux-sh.org>
 M:     Magnus Damm <magnus.damm@gmail.com>
 L:     linux-sh@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 W:     http://oss.renesas.com
+Q:     http://patchwork.kernel.org/project/linux-sh/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 S:     Supported
 F:     arch/arm/mach-shmobile/
 F:     drivers/sh/
index 1bce8169733cd0ef5790427edc4f7aa206adac5d..4567aca6fdd6ef32e3730c60fa725b98f299d8aa 100644 (file)
@@ -41,9 +41,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
 
 #define dma_alloc_noncoherent(d, s, h, f)      dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h)       dma_free_coherent(d, s, v, h)
-#define dma_is_consistent(d, h)                        (1)
 
 #define dma_cache_sync(dev, va, size, dir)               ((void)0)
-#define dma_get_cache_alignment()                        L1_CACHE_BYTES
 
 #endif /* _ALPHA_DMA_MAPPING_H */
index 232f0c7582520e97b4d7779bf760d1df69a3cfbe..92951103255a1dff3e30d237a676f8d8bfa137e3 100644 (file)
@@ -644,6 +644,7 @@ config ARCH_S3C2410
        select ARCH_HAS_CPUFREQ
        select HAVE_CLK
        select ARCH_USES_GETTIMEOFFSET
+       select HAVE_S3C2410_I2C
        help
          Samsung S3C2410X CPU based systems, such as the Simtec Electronics
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -673,6 +674,8 @@ config ARCH_S3C64XX
        select S3C_DEV_NAND
        select USB_ARCH_HAS_OHCI
        select SAMSUNG_GPIOLIB_4BIT
+       select HAVE_S3C2410_I2C
+       select HAVE_S3C2410_WATCHDOG
        help
          Samsung S3C64XX series based systems
 
@@ -681,7 +684,10 @@ config ARCH_S5P6440
        select CPU_V6
        select GENERIC_GPIO
        select HAVE_CLK
+       select HAVE_S3C2410_WATCHDOG
        select ARCH_USES_GETTIMEOFFSET
+       select HAVE_S3C2410_I2C
+       select HAVE_S3C_RTC
        help
          Samsung S5P6440 CPU based systems
 
@@ -691,6 +697,7 @@ config ARCH_S5P6442
        select GENERIC_GPIO
        select HAVE_CLK
        select ARCH_USES_GETTIMEOFFSET
+       select HAVE_S3C2410_WATCHDOG
        help
          Samsung S5P6442 CPU based systems
 
@@ -701,6 +708,9 @@ config ARCH_S5PC100
        select CPU_V7
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_USES_GETTIMEOFFSET
+       select HAVE_S3C2410_I2C
+       select HAVE_S3C_RTC
+       select HAVE_S3C2410_WATCHDOG
        help
          Samsung S5PC100 series based systems
 
@@ -711,9 +721,21 @@ config ARCH_S5PV210
        select HAVE_CLK
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_USES_GETTIMEOFFSET
+       select HAVE_S3C2410_I2C
+       select HAVE_S3C_RTC
+       select HAVE_S3C2410_WATCHDOG
        help
          Samsung S5PV210/S5PC110 series based systems
 
+config ARCH_S5PV310
+       bool "Samsung S5PV310/S5PC210"
+       select CPU_V7
+       select GENERIC_GPIO
+       select HAVE_CLK
+       select GENERIC_CLOCKEVENTS
+       help
+         Samsung S5PV310 series based systems
+
 config ARCH_SHARK
        bool "Shark"
        select CPU_SA110
@@ -915,6 +937,8 @@ source "arch/arm/mach-s5pc100/Kconfig"
 
 source "arch/arm/mach-s5pv210/Kconfig"
 
+source "arch/arm/mach-s5pv310/Kconfig"
+
 source "arch/arm/mach-shmobile/Kconfig"
 
 source "arch/arm/plat-stmp3xxx/Kconfig"
@@ -1040,6 +1064,18 @@ config PL310_ERRATA_588369
           is not correctly implemented in PL310 as clean lines are not
           invalidated as a result of these operations. Note that this errata
           uses Texas Instrument's secure monitor api.
+
+config ARM_ERRATA_720789
+       bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"
+       depends on CPU_V7 && SMP
+       help
+         This option enables the workaround for the 720789 Cortex-A9 (prior to
+         r2p0) erratum. A faulty ASID can be sent to the other CPUs for the
+         broadcasted CP15 TLB maintenance operations TLBIASIDIS and TLBIMVAIS.
+         As a consequence of this erratum, some TLB entries which should be
+         invalidated are not, resulting in an incoherency in the system page
+         tables. The workaround changes the TLB flushing routines to invalidate
+         entries regardless of the ASID.
 endmenu
 
 source "arch/arm/common/Kconfig"
@@ -1108,11 +1144,11 @@ config SMP
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
        depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
-                ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
+                ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
        depends on GENERIC_CLOCKEVENTS
        select USE_GENERIC_SMP_HELPERS
-       select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \
-                ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
+       select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
+                ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@ -1182,10 +1218,10 @@ config LOCAL_TIMERS
        bool "Use local timer interrupts"
        depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
                REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-               ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
+               ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
        default y
-       select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\
-               ARCH_U8500 || ARCH_TEGRA
+       select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
+               ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS
        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system
@@ -1196,7 +1232,8 @@ source kernel/Kconfig.preempt
 
 config HZ
        int
-       default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
+       default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || \
+               ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310
        default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
        default AT91_TIMER_HZ if ARCH_AT91
        default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
index a8d4dca9da35a4310ee9a65ff08856957629f0f0..99b8200138d203e49df0f0c3c4735a0bfd4255eb 100644 (file)
@@ -174,6 +174,7 @@ machine-$(CONFIG_ARCH_S5P6440)              := s5p6440
 machine-$(CONFIG_ARCH_S5P6442)         := s5p6442
 machine-$(CONFIG_ARCH_S5PC100)         := s5pc100
 machine-$(CONFIG_ARCH_S5PV210)         := s5pv210
+machine-$(CONFIG_ARCH_S5PV310)         := s5pv310
 machine-$(CONFIG_ARCH_SA1100)          := sa1100
 machine-$(CONFIG_ARCH_SHARK)           := shark
 machine-$(CONFIG_ARCH_SHMOBILE)        := shmobile
index 7636c9b3f9a7899f9209d9a82fa78de8a6dc9b17..68775e33476c2fafb4c20d88f7f676c836a8edc1 100644 (file)
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_CPU_XSCALE),y)
 OBJS           += head-xscale.o
 endif
 
-ifeq ($(CONFIG_PXA_SHARPSL),y)
+ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y)
 OBJS           += head-sharpsl.o
 endif
 
index abf4d65acf6243de88d3a0df342afabce87436e2..6af9907c3b5ccad2ae2d73e37f5470c5b2f6b897 100644 (file)
@@ -170,9 +170,8 @@ not_angel:
 
                .text
                adr     r0, LC0
- ARM(          ldmia   r0, {r1, r2, r3, r5, r6, r11, ip, sp})
- THUMB(                ldmia   r0, {r1, r2, r3, r5, r6, r11, ip}       )
- THUMB(                ldr     sp, [r0, #32]                           )
+               ldmia   r0, {r1, r2, r3, r5, r6, r11, ip}
+               ldr     sp, [r0, #28]
 #ifdef CONFIG_AUTO_ZRELADDR
                @ determine final kernel image address
                and     r4, pc, #0xf8000000
index 7974baacafcea74ec055a46ee0f6cea496f24e6f..6c091356245593b87860d2ccb6221650fc62855b 100644 (file)
@@ -263,14 +263,6 @@ static int it8152_pci_platform_notify_remove(struct device *dev)
        return 0;
 }
 
-int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
-{
-       dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",
-               __func__, dma_addr, size);
-       return (dev->bus == &pci_bus_type) &&
-               ((dma_addr + size - PHYS_OFFSET) >= SZ_64M);
-}
-
 int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
 {
        it8152_io.start = IT8152_IO_BASE + 0x12000;
diff --git a/arch/arm/configs/s5pc110_defconfig b/arch/arm/configs/s5pc110_defconfig
deleted file mode 100644 (file)
index 22c2d14..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_S5PV210=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=1
-CONFIG_MACH_SMDKC110=y
-CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-# CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_INOTIFY=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CRAMFS=y
-CONFIG_ROMFS_FS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_S3C_UART=1
-CONFIG_CRC_CCITT=y
index 1753836d00555b1bfbfe16012b5124400b3b628b..0488a1eb4d7dd9c67f0c24a0fd837eed29f020cd 100644 (file)
@@ -7,6 +7,11 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_S5PV210=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=1
+CONFIG_S3C_DEV_FB=y
+CONFIG_S5PV210_SETUP_FB_24BPP=y
+CONFIG_MACH_AQUILA=y
+CONFIG_MACH_GONI=y
+CONFIG_MACH_SMDKC110=y
 CONFIG_MACH_SMDKV210=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT=y
index 66c160b8547fdda1bc4e3f17f14c3229f1e0d940..9d6122096fbec40ad41ab473c189722816225399 100644 (file)
@@ -14,7 +14,7 @@
  * cache before the transfer is done, causing old data to be seen by
  * the CPU.
  */
-#define ARCH_KMALLOC_MINALIGN  L1_CACHE_BYTES
+#define ARCH_DMA_MINALIGN      L1_CACHE_BYTES
 
 /*
  * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.
index 69ce0727edb534d5eb088cf37e810de5bd8e9306..c226fe10553e2952ec982ef3ec5fcaf8538586e0 100644 (file)
@@ -144,16 +144,6 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
        return 0;
 }
 
-static inline int dma_get_cache_alignment(void)
-{
-       return 32;
-}
-
-static inline int dma_is_consistent(struct device *dev, dma_addr_t handle)
-{
-       return !!arch_is_coherent();
-}
-
 /*
  * DMA errors are defined by all-bits-set in the DMA address.
  */
@@ -298,7 +288,15 @@ extern void dmabounce_unregister_dev(struct device *);
  * DMA access and 1 if the buffer needs to be bounced.
  *
  */
+#ifdef CONFIG_SA1111
 extern int dma_needs_bounce(struct device*, dma_addr_t, size_t);
+#else
+static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr,
+                                  size_t size)
+{
+       return 0;
+}
+#endif
 
 /*
  * The DMA API, implemented by dmabounce.c.  See below for descriptions.
index 6750b8e45a4914a59f6ef6cbbcb0cc84efe0ead0..5747a8baa4135b44c25711197799255c9f5f61ff 100644 (file)
@@ -59,6 +59,8 @@ typedef struct user_fp elf_fpregset_t;
 
 #define R_ARM_THM_CALL         10
 #define R_ARM_THM_JUMP24       30
+#define R_ARM_THM_MOVW_ABS_NC  47
+#define R_ARM_THM_MOVT_ABS     48
 
 /*
  * These are used to set parameters in the core dumps.
index f82b25d4f73e6cb72bbbc4564acbe745a3fb3685..212e47828c791e44c16f93783cba17d10eadddff 100644 (file)
@@ -48,8 +48,6 @@ struct tracectx {
 /* CoreSight Component Registers */
 #define CSCR_CLASS     0xff4
 
-#define CSCR_PRSR      0x314
-
 #define UNLOCK_MAGIC   0xc5acce55
 
 /* ETM control register, "ETM Architecture", 3.3.1 */
@@ -132,6 +130,12 @@ struct tracectx {
                                ETMCTRL_BRANCH_OUTPUT | \
                                ETMCTRL_DO_CONTEXTID)
 
+/* ETM management registers, "ETM Architecture", 3.5.24 */
+#define ETMMR_OSLAR    0x300
+#define ETMMR_OSLSR    0x304
+#define ETMMR_OSSRR    0x308
+#define ETMMR_PDSR     0x314
+
 /* ETB registers, "CoreSight Components TRM", 9.3 */
 #define ETBR_DEPTH             0x04
 #define ETBR_STATUS            0x0c
index 46492a63a7c4817ee3763fdadafa85ddbfd1b77e..ebb3ceaa8facf0f277dd2c088cdd22611a7b011c 100644 (file)
 #define SCOOP_GPWR 0x24
 #define SCOOP_GPRR 0x28
 
-#define SCOOP_GPCR_PA22        ( 1 << 12 )
-#define SCOOP_GPCR_PA21        ( 1 << 11 )
-#define SCOOP_GPCR_PA20        ( 1 << 10 )
-#define SCOOP_GPCR_PA19        ( 1 << 9 )
-#define SCOOP_GPCR_PA18        ( 1 << 8 )
-#define SCOOP_GPCR_PA17        ( 1 << 7 )
-#define SCOOP_GPCR_PA16        ( 1 << 6 )
-#define SCOOP_GPCR_PA15        ( 1 << 5 )
-#define SCOOP_GPCR_PA14        ( 1 << 4 )
-#define SCOOP_GPCR_PA13        ( 1 << 3 )
-#define SCOOP_GPCR_PA12        ( 1 << 2 )
-#define SCOOP_GPCR_PA11        ( 1 << 1 )
+#define SCOOP_CPR_OUT  (1 << 7)
+#define SCOOP_CPR_SD_3V        (1 << 2)
+#define SCOOP_CPR_CF_XV        (1 << 1)
+#define SCOOP_CPR_CF_3V        (1 << 0)
+
+#define SCOOP_GPCR_PA22        (1 << 12)
+#define SCOOP_GPCR_PA21        (1 << 11)
+#define SCOOP_GPCR_PA20        (1 << 10)
+#define SCOOP_GPCR_PA19        (1 << 9)
+#define SCOOP_GPCR_PA18        (1 << 8)
+#define SCOOP_GPCR_PA17        (1 << 7)
+#define SCOOP_GPCR_PA16        (1 << 6)
+#define SCOOP_GPCR_PA15        (1 << 5)
+#define SCOOP_GPCR_PA14        (1 << 4)
+#define SCOOP_GPCR_PA13        (1 << 3)
+#define SCOOP_GPCR_PA12        (1 << 2)
+#define SCOOP_GPCR_PA11        (1 << 1)
 
 struct scoop_config {
        unsigned short io_out;
index bd863d8608cd04013e76e9b6ebde8225e0c078d7..33b546ae72d49c82545271372a1972283f7ddb5b 100644 (file)
@@ -378,7 +378,11 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm)
        if (tlb_flag(TLB_V6_I_ASID))
                asm("mcr p15, 0, %0, c8, c5, 2" : : "r" (asid) : "cc");
        if (tlb_flag(TLB_V7_UIS_ASID))
+#ifdef CONFIG_ARM_ERRATA_720789
+               asm("mcr p15, 0, %0, c8, c3, 0" : : "r" (zero) : "cc");
+#else
                asm("mcr p15, 0, %0, c8, c3, 2" : : "r" (asid) : "cc");
+#endif
 
        if (tlb_flag(TLB_BTB)) {
                /* flush the branch target cache */
@@ -424,7 +428,11 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
        if (tlb_flag(TLB_V6_I_PAGE))
                asm("mcr p15, 0, %0, c8, c5, 1" : : "r" (uaddr) : "cc");
        if (tlb_flag(TLB_V7_UIS_PAGE))
+#ifdef CONFIG_ARM_ERRATA_720789
+               asm("mcr p15, 0, %0, c8, c3, 3" : : "r" (uaddr & PAGE_MASK) : "cc");
+#else
                asm("mcr p15, 0, %0, c8, c3, 1" : : "r" (uaddr) : "cc");
+#endif
 
        if (tlb_flag(TLB_BTB)) {
                /* flush the branch target cache */
index 2c1db77d78487cbdfa95d660f3abfa8acf6e215b..f05a35a59694dc7af54a76ffb899e02f8b849875 100644 (file)
@@ -92,75 +92,111 @@ ENDPROC(ret_from_fork)
 #define CALL(x) .long x
 
 #ifdef CONFIG_FUNCTION_TRACER
+/*
+ * When compiling with -pg, gcc inserts a call to the mcount routine at the
+ * start of every function.  In mcount, apart from the function's address (in
+ * lr), we need to get hold of the function's caller's address.
+ *
+ * Older GCCs (pre-4.4) inserted a call to a routine called mcount like this:
+ *
+ *     bl      mcount
+ *
+ * These versions have the limitation that in order for the mcount routine to
+ * be able to determine the function's caller's address, an APCS-style frame
+ * pointer (which is set up with something like the code below) is required.
+ *
+ *     mov     ip, sp
+ *     push    {fp, ip, lr, pc}
+ *     sub     fp, ip, #4
+ *
+ * With EABI, these frame pointers are not available unless -mapcs-frame is
+ * specified, and if building as Thumb-2, not even then.
+ *
+ * Newer GCCs (4.4+) solve this problem by introducing a new version of mcount,
+ * with call sites like:
+ *
+ *     push    {lr}
+ *     bl      __gnu_mcount_nc
+ *
+ * With these compilers, frame pointers are not necessary.
+ *
+ * mcount can be thought of as a function called in the middle of a subroutine
+ * call.  As such, it needs to be transparent for both the caller and the
+ * callee: the original lr needs to be restored when leaving mcount, and no
+ * registers should be clobbered.  (In the __gnu_mcount_nc implementation, we
+ * clobber the ip register.  This is OK because the ARM calling convention
+ * allows it to be clobbered in subroutines and doesn't use it to hold
+ * parameters.)
+ */
 #ifdef CONFIG_DYNAMIC_FTRACE
 ENTRY(mcount)
-       stmdb sp!, {r0-r3, lr}
-       mov r0, lr
-       sub r0, r0, #MCOUNT_INSN_SIZE
+       stmdb   sp!, {r0-r3, lr}
+       mov     r0, lr
+       sub     r0, r0, #MCOUNT_INSN_SIZE
 
        .globl mcount_call
 mcount_call:
-       bl ftrace_stub
-       ldr lr, [fp, #-4]                       @ restore lr
-       ldmia sp!, {r0-r3, pc}
+       bl      ftrace_stub
+       ldr     lr, [fp, #-4]                   @ restore lr
+       ldmia   sp!, {r0-r3, pc}
 
 ENTRY(ftrace_caller)
-       stmdb sp!, {r0-r3, lr}
-       ldr r1, [fp, #-4]
-       mov r0, lr
-       sub r0, r0, #MCOUNT_INSN_SIZE
+       stmdb   sp!, {r0-r3, lr}
+       ldr     r1, [fp, #-4]
+       mov     r0, lr
+       sub     r0, r0, #MCOUNT_INSN_SIZE
 
        .globl ftrace_call
 ftrace_call:
-       bl ftrace_stub
-       ldr lr, [fp, #-4]                       @ restore lr
-       ldmia sp!, {r0-r3, pc}
+       bl      ftrace_stub
+       ldr     lr, [fp, #-4]                   @ restore lr
+       ldmia   sp!, {r0-r3, pc}
 
 #else
 
 ENTRY(__gnu_mcount_nc)
-       stmdb sp!, {r0-r3, lr}
-       ldr r0, =ftrace_trace_function
-       ldr r2, [r0]
-       adr r0, ftrace_stub
-       cmp r0, r2
-       bne gnu_trace
-       ldmia sp!, {r0-r3, ip, lr}
-       mov pc, ip
+       stmdb   sp!, {r0-r3, lr}
+       ldr     r0, =ftrace_trace_function
+       ldr     r2, [r0]
+       adr     r0, ftrace_stub
+       cmp     r0, r2
+       bne     gnu_trace
+       ldmia   sp!, {r0-r3, ip, lr}
+       mov     pc, ip
 
 gnu_trace:
-       ldr r1, [sp, #20]                       @ lr of instrumented routine
-       mov r0, lr
-       sub r0, r0, #MCOUNT_INSN_SIZE
-       mov lr, pc
-       mov pc, r2
-       ldmia sp!, {r0-r3, ip, lr}
-       mov pc, ip
+       ldr     r1, [sp, #20]                   @ lr of instrumented routine
+       mov     r0, lr
+       sub     r0, r0, #MCOUNT_INSN_SIZE
+       mov     lr, pc
+       mov     pc, r2
+       ldmia   sp!, {r0-r3, ip, lr}
+       mov     pc, ip
 
 ENTRY(mcount)
-       stmdb sp!, {r0-r3, lr}
-       ldr r0, =ftrace_trace_function
-       ldr r2, [r0]
-       adr r0, ftrace_stub
-       cmp r0, r2
-       bne trace
-       ldr lr, [fp, #-4]                       @ restore lr
-       ldmia sp!, {r0-r3, pc}
+       stmdb   sp!, {r0-r3, lr}
+       ldr     r0, =ftrace_trace_function
+       ldr     r2, [r0]
+       adr     r0, ftrace_stub
+       cmp     r0, r2
+       bne     trace
+       ldr     lr, [fp, #-4]                   @ restore lr
+       ldmia   sp!, {r0-r3, pc}
 
 trace:
-       ldr r1, [fp, #-4]                       @ lr of instrumented routine
-       mov r0, lr
-       sub r0, r0, #MCOUNT_INSN_SIZE
-       mov lr, pc
-       mov pc, r2
-       ldr lr, [fp, #-4]                       @ restore lr
-       ldmia sp!, {r0-r3, pc}
+       ldr     r1, [fp, #-4]                   @ lr of instrumented routine
+       mov     r0, lr
+       sub     r0, r0, #MCOUNT_INSN_SIZE
+       mov     lr, pc
+       mov     pc, r2
+       ldr     lr, [fp, #-4]                   @ restore lr
+       ldmia   sp!, {r0-r3, pc}
 
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
        .globl ftrace_stub
 ftrace_stub:
-       mov pc, lr
+       mov     pc, lr
 
 #endif /* CONFIG_FUNCTION_TRACER */
 
index 827753966301434f55174d26948c88a4ba249733..56418f98cd016e9e3668e15c4473c9ba43bf1ca6 100644 (file)
@@ -543,7 +543,9 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
        t->etm_portsz = 1;
 
        etm_unlock(t);
-       ret = etm_readl(t, CSCR_PRSR);
+       (void)etm_readl(t, ETMMR_PDSR);
+       /* dummy first read */
+       (void)etm_readl(&tracer, ETMMR_OSSRR);
 
        t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf;
        etm_writel(t, 0x440, ETMR_CTRL);
index c628bdf6c4308edbb7517664641a308fdd2164c8..6b4605893f1e45329ab4058e33c2590056e02468 100644 (file)
@@ -102,7 +102,9 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
                unsigned long loc;
                Elf32_Sym *sym;
                s32 offset;
+#ifdef CONFIG_THUMB2_KERNEL
                u32 upper, lower, sign, j1, j2;
+#endif
 
                offset = ELF32_R_SYM(rel->r_info);
                if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) {
@@ -185,6 +187,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
                                        (offset & 0x0fff);
                        break;
 
+#ifdef CONFIG_THUMB2_KERNEL
                case R_ARM_THM_CALL:
                case R_ARM_THM_JUMP24:
                        upper = *(u16 *)loc;
@@ -233,9 +236,40 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
                        *(u16 *)(loc + 2) = (u16)((lower & 0xd000) |
                                                  (j1 << 13) | (j2 << 11) |
                                                  ((offset >> 1) & 0x07ff));
+                       break;
+
+               case R_ARM_THM_MOVW_ABS_NC:
+               case R_ARM_THM_MOVT_ABS:
                        upper = *(u16 *)loc;
                        lower = *(u16 *)(loc + 2);
+
+                       /*
+                        * MOVT/MOVW instructions encoding in Thumb-2:
+                        *
+                        * i    = upper[10]
+                        * imm4 = upper[3:0]
+                        * imm3 = lower[14:12]
+                        * imm8 = lower[7:0]
+                        *
+                        * imm16 = imm4:i:imm3:imm8
+                        */
+                       offset = ((upper & 0x000f) << 12) |
+                               ((upper & 0x0400) << 1) |
+                               ((lower & 0x7000) >> 4) | (lower & 0x00ff);
+                       offset = (offset ^ 0x8000) - 0x8000;
+                       offset += sym->st_value;
+
+                       if (ELF32_R_TYPE(rel->r_info) == R_ARM_THM_MOVT_ABS)
+                               offset >>= 16;
+
+                       *(u16 *)loc = (u16)((upper & 0xfbf0) |
+                                           ((offset & 0xf000) >> 12) |
+                                           ((offset & 0x0800) >> 1));
+                       *(u16 *)(loc + 2) = (u16)((lower & 0x8f00) |
+                                                 ((offset & 0x0700) << 4) |
+                                                 (offset & 0x00ff));
                        break;
+#endif
 
                default:
                        printk(KERN_ERR "%s: unknown relocation: %u\n",
index 02138af631e7e21a4c985f8f7a8c17428f0e944c..44eb9f764938985abd52f7d285ad1b456507594c 100644 (file)
@@ -75,7 +75,7 @@ static struct at91_usbh_data __initdata cam60_usbh_data = {
  * SPI devices.
  */
 #if defined(CONFIG_MTD_DATAFLASH)
-static struct mtd_partition __initdata cam60_spi_partitions[] = {
+static struct mtd_partition cam60_spi_partitions[] = {
        {
                .name   = "BOOT1",
                .offset = 0,
@@ -98,14 +98,14 @@ static struct mtd_partition __initdata cam60_spi_partitions[] = {
        },
 };
 
-static struct flash_platform_data __initdata cam60_spi_flash_platform_data = {
+static struct flash_platform_data cam60_spi_flash_platform_data = {
        .name           = "spi_flash",
        .parts          = cam60_spi_partitions,
        .nr_parts       = ARRAY_SIZE(cam60_spi_partitions)
 };
 #endif
 
-static struct spi_board_info cam60_spi_devices[] = {
+static struct spi_board_info cam60_spi_devices[] __initdata = {
 #if defined(CONFIG_MTD_DATAFLASH)
        {       /* DataFlash chip */
                .modalias       = "mtd_dataflash",
index b3ebe9e4871fe938585e5cad55eb7390424d25b3..d0b7d870be9c82d0febc7e76a2c90d107c789340 100644 (file)
 #define SYSPLD_VIRT_BASE       0xfe000000
 #define SYSPLD_BASE            SYSPLD_VIRT_BASE
 
-#ifndef __ASSEMBLER__
-
-#define PCIO_BASE              IO_BASE
-
-#endif
-
-
 #if  defined (CONFIG_ARCH_AUTCPU12)
 
 #define  CS89712_VIRT_BASE     CLPS7111_VIRT_BASE
index 515b75cf2e8bcd974c7c7b10d642f94f2f0e1e26..6f066ee4bf24ec2177d9f6cc438180d774278a5a 100644 (file)
@@ -2,6 +2,13 @@ if ARCH_GEMINI
 
 menu "Cortina Systems Gemini Implementations"
 
+config MACH_NAS4220B
+       bool "Raidsonic NAS-4220-B"
+       select GEMINI_MEM_SWAP
+       help
+         Say Y here if you intend to run this kernel on a
+         Raidsonic NAS-4220-B.
+
 config MACH_RUT100
        bool "Teltonika RUT100"
        select GEMINI_MEM_SWAP
@@ -9,6 +16,20 @@ config MACH_RUT100
          Say Y here if you intend to run this kernel on a
          Teltonika 3G Router RUT100.
 
+config MACH_WBD111
+       bool "Wiliboard WBD-111"
+       select GEMINI_MEM_SWAP
+       help
+         Say Y here if you intend to run this kernel on a
+         Wiliboard WBD-111.
+
+config MACH_WBD222
+        bool "Wiliboard WBD-222"
+        select GEMINI_MEM_SWAP
+        help
+          Say Y here if you intend to run this kernel on a
+          Wiliboard WBD-222.
+
 endmenu
 
 config GEMINI_MEM_SWAP
index 719505b81821dce55fba4fe4523c51debed260d8..c5b24b95a76ed78552b4fb0c679c6d62e71b0f52 100644 (file)
@@ -7,4 +7,7 @@
 obj-y                  := irq.o mm.o time.o devices.o gpio.o
 
 # Board-specific support
+obj-$(CONFIG_MACH_NAS4220B)    += board-nas4220b.o
 obj-$(CONFIG_MACH_RUT100)      += board-rut1xx.o
+obj-$(CONFIG_MACH_WBD111)      += board-wbd111.o
+obj-$(CONFIG_MACH_WBD222)      += board-wbd222.o
diff --git a/arch/arm/mach-gemini/board-nas4220b.c b/arch/arm/mach-gemini/board-nas4220b.c
new file mode 100644 (file)
index 0000000..01f1d6d
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ *  Support for Raidsonic NAS-4220-B
+ *
+ *  Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
+ *
+ * based on rut1xx.c
+ *  Copyright (C) 2008 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/gpio_keys.h>
+#include <linux/mdio-gpio.h>
+#include <linux/io.h>
+
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include <mach/hardware.h>
+#include <mach/global_reg.h>
+
+#include "common.h"
+
+static struct sys_timer ib4220b_timer = {
+       .init   = gemini_timer_init,
+};
+
+static struct gpio_led ib4220b_leds[] = {
+       {
+               .name                   = "nas4220b:orange:hdd",
+               .default_trigger        = "none",
+               .gpio                   = 60,
+       },
+       {
+               .name                   = "nas4220b:green:os",
+               .default_trigger        = "heartbeat",
+               .gpio                   = 62,
+       },
+};
+
+static struct gpio_led_platform_data ib4220b_leds_data = {
+       .num_leds       = ARRAY_SIZE(ib4220b_leds),
+       .leds           = ib4220b_leds,
+};
+
+static struct platform_device ib4220b_led_device = {
+       .name   = "leds-gpio",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &ib4220b_leds_data,
+       },
+};
+
+static struct gpio_keys_button ib4220b_keys[] = {
+       {
+               .code           = KEY_SETUP,
+               .gpio           = 61,
+               .active_low     = 1,
+               .desc           = "Backup Button",
+               .type           = EV_KEY,
+       },
+       {
+               .code           = KEY_RESTART,
+               .gpio           = 63,
+               .active_low     = 1,
+               .desc           = "Softreset Button",
+               .type           = EV_KEY,
+       },
+};
+
+static struct gpio_keys_platform_data ib4220b_keys_data = {
+       .buttons        = ib4220b_keys,
+       .nbuttons       = ARRAY_SIZE(ib4220b_keys),
+};
+
+static struct platform_device ib4220b_key_device = {
+       .name   = "gpio-keys",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &ib4220b_keys_data,
+       },
+};
+
+static void __init ib4220b_init(void)
+{
+       gemini_gpio_init();
+       platform_register_uart();
+       platform_register_pflash(SZ_16M, NULL, 0);
+       platform_device_register(&ib4220b_led_device);
+       platform_device_register(&ib4220b_key_device);
+}
+
+MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B")
+       .phys_io        = 0x7fffc000,
+       .io_pg_offst    = ((0xffffc000) >> 18) & 0xfffc,
+       .boot_params    = 0x100,
+       .map_io         = gemini_map_io,
+       .init_irq       = gemini_init_irq,
+       .timer          = &ib4220b_timer,
+       .init_machine   = ib4220b_init,
+MACHINE_END
diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
new file mode 100644 (file)
index 0000000..36538c1
--- /dev/null
@@ -0,0 +1,143 @@
+/*
+ *  Support for Wiliboard WBD-111
+ *
+ *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/skbuff.h>
+#include <linux/gpio_keys.h>
+#include <linux/mdio-gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+
+#include "common.h"
+
+static struct gpio_keys_button wbd111_keys[] = {
+       {
+               .code           = KEY_SETUP,
+               .gpio           = 5,
+               .active_low     = 1,
+               .desc           = "reset",
+               .type           = EV_KEY,
+       },
+};
+
+static struct gpio_keys_platform_data wbd111_keys_data = {
+       .buttons        = wbd111_keys,
+       .nbuttons       = ARRAY_SIZE(wbd111_keys),
+};
+
+static struct platform_device wbd111_keys_device = {
+       .name   = "gpio-keys",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &wbd111_keys_data,
+       },
+};
+
+static struct gpio_led wbd111_leds[] = {
+       {
+               .name                   = "L3red",
+               .gpio                   = 1,
+       },
+       {
+               .name                   = "L4green",
+               .gpio                   = 2,
+       },
+       {
+               .name                   = "L4red",
+               .gpio                   = 3,
+       },
+       {
+               .name                   = "L3green",
+               .gpio                   = 5,
+       },
+};
+
+static struct gpio_led_platform_data wbd111_leds_data = {
+       .num_leds       = ARRAY_SIZE(wbd111_leds),
+       .leds           = wbd111_leds,
+};
+
+static struct platform_device wbd111_leds_device = {
+       .name   = "leds-gpio",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &wbd111_leds_data,
+       },
+};
+
+static struct sys_timer wbd111_timer = {
+       .init   = gemini_timer_init,
+};
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition wbd111_partitions[] = {
+       {
+               .name           = "RedBoot",
+               .offset         = 0,
+               .size           = 0x020000,
+               .mask_flags     = MTD_WRITEABLE,
+       } , {
+               .name           = "kernel",
+               .offset         = 0x020000,
+               .size           = 0x100000,
+       } , {
+               .name           = "rootfs",
+               .offset         = 0x120000,
+               .size           = 0x6a0000,
+       } , {
+               .name           = "VCTL",
+               .offset         = 0x7c0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       } , {
+               .name           = "cfg",
+               .offset         = 0x7d0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       } , {
+               .name           = "FIS",
+               .offset         = 0x7e0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }
+};
+#define wbd111_num_partitions  ARRAY_SIZE(wbd111_partitions)
+#else
+#define wbd111_partitions      NULL
+#define wbd111_num_partitions  0
+#endif /* CONFIG_MTD_PARTITIONS */
+
+static void __init wbd111_init(void)
+{
+       gemini_gpio_init();
+       platform_register_uart();
+       platform_register_pflash(SZ_8M, wbd111_partitions,
+                                wbd111_num_partitions);
+       platform_device_register(&wbd111_leds_device);
+       platform_device_register(&wbd111_keys_device);
+}
+
+MACHINE_START(WBD111, "Wiliboard WBD-111")
+       .phys_io        = 0x7fffc000,
+       .io_pg_offst    = ((0xffffc000) >> 18) & 0xfffc,
+       .boot_params    = 0x100,
+       .map_io         = gemini_map_io,
+       .init_irq       = gemini_init_irq,
+       .timer          = &wbd111_timer,
+       .init_machine   = wbd111_init,
+MACHINE_END
diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c
new file mode 100644 (file)
index 0000000..ece8b4c
--- /dev/null
@@ -0,0 +1,143 @@
+/*
+ *  Support for Wiliboard WBD-222
+ *
+ *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/input.h>
+#include <linux/skbuff.h>
+#include <linux/gpio_keys.h>
+#include <linux/mdio-gpio.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+
+#include "common.h"
+
+static struct gpio_keys_button wbd222_keys[] = {
+       {
+               .code           = KEY_SETUP,
+               .gpio           = 5,
+               .active_low     = 1,
+               .desc           = "reset",
+               .type           = EV_KEY,
+       },
+};
+
+static struct gpio_keys_platform_data wbd222_keys_data = {
+       .buttons        = wbd222_keys,
+       .nbuttons       = ARRAY_SIZE(wbd222_keys),
+};
+
+static struct platform_device wbd222_keys_device = {
+       .name   = "gpio-keys",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &wbd222_keys_data,
+       },
+};
+
+static struct gpio_led wbd222_leds[] = {
+       {
+               .name                   = "L3red",
+               .gpio                   = 1,
+       },
+       {
+               .name                   = "L4green",
+               .gpio                   = 2,
+       },
+       {
+               .name                   = "L4red",
+               .gpio                   = 3,
+       },
+       {
+               .name                   = "L3green",
+               .gpio                   = 5,
+       },
+};
+
+static struct gpio_led_platform_data wbd222_leds_data = {
+       .num_leds       = ARRAY_SIZE(wbd222_leds),
+       .leds           = wbd222_leds,
+};
+
+static struct platform_device wbd222_leds_device = {
+       .name   = "leds-gpio",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &wbd222_leds_data,
+       },
+};
+
+static struct sys_timer wbd222_timer = {
+       .init   = gemini_timer_init,
+};
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition wbd222_partitions[] = {
+       {
+               .name           = "RedBoot",
+               .offset         = 0,
+               .size           = 0x020000,
+               .mask_flags     = MTD_WRITEABLE,
+       } , {
+               .name           = "kernel",
+               .offset         = 0x020000,
+               .size           = 0x100000,
+       } , {
+               .name           = "rootfs",
+               .offset         = 0x120000,
+               .size           = 0x6a0000,
+       } , {
+               .name           = "VCTL",
+               .offset         = 0x7c0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       } , {
+               .name           = "cfg",
+               .offset         = 0x7d0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       } , {
+               .name           = "FIS",
+               .offset         = 0x7e0000,
+               .size           = 0x010000,
+               .mask_flags     = MTD_WRITEABLE,
+       }
+};
+#define wbd222_num_partitions  ARRAY_SIZE(wbd222_partitions)
+#else
+#define wbd222_partitions      NULL
+#define wbd222_num_partitions  0
+#endif /* CONFIG_MTD_PARTITIONS */
+
+static void __init wbd222_init(void)
+{
+       gemini_gpio_init();
+       platform_register_uart();
+       platform_register_pflash(SZ_8M, wbd222_partitions,
+               wbd222_num_partitions);
+       platform_device_register(&wbd222_leds_device);
+       platform_device_register(&wbd222_keys_device);
+}
+
+MACHINE_START(WBD222, "Wiliboard WBD-222")
+       .phys_io        = 0x7fffc000,
+       .io_pg_offst    = ((0xffffc000) >> 18) & 0xfffc,
+       .boot_params    = 0x100,
+       .map_io         = gemini_map_io,
+       .init_irq       = gemini_init_irq,
+       .timer          = &wbd222_timer,
+       .init_machine   = wbd222_init,
+MACHINE_END
index 6c19156e2a429d493f0757f244616d031cf11917..c55a52c6541d70ff45e623e526a5dee13b4f0ec3 100644 (file)
 #define SERIAL_ENABLE_EN       (1<<0)
 
 /* General defines to pacify gcc */
-#define PCIO_BASE              (0)     /* for inb, outb and friends */
-#define PCIO_VIRT              PCIO_BASE
 
 #define __ASM_ARCH_HARDWARE_INCMACH_H
 #include "boards.h"
index 6c92deaf468f6677559655fe366fba8aad97006c..a389d1148f18c641cd1c997f4798b6641e084bdc 100644 (file)
@@ -408,7 +408,7 @@ static void __init pca100_init(void)
        mxc_gpio_mode(GPIO_PORTD | 27 | GPIO_GPIO | GPIO_IN);
        spi_register_board_info(pca100_spi_board_info,
                                ARRAY_SIZE(pca100_spi_board_info));
-       imx27_add_spi_imx0(&pca100_spi_0_data);
+       imx27_add_spi_imx0(&pca100_spi0_data);
 #endif
 
        gpio_request(OTG_PHY_CS_GPIO, "usb-otg-cs");
index 8e26360ce9a3e191e113c435e70436ee60826ffd..57f51ba1125170e3763df2b7aecfbbb1e6dcc772 100644 (file)
@@ -32,7 +32,6 @@
 #define IO_SIZE                        0x0B000000                 // How much?
 #define IO_START               INTEGRATOR_HDR_BASE        // PA of IO
 
-#define PCIO_BASE              PCI_IO_VADDR
 #define PCIMEM_BASE            PCI_MEMORY_VADDR
 
 #define pcibios_assign_all_busses()    1
index c3192009a886d71239fe0d26df8b43aa201245cb..57b508bfe2803f45009791428a1d3119e272468b 100644 (file)
@@ -15,7 +15,6 @@
 #define __ASM_ARCH_HARDWARE_H
 
 /* PCI IO info */
-#define PCIO_BASE              IXP23XX_PCI_IO_VIRT
 #define PCIBIOS_MIN_IO         0x00000000
 #define PCIBIOS_MIN_MEM                0xe0000000
 
index 9e5070da17ae8f2d6033eeb0c43adc7127a3b992..6f991c5ae8632ad6159bc9f448f61c1091d6d18d 100644 (file)
@@