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

bb04af0e · Linus Torvalds <[email protected]> · 2008-01-29 08:49:49 +11:00

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (176 commits)
  [ARM] 4795/1: S3C244X: Add armclk and setparent call
  [ARM] 4794/1: S3C24XX: Comonise S3C2440 and S3C2442 clock code
  [ARM] 4793/1: S3C24XX: Add IRQ->GPIO pin mapping function
  [ARM] 4792/1: S3C24XX: Remove warnings from debug-macro.S
  [ARM] 4791/1: S3C2412: Make fclk a parent of msysclk
  [ARM] 4790/1: S3C2412: Fix parent selection for msysclk.
  [ARM] 4789/1: S3C2412: Add missing CLKDIVN register values
  [ARM] 4788/1: S3C24XX: Fix paramet to s3c2410_dma_ctrl if S3C2410_DMAF_AUTOSTART used.
  [ARM] 4787/1: S3C24XX: s3c2410_dma_request() should return the allocated channel number
  [ARM] 4786/1: S3C2412: Add SPI FIFO controll constants
  [ARM] 4785/1: S3C24XX: Add _SHIFT definitions for S3C2410_BANKCON registers
  [ARM] 4784/1: S3C24XX: Fix GPIO restore glitches
  [ARM] 4783/1: S3C24XX: Add s3c2410_gpio_getpull()
  [ARM] 4782/1: S3C24XX: Define FIQ_START for any FIQ users
  [ARM] 4781/1: S3C24XX: DMA suspend and resume support
  [ARM] 4780/1: S3C2412: Allow for seperate DMA channels for TX and RX
  [ARM] 4779/1: S3C2412: Add s3c2412_gpio_set_sleepcfg() call
  [ARM] 4778/1: S3C2412: Add armclk and init from DVS state
  [ARM] 4777/1: S3C24XX: Ensure clk_set_rate() checks the set_rate method for the clk
  [ARM] 4775/1: s3c2410: fix compilation error if only s3c2442 cpu is selected
  ...

Commit: bb04af0e2e5bcd8d1a5d7f7d5c704f7eb328f241
Parents: 0affa456 · 0ff66f0c

Merge commit. Changes below are compared with the first parent: 0affa456.

Changes

310 files changed · +28420 −3211

File	Status	Add	Del	Content
Documentation/cpu-freq/user-guide.txt	modified	+1	−0	View file
Documentation/kprobes.txt	modified	+1	−0	View file
arch/arm/Kconfig	modified	+52	−5	View file
arch/arm/Kconfig.debug	modified	+6	−0	View file
arch/arm/Kconfig.instrumentation	modified	+10	−0	View file
arch/arm/Makefile	modified	+2	−0	View file
arch/arm/boot/compressed/Makefile	modified	+0	−4	View file
arch/arm/boot/compressed/head-at91rm9200.S	deleted	+0	−81	View before deletion
arch/arm/boot/compressed/head.S	modified	+14	−1	View file
arch/arm/common/rtctime.c	modified	+0	−1	View file
arch/arm/configs/at91cap9adk_defconfig	added	+1143	−0	View file
arch/arm/configs/colibri_defconfig	added	+1481	−0	View file
arch/arm/configs/collie_defconfig	modified	+0	−1	View file
arch/arm/configs/eseries_pxa_defconfig	added	+1499	−0	View file
arch/arm/configs/iop13xx_defconfig	modified	+71	−85	View file
arch/arm/configs/iop32x_defconfig	modified	+125	−82	View file
arch/arm/configs/iop33x_defconfig	modified	+71	−83	View file
arch/arm/configs/littleton_defconfig	added	+783	−0	View file
arch/arm/configs/msm_defconfig	added	+895	−0	View file
arch/arm/configs/orion_defconfig	added	+1384	−0	View file
arch/arm/configs/pcm027_defconfig	added	+1096	−0	View file
arch/arm/kernel/Makefile	modified	+1	−0	View file
arch/arm/kernel/dma-isa.c	modified	+1	−1	View file
arch/arm/kernel/entry-armv.S	modified	+57	−6	View file
arch/arm/kernel/entry-common.S	modified	+1	−1	View file
arch/arm/kernel/kprobes-decode.c	added	+1529	−0	View file
arch/arm/kernel/kprobes.c	added	+447	−0	View file
arch/arm/kernel/time.c	modified	+2	−0	View file
arch/arm/kernel/traps.c	modified	+12	−9	View file
arch/arm/kernel/vmlinux.lds.S	modified	+1	−0	View file
arch/arm/mach-aaec2000/core.c	modified	+0	−4	View file
arch/arm/mach-at91/Kconfig	modified	+36	−2	View file
arch/arm/mach-at91/Makefile	modified	+10	−13	View file
arch/arm/mach-at91/Makefile.boot	modified	+6	−1	View file
arch/arm/mach-at91/at91cap9.c	added	+365	−0	View file
arch/arm/mach-at91/at91cap9_devices.c	added	+1066	−0	View file
arch/arm/mach-at91/at91rm9200.c	modified	+15	−15	View file
arch/arm/mach-at91/at91rm9200_devices.c	modified	+295	−55	View file
arch/arm/mach-at91/at91sam9260.c	modified	+14	−14	View file
arch/arm/mach-at91/at91sam9260_devices.c	modified	+260	−55	View file
arch/arm/mach-at91/at91sam9261.c	modified	+14	−14	View file
arch/arm/mach-at91/at91sam9261_devices.c	modified	+321	−45	View file
arch/arm/mach-at91/at91sam9263.c	modified	+15	−15	View file
arch/arm/mach-at91/at91sam9263_devices.c	modified	+334	−48	View file
arch/arm/mach-at91/at91sam9rl_devices.c	modified	+306	−40	View file
arch/arm/mach-at91/board-cap9adk.c	added	+359	−0	View file
arch/arm/mach-at91/board-csb337.c	modified	+85	−0	View file
arch/arm/mach-at91/board-dk.c	modified	+10	−0	View file
arch/arm/mach-at91/board-ek.c	modified	+21	−0	View file
arch/arm/mach-at91/board-sam9261ek.c	modified	+73	−11	View file
arch/arm/mach-at91/board-sam9263ek.c	modified	+80	−0	View file
arch/arm/mach-at91/clock.c	modified	+2	−0	View file
arch/arm/mach-at91/generic.h	modified	+2	−0	View file
arch/arm/mach-at91/gpio.c	modified	+62	−0	View file
arch/arm/mach-at91/leds.c	modified	+67	−1	View file
arch/arm/mach-at91/pm.c	modified	+5	−0	View file
arch/arm/mach-clps711x/time.c	modified	+0	−2	View file
arch/arm/mach-clps7500/core.c	modified	+0	−4	View file
arch/arm/mach-ebsa110/core.c	modified	+0	−4	View file
arch/arm/mach-ep93xx/core.c	modified	+157	−105	View file
arch/arm/mach-footbridge/dc21285-timer.c	modified	+0	−4	View file
arch/arm/mach-footbridge/isa-timer.c	modified	+0	−2	View file
arch/arm/mach-h720x/cpu-h7201.c	modified	+0	−4	View file
arch/arm/mach-h720x/cpu-h7202.c	modified	+0	−2	View file
arch/arm/mach-integrator/core.c	modified	+0	−4	View file
arch/arm/mach-integrator/pci_v3.c	modified	+5	−3	View file
arch/arm/mach-iop32x/glantank.c	modified	+13	−2	View file
arch/arm/mach-ixp2000/core.c	modified	+0	−4	View file
arch/arm/mach-ixp23xx/core.c	modified	+0	−1	View file
arch/arm/mach-ixp23xx/espresso.c	modified	+0	−2	View file
arch/arm/mach-ixp23xx/ixdp2351.c	modified	+0	−2	View file
arch/arm/mach-ixp23xx/roadrunner.c	modified	+0	−2	View file
arch/arm/mach-ixp4xx/nslu2-power.c	modified	+0	−1	View file
arch/arm/mach-ks8695/Makefile	modified	+1	−1	View file
arch/arm/mach-ks8695/board-micrel.c	modified	+1	−1	View file
arch/arm/mach-ks8695/gpio.c	modified	+83	−0	View file
arch/arm/mach-ks8695/pci.c	added	+326	−0	View file
arch/arm/mach-ks8695/time.c	modified	+0	−3	View file
arch/arm/mach-lh7a40x/time.c	modified	+0	−4	View file
arch/arm/mach-msm/Kconfig	added	+18	−0	View file
arch/arm/mach-msm/Makefile	added	+7	−0	View file
arch/arm/mach-msm/Makefile.boot	added	+3	−0	View file
arch/arm/mach-msm/board-halibut.c	added	+114	−0	View file
arch/arm/mach-msm/common.c	added	+116	−0	View file
arch/arm/mach-msm/dma.c	added	+214	−0	View file
arch/arm/mach-msm/idle.S	added	+36	−0	View file
arch/arm/mach-msm/io.c	added	+85	−0	View file
arch/arm/mach-msm/irq.c	added	+154	−0	View file
arch/arm/mach-msm/timer.c	added	+205	−0	View file
arch/arm/mach-mx3/time.c	modified	+0	−4	View file
arch/arm/mach-netx/time.c	modified	+0	−4	View file
arch/arm/mach-omap1/board-fsample.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-h2.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-h3.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-innovator.c	modified	+2	−2	View file
arch/arm/mach-omap1/board-nokia770.c	modified	+0	−1	View file
arch/arm/mach-omap1/board-osk.c	modified	+1	−2	View file
arch/arm/mach-omap1/board-palmtt.c	modified	+0	−1	View file
arch/arm/mach-omap1/board-palmz71.c	modified	+0	−1	View file
arch/arm/mach-omap1/board-perseus2.c	modified	+1	−1	View file
arch/arm/mach-omap1/board-voiceblue.c	modified	+1	−1	View file
arch/arm/mach-omap1/pm.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-2430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-apollon.c	modified	+1	−2	View file
arch/arm/mach-omap2/timer-gp.c	modified	+0	−4	View file
arch/arm/mach-orion/Kconfig	added	+41	−0	View file
arch/arm/mach-orion/Makefile	added	+6	−0	View file
arch/arm/mach-orion/Makefile.boot	added	+3	−0	View file
arch/arm/mach-orion/addr-map.c	added	+484	−0	View file
arch/arm/mach-orion/common.c	added	+315	−0	View file
arch/arm/mach-orion/common.h	added	+78	−0	View file
arch/arm/mach-orion/db88f5281-setup.c	added	+364	−0	View file
arch/arm/mach-orion/dns323-setup.c	added	+322	−0	View file
arch/arm/mach-orion/gpio.c	added	+225	−0	View file
arch/arm/mach-orion/irq.c	added	+241	−0	View file
arch/arm/mach-orion/kurobox_pro-setup.c	added	+234	−0	View file
arch/arm/mach-orion/pci.c	added	+557	−0	View file
arch/arm/mach-orion/rd88f5182-setup.c	added	+306	−0	View file
arch/arm/mach-orion/time.c	added	+181	−0	View file
arch/arm/mach-orion/ts209-setup.c	added	+335	−0	View file
arch/arm/mach-pnx4008/time.c	modified	+0	−4	View file
arch/arm/mach-pxa/Kconfig	modified	+73	−0	View file
arch/arm/mach-pxa/Makefile	modified	+9	−6	View file
arch/arm/mach-pxa/cm-x270.c	modified	+2	−5	View file
arch/arm/mach-pxa/colibri.c	added	+134	−0	View file
arch/arm/mach-pxa/corgi.c	modified	+182	−7	View file
arch/arm/mach-pxa/corgi_lcd.c	modified	+2	−297	View file
arch/arm/mach-pxa/corgi_ssp.c	modified	+1	−0	View file
arch/arm/mach-pxa/cpu-pxa.c	added	+294	−0	View file
arch/arm/mach-pxa/devices.c	added	+662	−0	View file
arch/arm/mach-pxa/devices.h	modified	+12	−0	View file
arch/arm/mach-pxa/eseries.c	added	+101	−0	View file
arch/arm/mach-pxa/generic.c	modified	+1	−250	View file
arch/arm/mach-pxa/idp.c	modified	+1	−1	View file
arch/arm/mach-pxa/littleton.c	added	+325	−0	View file
arch/arm/mach-pxa/lpd270.c	modified	+1	−0	View file
arch/arm/mach-pxa/lubbock.c	modified	+9	−21	View file
arch/arm/mach-pxa/magician.c	added	+218	−0	View file
arch/arm/mach-pxa/mainstone.c	modified	+61	−18	View file
arch/arm/mach-pxa/mfp.c	modified	+136	−125	View file
arch/arm/mach-pxa/pcm027.c	added	+216	−0	View file
arch/arm/mach-pxa/pcm990-baseboard.c	added	+330	−0	View file
arch/arm/mach-pxa/pm.c	modified	+18	−15	View file
arch/arm/mach-pxa/poodle.c	modified	+2	−4	View file
arch/arm/mach-pxa/pxa25x.c	modified	+20	−11	View file
arch/arm/mach-pxa/pxa27x.c	modified	+12	−47	View file
arch/arm/mach-pxa/pxa3xx.c	modified	+238	−5	View file
arch/arm/mach-pxa/sharpsl.h	modified	+3	−16	View file
arch/arm/mach-pxa/sleep.S	modified	+7	−2	View file
arch/arm/mach-pxa/spitz.c	modified	+104	−8	View file
arch/arm/mach-pxa/ssp.c	modified	+301	−85	View file
arch/arm/mach-pxa/standby.S	modified	+83	−0	View file
arch/arm/mach-pxa/time.c	modified	+21	−63	View file
arch/arm/mach-pxa/tosa.c	modified	+4	−7	View file
arch/arm/mach-pxa/trizeps4.c	modified	+3	−4	View file
arch/arm/mach-pxa/zylonite.c	modified	+95	−1	View file
arch/arm/mach-pxa/zylonite_pxa300.c	modified	+49	−16	View file
arch/arm/mach-pxa/zylonite_pxa320.c	modified	+33	−12	View file
arch/arm/mach-realview/core.c	modified	+0	−4	View file
arch/arm/mach-s3c2410/mach-bast.c	modified	+1	−2	View file
arch/arm/mach-s3c2410/mach-vr1000.c	modified	+0	−1	View file
arch/arm/mach-s3c2410/usb-simtec.c	modified	+1	−1	View file
arch/arm/mach-s3c2412/Kconfig	modified	+1	−0	View file
arch/arm/mach-s3c2412/Makefile	modified	+2	−1	View file
arch/arm/mach-s3c2412/clock.c	modified	+53	−1	View file
arch/arm/mach-s3c2412/dma.c	modified	+42	−6	View file
arch/arm/mach-s3c2412/gpio.c	added	+60	−0	View file
arch/arm/mach-s3c2412/irq.c	modified	+24	−0	View file
arch/arm/mach-s3c2412/pm.c	modified	+3	−15	View file
arch/arm/mach-s3c2412/s3c2412.c	modified	+2	−0	View file
arch/arm/mach-s3c2412/sleep.S	added	+68	−0	View file
arch/arm/mach-s3c2440/clock.c	modified	+1	−21	View file
arch/arm/mach-s3c2442/clock.c	modified	+1	−21	View file
arch/arm/mach-sa1100/ssp.c	modified	+1	−2	View file
arch/arm/mach-sa1100/time.c	modified	+20	−22	View file
arch/arm/mach-shark/core.c	modified	+0	−2	View file
arch/arm/mm/Kconfig	modified	+27	−5	View file
arch/arm/mm/Makefile	modified	+1	−0	View file
arch/arm/mm/fault.c	modified	+29	−2	View file
arch/arm/mm/proc-feroceon.S	added	+506	−0	View file
arch/arm/plat-omap/debug-devices.c	modified	+1	−1	View file
arch/arm/plat-omap/mailbox.c	modified	+1	−1	View file
arch/arm/plat-omap/mcbsp.c	modified	+12	−8	View file
arch/arm/plat-s3c24xx/Makefile	modified	+1	−0	View file
arch/arm/plat-s3c24xx/clock.c	modified	+19	−0	View file
arch/arm/plat-s3c24xx/dma.c	modified	+40	−7	View file
arch/arm/plat-s3c24xx/gpio.c	modified	+29	−0	View file
arch/arm/plat-s3c24xx/irq.c	modified	+1	−1	View file
arch/arm/plat-s3c24xx/pm.c	modified	+214	−33	View file
arch/arm/plat-s3c24xx/s3c244x-clock.c	added	+137	−0	View file
arch/arm/tools/mach-types	modified	+251	−7	View file
arch/arm/vfp/vfp.h	modified	+4	−0	View file
arch/arm/vfp/vfphw.S	modified	+37	−23	View file
arch/arm/vfp/vfpinstr.h	modified	+3	−3	View file
arch/arm/vfp/vfpmodule.c	modified	+55	−43	View file
arch/powerpc/sysdev/mv64x60_dev.c	modified	+0	−6	View file
arch/ppc/syslib/mv64x60.c	modified	+0	−1	View file
drivers/i2c/busses/Kconfig	modified	+1	−1	View file
drivers/i2c/busses/i2c-mv64xxx.c	modified	+17	−15	View file
drivers/input/touchscreen/corgi_ts.c	modified	+4	−4	View file
drivers/mfd/ucb1x00-assabet.c	modified	+7	−7	View file
drivers/mmc/host/pxamci.c	modified	+45	−16	View file
drivers/mmc/host/pxamci.h	modified	+1	−1	View file
drivers/net/Kconfig	modified	+1	−1	View file
drivers/net/dm9000.c	modified	+2	−1	View file
drivers/net/smc91x.c	modified	+13	−6	View file
drivers/net/smc91x.h	modified	+9	−15	View file
drivers/pcmcia/pxa2xx_base.c	modified	+1	−0	View file
drivers/rtc/rtc-sa1100.c	modified	+31	−0	View file
drivers/serial/21285.c	modified	+2	−0	View file
drivers/spi/Kconfig	modified	+1	−0	View file
drivers/spi/pxa2xx_spi.c	modified	+53	−86	View file
drivers/usb/Kconfig	modified	+1	−0	View file
drivers/usb/gadget/Kconfig	modified	+1	−1	View file
drivers/usb/host/ohci-hcd.c	modified	+1	−1	View file
drivers/usb/host/ohci-pxa27x.c	modified	+11	−2	View file
drivers/video/Kconfig	modified	+1	−1	View file
drivers/video/atmel_lcdfb.c	modified	+1	−1	View file
include/asm-arm/arch-at91/at91_lcdc.h	deleted	+0	−148	View before deletion
include/asm-arm/arch-at91/at91_pmc.h	modified	+8	−1	View file
include/asm-arm/arch-at91/at91_rtt.h	modified	+4	−4	View file
include/asm-arm/arch-at91/at91_twi.h	modified	+11	−0	View file
include/asm-arm/arch-at91/at91cap9.h	added	+121	−0	View file
include/asm-arm/arch-at91/at91cap9_matrix.h	added	+132	−0	View file
include/asm-arm/arch-at91/at91sam9260_matrix.h	modified	+1	−1	View file
include/asm-arm/arch-at91/at91sam9263_matrix.h	modified	+1	−1	View file
include/asm-arm/arch-at91/at91sam9rl_matrix.h	modified	+1	−1	View file
include/asm-arm/arch-at91/board.h	modified	+34	−4	View file
include/asm-arm/arch-at91/cpu.h	modified	+7	−2	View file
include/asm-arm/arch-at91/entry-macro.S	modified	+1	−1	View file
include/asm-arm/arch-at91/hardware.h	modified	+2	−0	View file
include/asm-arm/arch-at91/timex.h	modified	+5	−0	View file
include/asm-arm/arch-ep93xx/gpio.h	modified	+46	−12	View file
include/asm-arm/arch-ep93xx/irqs.h	modified	+0	−6	View file
include/asm-arm/arch-ixp4xx/io.h	modified	+8	−8	View file
include/asm-arm/arch-ks8695/regs-gpio.h	modified	+2	−0	View file
include/asm-arm/arch-msm/board.h	added	+37	−0	View file
include/asm-arm/arch-msm/debug-macro.S	added	+40	−0	View file
include/asm-arm/arch-msm/dma.h	added	+151	−0	View file
include/asm-arm/arch-msm/entry-macro.S	added	+38	−0	View file
include/asm-arm/arch-msm/hardware.h	added	+18	−0	View file
include/asm-arm/arch-msm/io.h	added	+33	−0	View file
include/asm-arm/arch-msm/irqs.h	added	+89	−0	View file
include/asm-arm/arch-msm/memory.h	added	+27	−0	View file
include/asm-arm/arch-msm/msm_iomap.h	added	+104	−0	View file
include/asm-arm/arch-msm/system.h	added	+23	−0	View file
include/asm-arm/arch-msm/timex.h	added	+20	−0	View file
include/asm-arm/arch-msm/uncompress.h	added	+36	−0	View file
include/asm-arm/arch-msm/vmalloc.h	added	+22	−0	View file
include/asm-arm/arch-orion/debug-macro.S	added	+17	−0	View file
include/asm-arm/arch-orion/dma.h	added	+1	−0	View file
include/asm-arm/arch-orion/entry-macro.S	added	+31	−0	View file
include/asm-arm/arch-orion/gpio.h	added	+28	−0	View file
include/asm-arm/arch-orion/hardware.h	added	+24	−0	View file
include/asm-arm/arch-orion/io.h	added	+27	−0	View file
include/asm-arm/arch-orion/irqs.h	added	+61	−0	View file
include/asm-arm/arch-orion/memory.h	added	+15	−0	View file
include/asm-arm/arch-orion/orion.h	added	+143	−0	View file
include/asm-arm/arch-orion/platform.h	added	+25	−0	View file
include/asm-arm/arch-orion/system.h	added	+31	−0	View file
include/asm-arm/arch-orion/timex.h	added	+12	−0	View file
include/asm-arm/arch-orion/uncompress.h	added	+44	−0	View file
include/asm-arm/arch-orion/vmalloc.h	added	+5	−0	View file
include/asm-arm/arch-pxa/colibri.h	added	+19	−0	View file
include/asm-arm/arch-pxa/corgi.h	modified	+0	−1	View file
include/asm-arm/arch-pxa/irqs.h	modified	+9	−1	View file
include/asm-arm/arch-pxa/littleton.h	added	+6	−0	View file
include/asm-arm/arch-pxa/magician.h	added	+111	−0	View file
include/asm-arm/arch-pxa/mfp-pxa300.h	modified	+1	−0	View file
include/asm-arm/arch-pxa/mfp-pxa320.h	modified	+1	−0	View file
include/asm-arm/arch-pxa/mfp-pxa3xx.h	added	+252	−0	View file
include/asm-arm/arch-pxa/mfp.h	modified	+68	−341	View file
include/asm-arm/arch-pxa/mmc.h	modified	+2	−0	View file
include/asm-arm/arch-pxa/pcm027.h	added	+75	−0	View file
include/asm-arm/arch-pxa/pcm990_baseboard.h	added	+275	−0	View file
include/asm-arm/arch-pxa/pxa-regs.h	modified	+72	−298	View file
include/asm-arm/arch-pxa/pxa2xx-regs.h	added	+84	−0	View file
include/asm-arm/arch-pxa/pxa2xx_spi.h	modified	+0	−24	View file
include/asm-arm/arch-pxa/pxa3xx-regs.h	modified	+86	−0	View file
include/asm-arm/arch-pxa/regs-ssp.h	added	+112	−0	View file
include/asm-arm/arch-pxa/sharpsl.h	modified	+1	−1	View file
include/asm-arm/arch-pxa/spitz.h	modified	+0	−2	View file
include/asm-arm/arch-pxa/ssp.h	modified	+33	−3	View file
include/asm-arm/arch-pxa/uncompress.h	modified	+8	−6	View file
include/asm-arm/arch-pxa/zylonite.h	modified	+9	−0	View file
include/asm-arm/arch-s3c2410/debug-macro.S	modified	+0	−2	View file
include/asm-arm/arch-s3c2410/dma.h	modified	+1	−0	View file
include/asm-arm/arch-s3c2410/hardware.h	modified	+28	−0	View file
include/asm-arm/arch-s3c2410/irqs.h	modified	+3	−0	View file
include/asm-arm/arch-s3c2410/regs-clock.h	modified	+2	−0	View file
include/asm-arm/arch-s3c2410/regs-dsc.h	modified	+1	−1	View file
include/asm-arm/arch-s3c2410/regs-gpio.h	modified	+5	−1	View file
include/asm-arm/arch-s3c2410/regs-mem.h	modified	+6	−0	View file
include/asm-arm/arch-s3c2410/regs-power.h	modified	+2	−1	View file
include/asm-arm/arch-s3c2410/system.h	modified	+17	−3	View file
include/asm-arm/cacheflush.h	modified	+8	−0	View file
include/asm-arm/fpstate.h	modified	+7	−2	View file
include/asm-arm/kprobes.h	added	+79	−0	View file
include/asm-arm/plat-s3c24xx/dma.h	modified	+5	−0	View file
include/asm-arm/plat-s3c24xx/irq.h	modified	+2	−0	View file
include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h	added	+72	−0	View file
include/asm-arm/plat-s3c24xx/regs-spi.h	modified	+30	−2	View file
include/asm-arm/proc-fns.h	modified	+8	−0	View file
include/asm-arm/traps.h	modified	+9	−0	View file
include/asm-arm/vfp.h	modified	+20	−14	View file
include/asm-arm/vfpmacros.h	modified	+16	−2	View file
include/asm-avr32/arch-at32ap/cpu.h	modified	+1	−0	View file
include/linux/mv643xx.h	modified	+1	−9	View file
include/linux/mv643xx_i2c.h	added	+22	−0	View file
sound/oss/waveartist.c	modified	+1	−1	View file

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

Documentation/cpu-freq/user-guide.txt

View file

diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt
index 555c8cf..af3b925 100644
--- a/Documentation/cpu-freq/user-guide.txt
+++ b/Documentation/cpu-freq/user-guide.txt
@@ -45,6 +45,7 @@ The following ARM processors are supported by cpufreq:
 ARM Integrator
 ARM-SA1100
 ARM-SA1110
+Intel PXA
 
 
 1.2 x86

Documentation/kprobes.txt

View file

diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index cb12ae1..53a6389 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -141,6 +141,7 @@ architectures:
 - ppc64
 - ia64 (Does not support probes on instruction slot1.)
 - sparc64 (Return probes not yet implemented.)
+- arm
 
 3. Configuring Kprobes
 

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a04f507..de211ac 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -180,8 +180,8 @@ config ARCH_AT91
 	bool "Atmel AT91"
 	select GENERIC_GPIO
 	help
-	  This enables support for systems based on the Atmel AT91RM9200
-	  and AT91SAM9xxx processors.
+	  This enables support for systems based on the Atmel AT91RM9200,
+	  AT91SAM9 and AT91CAP9 processors.
 
 config ARCH_CLPS7500
 	bool "Cirrus CL-PS7500FE"
@@ -217,6 +217,7 @@ config ARCH_EP93XX
 	bool "EP93xx-based"
 	select ARM_AMBA
 	select ARM_VIC
+	select GENERIC_GPIO
 	help
 	  This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -333,6 +334,16 @@ config ARCH_MXC
 	help
 	  Support for Freescale MXC/iMX-based family of processors
 
+config ARCH_ORION
+	bool "Marvell Orion"
+	depends on MMU
+	select PCI
+	select GENERIC_GPIO
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+	help
+	  Support for Marvell Orion System on Chip family.
+
 config ARCH_PNX4008
 	bool "Philips Nexperia PNX4008 Mobile"
 	help
@@ -345,6 +356,7 @@ config ARCH_PXA
 	select GENERIC_GPIO
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
+	select TICK_ONESHOT
 	help
 	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 
@@ -366,6 +378,7 @@ config ARCH_SA1100
 	select ARCH_DISCONTIGMEM_ENABLE
 	select ARCH_MTD_XIP
 	select GENERIC_GPIO
+	select GENERIC_TIME
 	help
 	  Support for StrongARM 11x0 based boards.
 
@@ -409,6 +422,17 @@ config ARCH_OMAP
 	help
 	  Support for TI's OMAP platform (OMAP1 and OMAP2).
 
+config ARCH_MSM7X00A
+	bool "Qualcomm MSM7X00A"
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+	help
+	  Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
+	  apps processor of the MSM7X00A and depends on a shared memory
+	  interface to the ARM9 modem processor which runs the baseband stack
+	  and controls some vital subsystems (clock and power control, etc).
+	  <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
+
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
@@ -441,6 +465,8 @@ source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
 
+source "arch/arm/mach-orion/Kconfig"
+
 source "arch/arm/plat-s3c24xx/Kconfig"
 source "arch/arm/plat-s3c/Kconfig"
 
@@ -477,6 +503,8 @@ source "arch/arm/mach-davinci/Kconfig"
 
 source "arch/arm/mach-ks8695/Kconfig"
 
+source "arch/arm/mach-msm/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
 	bool
@@ -657,6 +685,7 @@ config HZ
 	default 128 if ARCH_L7200
 	default 200 if ARCH_EBSA110 || ARCH_S3C2410
 	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
+	default AT91_TIMER_HZ if ARCH_AT91
 	default 100
 
 config AEABI
@@ -716,7 +745,7 @@ config LEDS
 		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
 		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
 		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
-		   ARCH_KS8695
+		   ARCH_KS8695 || MACH_RD88F5182
 	help
 	  If you say Y here, the LEDs on your machine will be used
 	  to provide useful information about your current system status.
@@ -867,7 +896,7 @@ config KEXEC
 
 endmenu
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
 
 menu "CPU Frequency scaling"
 
@@ -903,6 +932,12 @@ config CPU_FREQ_IMX
 
 	  If in doubt, say N.
 
+config CPU_FREQ_PXA
+	bool
+	depends on CPU_FREQ && ARCH_PXA && PXA25x
+	default y
+	select CPU_FREQ_DEFAULT_GOV_USERSPACE
+
 endmenu
 
 endif
@@ -951,7 +986,7 @@ config FPE_FASTFPE
 
 config VFP
 	bool "VFP-format floating point maths"
-	depends on CPU_V6 || CPU_ARM926T
+	depends on CPU_V6 || CPU_ARM926T || CPU_V7 || CPU_FEROCEON
 	help
 	  Say Y to include VFP support code in the kernel. This is needed
 	  if your hardware includes a VFP unit.
@@ -961,6 +996,18 @@ config VFP
 
 	  Say N if your target does not have VFP hardware.
 
+config VFPv3
+	bool
+	depends on VFP
+	default y if CPU_V7
+
+config NEON
+	bool "Advanced SIMD (NEON) Extension support"
+	depends on VFPv3 && CPU_V7
+	help
+	  Say Y to include support code for NEON, the ARMv7 Advanced SIMD
+	  Extension.
+
 endmenu
 
 menu "Userspace binary formats"

arch/arm/Kconfig.debug

View file

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 18101f5..192ee01 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -43,6 +43,12 @@ config DEBUG_ERRORS
 	  you are concerned with the code size or don't want to see these
 	  messages.
 
+config DEBUG_STACK_USAGE
+	bool "Enable stack utilization instrumentation"
+	depends on DEBUG_KERNEL
+	help
+	  Enables the display of the minimum amount of free stack which each
+	  task has ever had available in the sysrq-T output.
 
 # These options are only for real kernel hackers who want to get their hands dirty.
 config DEBUG_LL

arch/arm/Kconfig.instrumentation

View file

diff --git a/arch/arm/Kconfig.instrumentation b/arch/arm/Kconfig.instrumentation
index 63b8c6d..453ad8e 100644
--- a/arch/arm/Kconfig.instrumentation
+++ b/arch/arm/Kconfig.instrumentation
@@ -43,6 +43,16 @@ config OPROFILE_MPCORE
 config OPROFILE_ARM11_CORE
 	bool
 
+config KPROBES
+	bool "Kprobes"
+	depends on KALLSYMS && MODULES && !UML && !XIP_KERNEL
+	help
+	  Kprobes allows you to trap at almost any kernel address and
+	  execute a callback function.  register_kprobe() establishes
+	  a probepoint and specifies the callback.  Kprobes is useful
+	  for kernel debugging, non-intrusive instrumentation and testing.
+	  If in doubt, say "N".
+
 config MARKERS
 	bool "Activate markers"
 	help

arch/arm/Makefile

View file

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 35e56c9..7b8ff66 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -139,6 +139,8 @@ endif
  machine-$(CONFIG_ARCH_KS8695)     := ks8695
   incdir-$(CONFIG_ARCH_MXC)	   := mxc
  machine-$(CONFIG_ARCH_MX3)	   := mx3
+ machine-$(CONFIG_ARCH_ORION)	   := orion
+ machine-$(CONFIG_ARCH_MSM7X00A)   := msm
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.

arch/arm/boot/compressed/Makefile

View file

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 5fde99f..de9d9ee 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -44,10 +44,6 @@ ifeq ($(CONFIG_PXA_SHARPSL),y)
 OBJS		+= head-sharpsl.o
 endif
 
-ifeq ($(CONFIG_ARCH_AT91RM9200),y)
-OBJS		+= head-at91rm9200.o
-endif
-
 ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
 ifeq ($(CONFIG_CPU_CP15),y)
 OBJS		+= big-endian.o

arch/arm/boot/compressed/head-at91rm9200.S

View before deletion

diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
deleted file mode 100644
index 11782cc..0000000
--- a/arch/arm/boot/compressed/head-at91rm9200.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * linux/arch/arm/boot/compressed/head-at91rm9200.S
- *
- *  Copyright (C) 2003 SAN People
- *
- * 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 <asm/mach-types.h>
-
-		.section	".start", "ax"
-
-		@ Atmel AT91RM9200-DK : 262
-		mov	r3,	#(MACH_TYPE_AT91RM9200DK & 0xff)
-		orr	r3, r3, #(MACH_TYPE_AT91RM9200DK & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Cogent CSB337 : 399
-		mov	r3,	#(MACH_TYPE_CSB337 & 0xff)
-		orr	r3, r3, #(MACH_TYPE_CSB337 & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Cogent CSB637 : 648
-		mov	r3,	#(MACH_TYPE_CSB637 & 0xff)
-		orr	r3, r3,	#(MACH_TYPE_CSB637 & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Atmel AT91RM9200-EK : 705
-		mov	r3,	#(MACH_TYPE_AT91RM9200EK & 0xff)
-		orr	r3, r3, #(MACH_TYPE_AT91RM9200EK & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Conitec Carmeva : 769
-		mov	r3,	#(MACH_TYPE_CARMEVA & 0xff)
-		orr	r3, r3, #(MACH_TYPE_CARMEVA & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ KwikByte KB920x : 612
-		mov	r3,	#(MACH_TYPE_KB9200 & 0xff)
-		orr	r3, r3, #(MACH_TYPE_KB9200 & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Embest ATEB9200 : 923
-		mov	r3,	#(MACH_TYPE_ATEB9200 & 0xff)
-		orr	r3, r3,	#(MACH_TYPE_ATEB9200 & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Sperry-Sun KAFA : 662
-		mov	r3,	#(MACH_TYPE_KAFA & 0xff)
-		orr	r3, r3,	#(MACH_TYPE_KAFA & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ picotux 200 : 963
-		mov	r3,	#(MACH_TYPE_PICOTUX2XX & 0xff)
-		orr	r3, r3, #(MACH_TYPE_PICOTUX2XX & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Ajeco 1ARM : 1075
-		mov	r3,	#(MACH_TYPE_ONEARM & 0xff)
-		orr	r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
-		cmp	r7, r3
-		beq	99f
-
-		@ Unknown board, use the AT91RM9200DK board
-		@ mov	r7, #MACH_TYPE_AT91RM9200
-		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)
-		orr	r7, r7, #(MACH_TYPE_AT91RM9200DK & 0xff00)
-
-99:

arch/arm/boot/compressed/head.S

View file

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 5cac46a..3c2c8f2 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -623,6 +623,12 @@ proc_types:
 		b	__armv4_mmu_cache_off
 		b	__armv4_mmu_cache_flush
 
+		.word	0x56055310		@ Feroceon
+		.word	0xfffffff0
+		b	__armv4_mmu_cache_on
+		b	__armv4_mmu_cache_off
+		b	__armv5tej_mmu_cache_flush
+
 		@ These match on the architecture ID
 
 		.word	0x00020000		@ ARMv4T
@@ -641,7 +647,7 @@ proc_types:
 		.word	0x000f0000
 		b	__armv4_mmu_cache_on
 		b	__armv4_mmu_cache_off
-		b	__armv4_mmu_cache_flush
+		b	__armv5tej_mmu_cache_flush
 
 		.word	0x0007b000		@ ARMv6
 		.word	0x000ff000
@@ -821,6 +827,13 @@ iflush:
 		mcr	p15, 0, r10, c7, c10, 4	@ drain WB
 		mov	pc, lr
 
+__armv5tej_mmu_cache_flush:
+1:		mrc	p15, 0, r15, c7, c14, 3	@ test,clean,invalidate D cache
+		bne	1b
+		mcr	p15, 0, r0, c7, c5, 0	@ flush I cache
+		mcr	p15, 0, r0, c7, c10, 4	@ drain WB
+		mov	pc, lr
+
 __armv4_mmu_cache_flush:
 		mov	r2, #64*1024		@ default: 32K dcache size (*2)
 		mov	r11, #32		@ default: 32 byte line size

arch/arm/common/rtctime.c

View file

diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
index bf1075e..f53bca4 100644
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@ -20,7 +20,6 @@
 #include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
-#include <linux/rtc.h>
 
 #include <asm/rtc.h>
 #include <asm/semaphore.h>

arch/arm/configs/at91cap9adk_defconfig

View file

diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig
new file mode 100644
index 0000000..e32e736
--- /dev/null
+++ b/arch/arm/configs/at91cap9adk_defconfig
@@ -0,0 +1,1143 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24-rc8
+# Wed Jan 23 22:55:57 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+# CONFIG_GENERIC_CLOCKEVENTS is not set
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_AT91SAM9260 is not set
+# CONFIG_ARCH_AT91SAM9261 is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
+# CONFIG_ARCH_AT91SAM9RL is not set
+CONFIG_ARCH_AT91CAP9=y
+# CONFIG_ARCH_AT91X40 is not set
+CONFIG_AT91_PMC_UNIT=y
+
+#
+# AT91CAP9 Board Type
+#
+CONFIG_MACH_AT91CAP9ADK=y
+
+#
+# AT91 Board Options
+#
+CONFIG_MTD_AT91_DATAFLASH_CARD=y
+# CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
+
+#
+# AT91 Feature Selections
+#
+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
+CONFIG_AT91_TIMER_HZ=100
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#