From debc5721eeb2eb3bcacd5cb715ad77eed914782c Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Sat, 10 Mar 2012 22:21:36 -0800 Subject: [PATCH] --- yaml --- r: 295718 b: refs/heads/master c: c15a04338b5a6d4305d107a5b6c0cd43418b7f3e h: refs/heads/master v: v3 --- [refs] | 2 +- .../feature-removal-schedule.txt | 14 + trunk/MAINTAINERS | 6 +- trunk/Makefile | 2 +- trunk/arch/arm/Kconfig | 35 +- trunk/arch/arm/Kconfig.debug | 2 +- trunk/arch/arm/Makefile | 2 +- trunk/arch/arm/boot/compressed/head.S | 2 +- trunk/arch/arm/configs/at91cap9_defconfig | 108 ++ trunk/arch/arm/configs/mini2440_defconfig | 2 +- trunk/arch/arm/configs/s3c2410_defconfig | 57 +- trunk/arch/arm/configs/tct_hammer_defconfig | 2 +- .../include/asm/hardware/entry-macro-iomd.S | 8 + trunk/arch/arm/kernel/entry-armv.S | 3 +- trunk/arch/arm/kernel/entry-common.S | 8 +- trunk/arch/arm/mach-at91/Kconfig | 26 +- trunk/arch/arm/mach-at91/Makefile | 4 + trunk/arch/arm/mach-at91/Makefile.boot | 6 +- trunk/arch/arm/mach-at91/at91cap9.c | 404 ++++++ trunk/arch/arm/mach-at91/at91cap9_devices.c | 1273 +++++++++++++++++ trunk/arch/arm/mach-at91/board-cap9adk.c | 396 +++++ trunk/arch/arm/mach-at91/clock.c | 5 +- trunk/arch/arm/mach-at91/cpuidle.c | 11 +- trunk/arch/arm/mach-at91/generic.h | 1 + .../arm/mach-at91/include/mach/at91_pmc.h | 14 +- .../arm/mach-at91/include/mach/at91cap9.h | 122 ++ .../mach-at91/include/mach/at91cap9_matrix.h | 137 ++ .../mach-at91/include/mach/at91sam9_ddrsdr.h | 10 + trunk/arch/arm/mach-at91/include/mach/cpu.h | 21 + .../arm/mach-at91/include/mach/entry-macro.S | 6 + .../arm/mach-at91/include/mach/hardware.h | 4 +- trunk/arch/arm/mach-at91/pm.c | 17 +- trunk/arch/arm/mach-at91/pm.h | 91 +- trunk/arch/arm/mach-at91/pm_slowclock.S | 12 +- trunk/arch/arm/mach-at91/setup.c | 17 + trunk/arch/arm/mach-at91/soc.h | 5 + .../mach-bcmring/include/mach/entry-macro.S | 6 + .../mach-clps711x/include/mach/entry-macro.S | 6 + .../mach-cns3xxx/include/mach/entry-macro.S | 15 + trunk/arch/arm/mach-davinci/board-dm355-evm.c | 3 +- .../arm/mach-davinci/board-dm355-leopard.c | 3 +- trunk/arch/arm/mach-davinci/board-dm365-evm.c | 3 +- .../arch/arm/mach-davinci/board-dm644x-evm.c | 28 +- .../arch/arm/mach-davinci/board-dm646x-evm.c | 32 +- .../arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- trunk/arch/arm/mach-davinci/board-sffsdr.c | 3 +- trunk/arch/arm/mach-davinci/davinci.h | 96 -- trunk/arch/arm/mach-davinci/devices.c | 32 +- trunk/arch/arm/mach-davinci/dm355.c | 3 +- trunk/arch/arm/mach-davinci/dm365.c | 19 +- trunk/arch/arm/mach-davinci/dm644x.c | 53 +- trunk/arch/arm/mach-davinci/dm646x.c | 21 +- .../arm/mach-davinci/include/mach/dm355.h | 32 + .../arm/mach-davinci/include/mach/dm365.h | 53 +- .../arm/mach-davinci/include/mach/dm644x.h | 47 + .../arm/mach-davinci/include/mach/dm646x.h | 42 +- .../mach-davinci/include/mach/entry-macro.S | 6 + .../arm/mach-davinci/include/mach/hardware.h | 2 + .../arm/mach-dove/include/mach/entry-macro.S | 6 + .../mach-ebsa110/include/mach/entry-macro.S | 6 + .../mach-ep93xx/include/mach/entry-macro.S | 17 + .../mach-exynos/include/mach/entry-macro.S | 16 + .../include/mach/entry-macro.S | 6 + .../mach-gemini/include/mach/entry-macro.S | 6 + .../arm/mach-h720x/include/mach/entry-macro.S | 6 + .../mach-highbank/include/mach/entry-macro.S | 5 + trunk/arch/arm/mach-imx/clock-imx31.c | 2 +- trunk/arch/arm/mach-imx/clock-imx35.c | 166 ++- .../{crmregs-imx3.h => crmregs-imx31.h} | 15 +- trunk/arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- .../include/mach/entry-macro.S | 6 + .../mach-iop13xx/include/mach/entry-macro.S | 3 + .../mach-iop32x/include/mach/entry-macro.S | 3 + .../mach-iop33x/include/mach/entry-macro.S | 3 + .../mach-ixp2000/include/mach/entry-macro.S | 6 + .../mach-ixp23xx/include/mach/entry-macro.S | 6 + .../mach-ixp4xx/include/mach/entry-macro.S | 6 + .../mach-kirkwood/include/mach/entry-macro.S | 6 + .../mach-ks8695/include/mach/entry-macro.S | 6 + .../mach-lpc32xx/include/mach/entry-macro.S | 6 + .../arch/arm/mach-lpc32xx/include/mach/irqs.h | 2 +- trunk/arch/arm/mach-lpc32xx/irq.c | 25 +- trunk/arch/arm/mach-lpc32xx/serial.c | 20 +- trunk/arch/arm/mach-mmp/aspenite.c | 1 - .../arm/mach-mmp/include/mach/entry-macro.S | 6 + trunk/arch/arm/mach-mmp/pxa168.c | 1 - trunk/arch/arm/mach-mmp/tavorevb.c | 1 - .../arm/mach-msm/include/mach/entry-macro.S | 6 + .../mach-mv78xx0/include/mach/entry-macro.S | 6 + .../arm/mach-mxs/include/mach/entry-macro.S | 6 + .../arm/mach-netx/include/mach/entry-macro.S | 26 + .../mach-nomadik/include/mach/entry-macro.S | 13 + .../arm/mach-omap1/ams-delta-fiq-handler.S | 3 +- trunk/arch/arm/mach-omap1/ams-delta-fiq.c | 1 - trunk/arch/arm/mach-omap1/board-ams-delta.c | 10 +- trunk/arch/arm/mach-omap1/board-fsample.c | 7 +- trunk/arch/arm/mach-omap1/board-h2.c | 6 +- trunk/arch/arm/mach-omap1/board-h3.c | 8 +- trunk/arch/arm/mach-omap1/board-htcherald.c | 5 +- trunk/arch/arm/mach-omap1/board-innovator.c | 11 +- trunk/arch/arm/mach-omap1/board-nokia770.c | 6 +- trunk/arch/arm/mach-omap1/board-osk.c | 7 +- trunk/arch/arm/mach-omap1/board-palmte.c | 4 +- trunk/arch/arm/mach-omap1/board-palmtt.c | 9 +- trunk/arch/arm/mach-omap1/board-palmz71.c | 9 +- trunk/arch/arm/mach-omap1/board-perseus2.c | 7 +- trunk/arch/arm/mach-omap1/board-sx1.c | 6 +- trunk/arch/arm/mach-omap1/board-voiceblue.c | 6 +- trunk/arch/arm/mach-omap1/clock.c | 5 +- trunk/arch/arm/mach-omap1/clock_data.c | 5 +- trunk/arch/arm/mach-omap1/common.h | 1 - trunk/arch/arm/mach-omap1/devices.c | 8 +- trunk/arch/arm/mach-omap1/dma.c | 2 +- trunk/arch/arm/mach-omap1/flash.c | 4 +- trunk/arch/arm/mach-omap1/fpga.c | 5 +- trunk/arch/arm/mach-omap1/gpio15xx.c | 7 +- trunk/arch/arm/mach-omap1/gpio16xx.c | 47 +- trunk/arch/arm/mach-omap1/gpio7xx.c | 14 +- trunk/arch/arm/mach-omap1/id.c | 3 - .../arm/mach-omap1/include/mach/entry-macro.S | 8 +- .../arm/mach-omap1/include/mach/hardware.h | 36 - trunk/arch/arm/mach-omap1/include/mach/io.h | 43 +- .../arch/arm/mach-omap1/include/mach/memory.h | 3 +- trunk/arch/arm/mach-omap1/io.c | 3 - trunk/arch/arm/mach-omap1/iomap.h | 42 - trunk/arch/arm/mach-omap1/irq.c | 4 +- trunk/arch/arm/mach-omap1/lcd_dma.c | 3 +- trunk/arch/arm/mach-omap1/mcbsp.c | 5 +- trunk/arch/arm/mach-omap1/pm.c | 4 +- trunk/arch/arm/mach-omap1/reset.c | 3 +- trunk/arch/arm/mach-omap1/sleep.S | 4 - trunk/arch/arm/mach-omap1/sram.S | 4 - trunk/arch/arm/mach-omap1/time.c | 3 +- trunk/arch/arm/mach-omap1/timer32k.c | 7 +- trunk/arch/arm/mach-omap2/Kconfig | 4 +- trunk/arch/arm/mach-omap2/board-2430sdp.c | 2 +- trunk/arch/arm/mach-omap2/board-3430sdp.c | 5 +- trunk/arch/arm/mach-omap2/board-4430sdp.c | 4 +- trunk/arch/arm/mach-omap2/board-am3517evm.c | 2 +- trunk/arch/arm/mach-omap2/board-cm-t35.c | 6 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 4 +- trunk/arch/arm/mach-omap2/board-flash.c | 2 +- trunk/arch/arm/mach-omap2/board-igep0020.c | 6 +- trunk/arch/arm/mach-omap2/board-ldp.c | 2 +- trunk/arch/arm/mach-omap2/board-n8x0.c | 1 + trunk/arch/arm/mach-omap2/board-omap3beagle.c | 10 +- trunk/arch/arm/mach-omap2/board-omap3evm.c | 9 +- trunk/arch/arm/mach-omap2/board-omap3logic.c | 2 +- .../arch/arm/mach-omap2/board-omap3pandora.c | 5 +- .../arch/arm/mach-omap2/board-omap3stalker.c | 15 +- .../arm/mach-omap2/board-omap3touchbook.c | 17 +- trunk/arch/arm/mach-omap2/board-omap4panda.c | 6 +- trunk/arch/arm/mach-omap2/board-overo.c | 3 +- trunk/arch/arm/mach-omap2/board-rm680.c | 2 +- .../arm/mach-omap2/board-rx51-peripherals.c | 5 +- .../arch/arm/mach-omap2/board-zoom-display.c | 1 + .../arm/mach-omap2/board-zoom-peripherals.c | 4 +- .../arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 1 - trunk/arch/arm/mach-omap2/clkt_dpll.c | 1 - trunk/arch/arm/mach-omap2/clock2420_data.c | 3 - trunk/arch/arm/mach-omap2/clock2430.c | 2 - trunk/arch/arm/mach-omap2/clock2430_data.c | 2 - trunk/arch/arm/mach-omap2/clock2xxx.c | 1 - trunk/arch/arm/mach-omap2/clock3xxx.c | 1 - trunk/arch/arm/mach-omap2/clock3xxx_data.c | 3 +- trunk/arch/arm/mach-omap2/clock44xx_data.c | 3 - trunk/arch/arm/mach-omap2/cm2xxx_3xxx.c | 4 +- trunk/arch/arm/mach-omap2/cm44xx.c | 2 +- trunk/arch/arm/mach-omap2/cminst44xx.c | 2 +- .../arm/mach-omap2/common-board-devices.c | 1 + trunk/arch/arm/mach-omap2/common.c | 5 +- trunk/arch/arm/mach-omap2/common.h | 8 +- trunk/arch/arm/mach-omap2/control.c | 4 +- trunk/arch/arm/mach-omap2/control.h | 1 + trunk/arch/arm/mach-omap2/cpuidle44xx.c | 5 +- trunk/arch/arm/mach-omap2/devices.c | 10 +- trunk/arch/arm/mach-omap2/display.c | 9 +- trunk/arch/arm/mach-omap2/emu.c | 4 - trunk/arch/arm/mach-omap2/gpio.c | 38 +- trunk/arch/arm/mach-omap2/gpmc-nand.c | 1 - trunk/arch/arm/mach-omap2/gpmc-onenand.c | 1 - trunk/arch/arm/mach-omap2/gpmc-smsc911x.c | 52 + trunk/arch/arm/mach-omap2/hsmmc.c | 123 +- trunk/arch/arm/mach-omap2/hsmmc.h | 12 +- .../arm/mach-omap2/include/mach/entry-macro.S | 18 + trunk/arch/arm/mach-omap2/include/mach/io.h | 46 +- trunk/arch/arm/mach-omap2/io.c | 58 +- trunk/arch/arm/mach-omap2/irq.c | 5 +- trunk/arch/arm/mach-omap2/mailbox.c | 13 +- trunk/arch/arm/mach-omap2/mcbsp.c | 2 +- trunk/arch/arm/mach-omap2/mux.c | 16 +- .../arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 + trunk/arch/arm/mach-omap2/omap-smp.c | 3 +- trunk/arch/arm/mach-omap2/omap4-common.c | 25 +- trunk/arch/arm/mach-omap2/opp2420_data.c | 2 - trunk/arch/arm/mach-omap2/opp2430_data.c | 2 - trunk/arch/arm/mach-omap2/pm-debug.c | 6 +- trunk/arch/arm/mach-omap2/pm.c | 118 +- trunk/arch/arm/mach-omap2/pm.h | 3 +- trunk/arch/arm/mach-omap2/pm24xx.c | 100 +- trunk/arch/arm/mach-omap2/pm34xx.c | 88 +- trunk/arch/arm/mach-omap2/pm44xx.c | 57 +- trunk/arch/arm/mach-omap2/prcm_mpu44xx.c | 2 +- trunk/arch/arm/mach-omap2/prm44xx.c | 3 +- trunk/arch/arm/mach-omap2/prminst44xx.c | 2 +- trunk/arch/arm/mach-omap2/sdram-nokia.c | 1 + trunk/arch/arm/mach-omap2/sdrc2xxx.c | 6 +- trunk/arch/arm/mach-omap2/serial.c | 4 + trunk/arch/arm/mach-omap2/sleep24xx.S | 1 + trunk/arch/arm/mach-omap2/sleep34xx.S | 5 +- trunk/arch/arm/mach-omap2/sr_device.c | 2 +- trunk/arch/arm/mach-omap2/sram242x.S | 4 +- trunk/arch/arm/mach-omap2/sram243x.S | 4 +- trunk/arch/arm/mach-omap2/sram34xx.S | 5 +- trunk/arch/arm/mach-omap2/usb-host.c | 6 +- .../mach-orion5x/include/mach/entry-macro.S | 6 + .../mach-picoxcell/include/mach/entry-macro.S | 16 + .../mach-pnx4008/include/mach/entry-macro.S | 6 + .../mach-prima2/include/mach/entry-macro.S | 7 + trunk/arch/arm/mach-pxa/hx4700.c | 25 + .../arm/mach-pxa/include/mach/entry-macro.S | 15 + trunk/arch/arm/mach-pxa/pxa25x.c | 1 - trunk/arch/arm/mach-pxa/pxa27x.c | 1 - trunk/arch/arm/mach-pxa/saarb.c | 1 - trunk/arch/arm/mach-pxa/sharpsl_pm.c | 3 +- trunk/arch/arm/mach-pxa/spitz_pm.c | 5 +- .../mach-realview/include/mach/entry-macro.S | 16 + trunk/arch/arm/mach-rpc/Makefile | 2 +- trunk/arch/arm/mach-rpc/fiq.S | 16 - .../arm/mach-rpc/include/mach/entry-macro.S | 4 + trunk/arch/arm/mach-rpc/irq.c | 6 - trunk/arch/arm/mach-s3c2410/Kconfig | 154 ++ trunk/arch/arm/mach-s3c2410/Makefile | 26 + .../Makefile.boot | 0 .../{mach-s3c24xx => mach-s3c2410}/bast-ide.c | 0 .../{mach-s3c24xx => mach-s3c2410}/bast-irq.c | 0 .../{mach-s3c24xx => mach-s3c2410}/common.h | 6 - .../dma-s3c2410.c => mach-s3c2410/dma.c} | 0 .../h1940-bluetooth.c | 0 .../include/mach/anubis-cpld.h | 0 .../include/mach/anubis-irq.h | 0 .../include/mach/anubis-map.h | 0 .../include/mach/bast-cpld.h | 0 .../include/mach/bast-irq.h | 0 .../include/mach/bast-map.h | 0 .../include/mach/bast-pmu.h | 0 .../include/mach/debug-macro.S | 0 .../include/mach/dma.h | 0 .../include/mach/entry-macro.S | 8 + .../include/mach/fb.h | 0 .../include/mach/gpio-fns.h | 0 .../include/mach/gpio-nrs.h | 0 .../include/mach/gpio-track.h | 0 .../include/mach/gpio.h | 0 .../include/mach/h1940-latch.h | 0 .../include/mach/h1940.h | 0 .../include/mach/hardware.h | 0 .../include/mach/idle.h | 0 .../include/mach/io.h | 0 .../include/mach/irqs.h | 0 .../include/mach/leds-gpio.h | 0 .../include/mach/map.h | 0 .../include/mach/osiris-cpld.h | 0 .../include/mach/osiris-map.h | 0 .../include/mach/otom-map.h | 0 .../include/mach/pm-core.h | 0 .../include/mach/regs-clock.h | 0 .../include/mach/regs-dsc.h | 0 .../include/mach/regs-gpio.h | 0 .../include/mach/regs-gpioj.h | 0 .../include/mach/regs-irq.h | 0 .../include/mach/regs-lcd.h | 0 .../include/mach/regs-mem.h | 0 .../include/mach/regs-power.h | 0 .../include/mach/regs-s3c2412-mem.h | 0 .../include/mach/regs-s3c2412.h | 0 .../include/mach/regs-s3c2416-mem.h | 0 .../include/mach/regs-s3c2416.h | 0 .../include/mach/regs-s3c2443-clock.h | 0 .../include/mach/regs-sdi.h | 0 .../arm/mach-s3c2410/include/mach/spi.h} | 20 +- .../include/mach/tick.h | 0 .../include/mach/timex.h | 0 .../include/mach/uncompress.h | 0 .../include/mach/vr1000-cpld.h | 0 .../include/mach/vr1000-irq.h | 0 .../include/mach/vr1000-map.h | 0 .../mach-amlm5900.c | 0 .../mach-bast.c | 3 +- .../mach-h1940.c | 0 .../{mach-s3c24xx => mach-s3c2410}/mach-n30.c | 0 .../mach-otom.c | 0 .../mach-qt2410.c | 0 .../mach-smdk2410.c | 0 .../mach-tct_hammer.c | 0 .../mach-vr1000.c | 3 +- .../nor-simtec.c} | 2 +- .../simtec.h => mach-s3c2410/nor-simtec.h} | 9 +- .../{mach-s3c24xx => mach-s3c2410}/pm-h1940.S | 0 .../pm-s3c2410.c => mach-s3c2410/pm.c} | 0 .../{mach-s3c24xx => mach-s3c2410}/s3c2410.c | 0 .../sleep-s3c2410.S => mach-s3c2410/sleep.S} | 0 .../usb-simtec.c} | 2 +- trunk/arch/arm/mach-s3c2410/usb-simtec.h | 16 + trunk/arch/arm/mach-s3c2412/Kconfig | 85 ++ trunk/arch/arm/mach-s3c2412/Makefile | 12 + .../clock-s3c2412.c => mach-s3c2412/clock.c} | 0 .../dma-s3c2412.c => mach-s3c2412/dma.c} | 0 .../irq-s3c2412.c => mach-s3c2412/irq.c} | 0 .../mach-jive.c | 0 .../mach-smdk2413.c | 0 .../mach-vstms.c | 0 .../pm-s3c2412.c => mach-s3c2412/pm.c} | 0 .../{mach-s3c24xx => mach-s3c2412}/s3c2412.c | 0 .../sleep-s3c2412.S => mach-s3c2412/sleep.S} | 0 trunk/arch/arm/mach-s3c2416/Kconfig | 60 + trunk/arch/arm/mach-s3c2416/Makefile | 22 + .../clock-s3c2416.c => mach-s3c2416/clock.c} | 1 + .../irq-s3c2416.c => mach-s3c2416/irq.c} | 0 .../mach-smdk2416.c | 0 .../pm-s3c2416.c => mach-s3c2416/pm.c} | 0 .../{mach-s3c24xx => mach-s3c2416}/s3c2416.c | 0 .../setup-sdhci-gpio.c | 0 trunk/arch/arm/mach-s3c2440/Kconfig | 165 +++ trunk/arch/arm/mach-s3c2440/Makefile | 26 +- .../clock-s3c2440.c => mach-s3c2440/clock.c} | 0 trunk/arch/arm/mach-s3c2440/common.h | 17 + .../dma-s3c2440.c => mach-s3c2440/dma.c} | 0 .../include/mach/gta02.h | 0 .../irq-s3c2440.c => mach-s3c2440/irq.c} | 0 .../mach-anubis.c | 1 - .../mach-at2440evb.c | 0 .../mach-gta02.c | 2 +- .../mach-mini2440.c | 0 .../mach-nexcoder.c | 0 .../mach-osiris-dvs.c | 0 .../mach-osiris.c | 0 .../mach-rx1950.c | 0 .../mach-rx3715.c | 0 .../mach-smdk2440.c | 0 .../{mach-s3c24xx => mach-s3c2440}/s3c2440.c | 0 .../{mach-s3c24xx => mach-s3c2440}/s3c2442.c | 0 .../s3c244x-clock.c} | 0 .../s3c244x-irq.c} | 0 .../{mach-s3c24xx => mach-s3c2440}/s3c244x.c | 0 trunk/arch/arm/mach-s3c2443/Kconfig | 32 + trunk/arch/arm/mach-s3c2443/Makefile | 20 + .../clock-s3c2443.c => mach-s3c2443/clock.c} | 7 + .../dma-s3c2443.c => mach-s3c2443/dma.c} | 30 +- .../irq-s3c2443.c => mach-s3c2443/irq.c} | 0 .../mach-smdk2443.c | 0 .../{mach-s3c24xx => mach-s3c2443}/s3c2443.c | 0 trunk/arch/arm/mach-s3c24xx/Kconfig | 538 ------- trunk/arch/arm/mach-s3c24xx/Makefile | 95 -- .../mach-s3c64xx/include/mach/entry-macro.S | 19 + .../mach-s5p64x0/include/mach/entry-macro.S | 17 + .../mach-s5pc100/include/mach/entry-macro.S | 6 + .../mach-s5pv210/include/mach/entry-macro.S | 17 + .../mach-sa1100/include/mach/entry-macro.S | 6 + .../arm/mach-shark/include/mach/entry-macro.S | 6 + .../mach-shmobile/include/mach/entry-macro.S | 22 + .../mach-spear3xx/include/mach/entry-macro.S | 18 + .../mach-spear6xx/include/mach/entry-macro.S | 18 + trunk/arch/arm/mach-tegra/Kconfig | 14 - trunk/arch/arm/mach-tegra/Makefile | 3 +- trunk/arch/arm/mach-tegra/common.c | 2 + .../arm/mach-tegra/include/mach/entry-macro.S | 20 + trunk/arch/arm/mach-tegra/usb_phy.c | 11 - .../arm/mach-u300/include/mach/entry-macro.S | 16 + .../arm/mach-ux500/include/mach/entry-macro.S | 18 + .../mach-versatile/include/mach/entry-macro.S | 15 + .../mach-vexpress/include/mach/entry-macro.S | 5 + .../mach-vt8500/include/mach/entry-macro.S | 6 + .../mach-w90x900/include/mach/entry-macro.S | 8 + .../arm/mach-zynq/include/mach/entry-macro.S | 27 + trunk/arch/arm/plat-mxc/audmux-v1.c | 5 +- trunk/arch/arm/plat-mxc/avic.c | 2 +- .../arm/plat-mxc/include/mach/entry-macro.S | 16 + trunk/arch/arm/plat-omap/common.c | 1 + trunk/arch/arm/plat-omap/counter_32k.c | 1 - trunk/arch/arm/plat-omap/dma.c | 2 - trunk/arch/arm/plat-omap/dmtimer.c | 2 - trunk/arch/arm/plat-omap/include/plat/gpio.h | 29 +- .../arm/plat-omap/include/plat/hardware.h | 6 - .../iomap.h => plat-omap/include/plat/io.h} | 80 +- .../arch/arm/plat-omap/include/plat/keypad.h | 2 - trunk/arch/arm/plat-omap/include/plat/mcspi.h | 3 + .../arm/plat-omap/include/plat/omap-secure.h | 6 + .../arm/plat-omap/include/plat/omap_device.h | 9 +- .../arch/arm/plat-omap/include/plat/serial.h | 1 + trunk/arch/arm/plat-omap/include/plat/tc.h | 17 + trunk/arch/arm/plat-omap/include/plat/usb.h | 41 - trunk/arch/arm/plat-omap/mux.c | 5 +- trunk/arch/arm/plat-omap/omap-pm-noop.c | 2 +- trunk/arch/arm/plat-omap/omap_device.c | 44 +- trunk/arch/arm/plat-omap/sram.c | 9 +- trunk/arch/arm/plat-omap/usb.c | 4 - trunk/arch/arm/plat-s3c24xx/Kconfig | 57 +- trunk/arch/arm/plat-s3c24xx/Makefile | 19 +- .../common-smdk.c | 0 .../simtec-pm.c => plat-s3c24xx/pm-simtec.c} | 0 .../s3c2443-clock.c} | 88 +- .../setup-i2c.c | 0 .../{mach-s3c24xx => plat-s3c24xx}/setup-ts.c | 0 .../simtec-audio.c | 2 - .../arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 36 + .../arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 38 + .../arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 36 + trunk/arch/arm/plat-samsung/Kconfig | 4 +- .../plat-samsung/include/plat/audio-simtec.h | 3 + .../arm/plat-samsung/include/plat/clock.h | 22 +- .../arm/plat-samsung/include/plat/regs-dma.h | 2 +- .../arm/plat-samsung/include/plat/s3c2410.h | 2 + .../arm/plat-samsung/include/plat/s3c2443.h | 20 + .../arch/avr32/mach-at32ap/include/mach/cpu.h | 3 + trunk/arch/openrisc/include/asm/ptrace.h | 8 +- trunk/arch/openrisc/kernel/init_task.c | 1 + trunk/arch/openrisc/kernel/irq.c | 1 + trunk/arch/openrisc/kernel/ptrace.c | 12 +- trunk/arch/parisc/Makefile | 4 + trunk/arch/s390/Kconfig | 3 + trunk/arch/s390/include/asm/compat.h | 7 - trunk/arch/s390/kernel/crash_dump.c | 1 - trunk/arch/s390/kernel/process.c | 1 - trunk/arch/s390/kernel/ptrace.c | 2 +- trunk/arch/s390/kernel/setup.c | 2 +- trunk/arch/s390/kernel/signal.c | 1 - trunk/arch/s390/mm/fault.c | 1 - trunk/arch/s390/mm/init.c | 30 +- trunk/arch/s390/mm/mmap.c | 2 +- trunk/arch/x86/include/asm/perf_event.h | 8 + trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 44 +- trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 + trunk/arch/x86/kernel/cpu/perf_event.h | 8 +- trunk/arch/x86/kernel/cpu/perf_event_amd.c | 37 +- trunk/arch/x86/kernel/entry_64.S | 9 +- trunk/arch/x86/kernel/microcode_amd.c | 1 - trunk/arch/x86/kvm/svm.c | 5 + trunk/arch/x86/xen/enlighten.c | 6 +- trunk/arch/x86/xen/mmu.c | 8 +- trunk/block/partitions/ldm.c | 11 +- trunk/drivers/atm/solos-pci.c | 4 +- trunk/drivers/bluetooth/btusb.c | 4 +- trunk/drivers/char/hw_random/omap-rng.c | 2 - trunk/drivers/crypto/mv_cesa.c | 1 + trunk/drivers/gpio/gpio-omap.c | 1106 ++++++++------ .../gpu/drm/exynos/exynos_drm_connector.c | 16 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 +- .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 27 +- trunk/drivers/gpu/drm/i915/intel_display.c | 15 +- trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +- trunk/drivers/gpu/drm/radeon/r600_cs.c | 1 + .../gpu/drm/radeon/radeon_connectors.c | 25 +- trunk/drivers/gpu/drm/radeon/radeon_gart.c | 2 +- trunk/drivers/hwmon/f75375s.c | 89 +- trunk/drivers/i2c/busses/i2c-mxs.c | 13 +- trunk/drivers/input/touchscreen/Kconfig | 2 +- trunk/drivers/iommu/omap-iommu-debug.c | 59 +- trunk/drivers/iommu/omap-iommu.c | 3 +- trunk/drivers/leds/Kconfig | 2 +- trunk/drivers/mmc/host/Kconfig | 2 +- trunk/drivers/mmc/host/at91_mci.c | 1 + trunk/drivers/mtd/nand/Kconfig | 2 +- trunk/drivers/net/can/sja1000/sja1000.c | 13 +- .../net/ethernet/atheros/atl1c/atl1c_main.c | 4 - trunk/drivers/net/ethernet/broadcom/b44.c | 2 +- trunk/drivers/net/ethernet/broadcom/cnic.c | 6 +- .../net/ethernet/cisco/enic/cq_enet_desc.h | 2 +- .../drivers/net/ethernet/cisco/enic/enic_pp.c | 2 +- trunk/drivers/net/ethernet/jme.c | 10 +- trunk/drivers/net/ethernet/jme.h | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/eq.c | 8 +- .../drivers/net/ethernet/mellanox/mlx4/main.c | 10 +- .../drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- .../drivers/net/ethernet/micrel/ks8851_mll.c | 2 +- trunk/drivers/net/ethernet/sfc/rx.c | 4 +- trunk/drivers/net/ethernet/ti/davinci_emac.c | 6 +- trunk/drivers/net/phy/icplus.c | 55 +- trunk/drivers/net/ppp/ppp_generic.c | 23 + trunk/drivers/net/usb/cdc_ether.c | 7 + trunk/drivers/net/usb/hso.c | 2 +- trunk/drivers/net/usb/zaurus.c | 12 + trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- trunk/drivers/net/wireless/ath/ath9k/rc.c | 2 +- trunk/drivers/net/wireless/mwifiex/cfg80211.c | 8 +- trunk/drivers/parisc/iommu-helpers.h | 2 + trunk/drivers/pcmcia/pxa2xx_base.c | 12 +- trunk/drivers/regulator/88pm8607.c | 6 +- trunk/drivers/rtc/Kconfig | 2 +- trunk/drivers/rtc/rtc-sa1100.c | 81 +- trunk/drivers/s390/block/dasd_eckd.c | 2 +- trunk/drivers/s390/block/dasd_ioctl.c | 1 + trunk/drivers/s390/char/fs3270.c | 1 + trunk/drivers/s390/char/vmcp.c | 1 + trunk/drivers/s390/cio/chsc_sch.c | 1 + trunk/drivers/s390/scsi/zfcp_cfdc.c | 1 + trunk/drivers/scsi/osd/osd_uld.c | 4 +- trunk/drivers/spi/Kconfig | 2 +- trunk/drivers/spi/spi-s3c24xx.c | 2 +- trunk/drivers/usb/Kconfig | 2 +- trunk/drivers/usb/gadget/Kconfig | 8 +- trunk/drivers/usb/host/ohci-hcd.c | 2 +- trunk/drivers/video/Kconfig | 2 +- trunk/drivers/video/omap2/displays/Kconfig | 2 +- trunk/drivers/video/omap2/dss/apply.c | 6 + trunk/drivers/video/omap2/dss/dispc.c | 5 + trunk/drivers/video/omap2/dss/dss.c | 3 - trunk/drivers/video/omap2/dss/hdmi.c | 24 +- .../drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 9 +- trunk/drivers/video/via/hw.c | 4 + trunk/drivers/virtio/virtio_balloon.c | 33 +- trunk/drivers/watchdog/Kconfig | 4 +- trunk/drivers/watchdog/booke_wdt.c | 6 +- trunk/drivers/watchdog/hpwdt.c | 5 +- trunk/drivers/watchdog/pnx4008_wdt.c | 2 +- trunk/drivers/watchdog/s3c2410_wdt.c | 57 +- trunk/fs/binfmt_elf.c | 2 +- trunk/fs/dcache.c | 13 +- trunk/fs/ecryptfs/miscdev.c | 2 +- trunk/fs/gfs2/glock.c | 14 +- trunk/fs/gfs2/inode.c | 5 +- trunk/fs/gfs2/ops_fstype.c | 5 + trunk/fs/gfs2/rgrp.c | 13 +- trunk/fs/namei.c | 66 +- trunk/fs/ntfs/attrib.c | 6 +- trunk/fs/ntfs/mft.c | 6 +- trunk/fs/ntfs/super.c | 4 +- trunk/include/asm-generic/iomap.h | 2 +- trunk/include/asm-generic/pci_iomap.h | 2 +- trunk/include/drm/Kbuild | 1 + trunk/include/drm/exynos_drm.h | 22 +- trunk/include/linux/compat.h | 4 + trunk/include/linux/dcache.h | 21 +- trunk/include/linux/if_link.h | 1 + .../include/linux/netfilter_bridge/ebtables.h | 4 +- trunk/include/linux/regset.h | 10 +- trunk/include/linux/rtnetlink.h | 3 + trunk/include/linux/skbuff.h | 10 + trunk/include/net/bluetooth/bluetooth.h | 2 + trunk/include/net/bluetooth/hci_core.h | 6 +- trunk/include/net/bluetooth/l2cap.h | 12 +- trunk/include/net/netfilter/nf_conntrack.h | 2 +- trunk/include/net/rtnetlink.h | 2 +- trunk/include/trace/events/sched.h | 50 - trunk/kernel/events/hw_breakpoint.c | 4 +- trunk/kernel/irq/autoprobe.c | 4 +- trunk/kernel/irq/chip.c | 42 +- trunk/kernel/irq/internals.h | 2 +- trunk/kernel/irq/manage.c | 2 +- trunk/kernel/sched/core.c | 5 +- trunk/kernel/sched/fair.c | 2 + trunk/mm/memblock.c | 6 +- trunk/net/atm/clip.c | 10 +- trunk/net/bluetooth/af_bluetooth.c | 12 +- trunk/net/bluetooth/hci_conn.c | 4 + trunk/net/bluetooth/hci_core.c | 3 +- trunk/net/bluetooth/l2cap_core.c | 24 +- trunk/net/bluetooth/l2cap_sock.c | 4 +- trunk/net/bluetooth/rfcomm/core.c | 18 +- trunk/net/bluetooth/rfcomm/sock.c | 2 + trunk/net/core/neighbour.c | 2 + trunk/net/core/rtnetlink.c | 78 +- trunk/net/ipv4/ip_gre.c | 10 +- trunk/net/ipv4/ping.c | 1 + trunk/net/ipv4/xfrm4_mode_beet.c | 5 +- trunk/net/ipv4/xfrm4_mode_tunnel.c | 6 +- trunk/net/ipv6/ip6mr.c | 4 +- trunk/net/ipv6/ndisc.c | 5 +- trunk/net/ipv6/xfrm6_mode_beet.c | 6 +- trunk/net/ipv6/xfrm6_mode_tunnel.c | 6 +- trunk/net/mac80211/debugfs_sta.c | 4 +- trunk/net/mac80211/rate.c | 2 +- trunk/net/mac80211/rate.h | 3 +- trunk/net/mac80211/sta_info.h | 2 + trunk/net/netfilter/ipvs/ip_vs_core.c | 2 +- trunk/net/netfilter/nf_conntrack_core.c | 38 +- trunk/net/netfilter/nf_conntrack_netlink.c | 46 +- trunk/net/netfilter/nf_queue.c | 40 +- trunk/net/netfilter/xt_TEE.c | 5 +- trunk/net/sched/sch_netem.c | 6 +- trunk/scripts/mod/file2alias.c | 35 +- trunk/sound/pci/azt3328.c | 3 +- trunk/sound/pci/hda/hda_codec.c | 12 +- trunk/sound/pci/hda/hda_codec.h | 3 + trunk/sound/pci/hda/patch_cirrus.c | 4 +- trunk/sound/pci/hda/patch_conexant.c | 24 +- trunk/sound/pci/hda/patch_realtek.c | 8 +- trunk/sound/pci/hda/patch_sigmatel.c | 2 +- trunk/sound/soc/imx/imx-ssi.c | 2 +- trunk/sound/soc/samsung/Kconfig | 12 +- trunk/sound/soc/soc-dapm.c | 12 +- trunk/tools/perf/util/event.c | 1 + trunk/tools/perf/util/evlist.c | 4 + trunk/tools/perf/util/probe-event.c | 6 + trunk/tools/perf/util/probe-finder.c | 12 +- trunk/tools/testing/ktest/ktest.pl | 8 +- 596 files changed, 7268 insertions(+), 3220 deletions(-) create mode 100644 trunk/arch/arm/configs/at91cap9_defconfig create mode 100644 trunk/arch/arm/mach-at91/at91cap9.c create mode 100644 trunk/arch/arm/mach-at91/at91cap9_devices.c create mode 100644 trunk/arch/arm/mach-at91/board-cap9adk.c create mode 100644 trunk/arch/arm/mach-at91/include/mach/at91cap9.h create mode 100644 trunk/arch/arm/mach-at91/include/mach/at91cap9_matrix.h create mode 100644 trunk/arch/arm/mach-cns3xxx/include/mach/entry-macro.S delete mode 100644 trunk/arch/arm/mach-davinci/davinci.h create mode 100644 trunk/arch/arm/mach-davinci/include/mach/dm355.h create mode 100644 trunk/arch/arm/mach-davinci/include/mach/dm644x.h create mode 100644 trunk/arch/arm/mach-ep93xx/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-exynos/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-highbank/include/mach/entry-macro.S rename trunk/arch/arm/mach-imx/{crmregs-imx3.h => crmregs-imx31.h} (94%) create mode 100644 trunk/arch/arm/mach-netx/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-nomadik/include/mach/entry-macro.S delete mode 100644 trunk/arch/arm/mach-omap1/iomap.h create mode 100644 trunk/arch/arm/mach-omap2/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-picoxcell/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-pxa/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-realview/include/mach/entry-macro.S delete mode 100644 trunk/arch/arm/mach-rpc/fiq.S rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/Makefile.boot (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/bast-ide.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/bast-irq.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/common.h (80%) rename trunk/arch/arm/{mach-s3c24xx/dma-s3c2410.c => mach-s3c2410/dma.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/h1940-bluetooth.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/anubis-cpld.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/anubis-irq.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/anubis-map.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/bast-cpld.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/bast-irq.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/bast-map.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/bast-pmu.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/debug-macro.S (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/dma.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/entry-macro.S (93%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/fb.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/gpio-fns.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/gpio-nrs.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/gpio-track.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/gpio.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/h1940-latch.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/h1940.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/hardware.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/idle.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/io.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/irqs.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/leds-gpio.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/map.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/osiris-cpld.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/osiris-map.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/otom-map.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/pm-core.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-clock.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-dsc.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-gpio.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-gpioj.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-irq.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-lcd.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-mem.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-power.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-s3c2412-mem.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-s3c2412.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-s3c2416-mem.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-s3c2416.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-s3c2443-clock.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/regs-sdi.h (100%) rename trunk/{include/linux/spi/s3c24xx.h => arch/arm/mach-s3c2410/include/mach/spi.h} (56%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/tick.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/timex.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/uncompress.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/vr1000-cpld.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/vr1000-irq.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/include/mach/vr1000-map.h (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-amlm5900.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-bast.c (99%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-h1940.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-n30.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-otom.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-qt2410.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-smdk2410.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-tct_hammer.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/mach-vr1000.c (99%) rename trunk/arch/arm/{mach-s3c24xx/simtec-nor.c => mach-s3c2410/nor-simtec.c} (98%) rename trunk/arch/arm/{mach-s3c24xx/simtec.h => mach-s3c2410/nor-simtec.h} (63%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/pm-h1940.S (100%) rename trunk/arch/arm/{mach-s3c24xx/pm-s3c2410.c => mach-s3c2410/pm.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2410}/s3c2410.c (100%) rename trunk/arch/arm/{mach-s3c24xx/sleep-s3c2410.S => mach-s3c2410/sleep.S} (100%) rename trunk/arch/arm/{mach-s3c24xx/simtec-usb.c => mach-s3c2410/usb-simtec.c} (99%) create mode 100644 trunk/arch/arm/mach-s3c2410/usb-simtec.h rename trunk/arch/arm/{mach-s3c24xx/clock-s3c2412.c => mach-s3c2412/clock.c} (100%) rename trunk/arch/arm/{mach-s3c24xx/dma-s3c2412.c => mach-s3c2412/dma.c} (100%) rename trunk/arch/arm/{mach-s3c24xx/irq-s3c2412.c => mach-s3c2412/irq.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2412}/mach-jive.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2412}/mach-smdk2413.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2412}/mach-vstms.c (100%) rename trunk/arch/arm/{mach-s3c24xx/pm-s3c2412.c => mach-s3c2412/pm.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2412}/s3c2412.c (100%) rename trunk/arch/arm/{mach-s3c24xx/sleep-s3c2412.S => mach-s3c2412/sleep.S} (100%) create mode 100644 trunk/arch/arm/mach-s3c2416/Kconfig create mode 100644 trunk/arch/arm/mach-s3c2416/Makefile rename trunk/arch/arm/{mach-s3c24xx/clock-s3c2416.c => mach-s3c2416/clock.c} (99%) rename trunk/arch/arm/{mach-s3c24xx/irq-s3c2416.c => mach-s3c2416/irq.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2416}/mach-smdk2416.c (100%) rename trunk/arch/arm/{mach-s3c24xx/pm-s3c2416.c => mach-s3c2416/pm.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2416}/s3c2416.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2416}/setup-sdhci-gpio.c (100%) rename trunk/arch/arm/{mach-s3c24xx/clock-s3c2440.c => mach-s3c2440/clock.c} (100%) create mode 100644 trunk/arch/arm/mach-s3c2440/common.h rename trunk/arch/arm/{mach-s3c24xx/dma-s3c2440.c => mach-s3c2440/dma.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/include/mach/gta02.h (100%) rename trunk/arch/arm/{mach-s3c24xx/irq-s3c2440.c => mach-s3c2440/irq.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-anubis.c (99%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-at2440evb.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-gta02.c (99%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-mini2440.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-nexcoder.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-osiris-dvs.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-osiris.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-rx1950.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-rx3715.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/mach-smdk2440.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/s3c2440.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/s3c2442.c (100%) rename trunk/arch/arm/{mach-s3c24xx/clock-s3c244x.c => mach-s3c2440/s3c244x-clock.c} (100%) rename trunk/arch/arm/{mach-s3c24xx/irq-s3c244x.c => mach-s3c2440/s3c244x-irq.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2440}/s3c244x.c (100%) create mode 100644 trunk/arch/arm/mach-s3c2443/Kconfig create mode 100644 trunk/arch/arm/mach-s3c2443/Makefile rename trunk/arch/arm/{mach-s3c24xx/clock-s3c2443.c => mach-s3c2443/clock.c} (97%) rename trunk/arch/arm/{mach-s3c24xx/dma-s3c2443.c => mach-s3c2443/dma.c} (85%) rename trunk/arch/arm/{mach-s3c24xx/irq-s3c2443.c => mach-s3c2443/irq.c} (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2443}/mach-smdk2443.c (100%) rename trunk/arch/arm/{mach-s3c24xx => mach-s3c2443}/s3c2443.c (100%) delete mode 100644 trunk/arch/arm/mach-s3c24xx/Kconfig delete mode 100644 trunk/arch/arm/mach-s3c24xx/Makefile create mode 100644 trunk/arch/arm/mach-s3c64xx/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-s5p64x0/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-s5pv210/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-shmobile/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-spear3xx/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-spear6xx/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-tegra/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-u300/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-ux500/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-versatile/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-vexpress/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/mach-zynq/include/mach/entry-macro.S create mode 100644 trunk/arch/arm/plat-mxc/include/mach/entry-macro.S rename trunk/arch/arm/{mach-omap2/iomap.h => plat-omap/include/plat/io.h} (77%) rename trunk/arch/arm/{mach-s3c24xx => plat-s3c24xx}/common-smdk.c (100%) rename trunk/arch/arm/{mach-s3c24xx/simtec-pm.c => plat-s3c24xx/pm-simtec.c} (100%) rename trunk/arch/arm/{mach-s3c24xx/common-s3c2443.c => plat-s3c24xx/s3c2443-clock.c} (89%) rename trunk/arch/arm/{mach-s3c24xx => plat-s3c24xx}/setup-i2c.c (100%) rename trunk/arch/arm/{mach-s3c24xx => plat-s3c24xx}/setup-ts.c (100%) rename trunk/arch/arm/{mach-s3c24xx => plat-s3c24xx}/simtec-audio.c (98%) create mode 100644 trunk/arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c create mode 100644 trunk/arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c create mode 100644 trunk/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c diff --git a/[refs] b/[refs] index bc31a4c835bf..afdfb6d8c079 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86ca5b6fef2bf1aa77a62f29d844400e4fed8dde +refs/heads/master: c15a04338b5a6d4305d107a5b6c0cd43418b7f3e diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 1bea46a54b1c..a0ffac029a0d 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The convert to using pci_scan_root_bus() so they can supply a list of bus resources when the bus is created. Who: Bjorn Helgaas + +---------------------------- + +What: The CAP9 SoC family will be removed +When: 3.4 +Files: arch/arm/mach-at91/at91cap9.c + arch/arm/mach-at91/at91cap9_devices.c + arch/arm/mach-at91/include/mach/at91cap9.h + arch/arm/mach-at91/include/mach/at91cap9_matrix.h + arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h + arch/arm/mach-at91/board-cap9adk.c +Why: The code is not actively maintained and platforms are now hard to find. +Who: Nicolas Ferre + Jean-Christophe PLAGNIOL-VILLARD diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 75a9a5fc230a..4e41d5255d72 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3780,7 +3780,7 @@ F: Documentation/kdump/ KERNEL AUTOMOUNTER v4 (AUTOFS4) M: Ian Kent -L: autofs@linux.kernel.org +L: autofs@vger.kernel.org S: Maintained F: fs/autofs4/ @@ -4685,7 +4685,7 @@ NTFS FILESYSTEM M: Anton Altaparmakov L: linux-ntfs-dev@lists.sourceforge.net W: http://www.tuxera.com/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git S: Supported F: Documentation/filesystems/ntfs.txt F: fs/ntfs/ @@ -7271,7 +7271,7 @@ WATCHDOG DEVICE DRIVERS M: Wim Van Sebroeck L: linux-watchdog@vger.kernel.org W: http://www.linux-watchdog.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git +T: git git://www.linux-watchdog.org/linux-watchdog.git S: Maintained F: Documentation/watchdog/ F: drivers/watchdog/ diff --git a/trunk/Makefile b/trunk/Makefile index b61a9638b6fc..66d13c917bc7 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc6 NAME = Saber-toothed Squirrel # *DOCUMENTATION* diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 1655c0734d72..a48aecc17eac 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -186,9 +186,6 @@ config GENERIC_ISA_DMA config FIQ bool -config NEED_RET_TO_USER - bool - config ARCH_MTD_XIP bool @@ -327,7 +324,7 @@ config ARCH_AT91 select CLKDEV_LOOKUP help This enables support for systems based on the Atmel AT91RM9200, - AT91SAM9 processors. + AT91SAM9 and AT91CAP9 processors. config ARCH_BCMRING bool "Broadcom BCMRING" @@ -482,7 +479,6 @@ config ARCH_IOP13XX select ARCH_SUPPORTS_MSI select VMSPLIT_1G select NEED_MACH_MEMORY_H - select NEED_RET_TO_USER help Support for Intel's IOP13XX (XScale) family of processors. @@ -490,7 +486,6 @@ config ARCH_IOP32X bool "IOP32x-based" depends on MMU select CPU_XSCALE - select NEED_RET_TO_USER select PLAT_IOP select PCI select ARCH_REQUIRE_GPIOLIB @@ -502,7 +497,6 @@ config ARCH_IOP33X bool "IOP33x-based" depends on MMU select CPU_XSCALE - select NEED_RET_TO_USER select PLAT_IOP select PCI select ARCH_REQUIRE_GPIOLIB @@ -769,21 +763,22 @@ config ARCH_SA1100 help Support for StrongARM 11x0 based boards. -config ARCH_S3C24XX - bool "Samsung S3C24XX SoCs" +config ARCH_S3C2410 + bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450" select GENERIC_GPIO select ARCH_HAS_CPUFREQ select HAVE_CLK select CLKDEV_LOOKUP select ARCH_USES_GETTIMEOFFSET select HAVE_S3C2410_I2C if I2C - select HAVE_S3C_RTC if RTC_CLASS - select HAVE_S3C2410_WATCHDOG if WATCHDOG help - Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443 - and S3C2450 SoCs based systems, such as the Simtec Electronics BAST - (), the IPAQ 1940 or the - Samsung SMDK2410 development board (and derivatives). + Samsung S3C2410X CPU based systems, such as the Simtec Electronics + BAST (), the IPAQ 1940 or + the Samsung SMDK2410 development board (and derivatives). + + Note, the S3C2416 and the S3C2450 are so close that they even share + the same SoC ID code. This means that there is no separate machine + directory (no arch/arm/mach-s3c2450) as the S3C2416 was first. config ARCH_S3C64XX bool "Samsung S3C64XX" @@ -1071,10 +1066,12 @@ source "arch/arm/plat-s5p/Kconfig" source "arch/arm/plat-spear/Kconfig" -source "arch/arm/mach-s3c24xx/Kconfig" -if ARCH_S3C24XX +if ARCH_S3C2410 +source "arch/arm/mach-s3c2410/Kconfig" source "arch/arm/mach-s3c2412/Kconfig" +source "arch/arm/mach-s3c2416/Kconfig" source "arch/arm/mach-s3c2440/Kconfig" +source "arch/arm/mach-s3c2443/Kconfig" endif if ARCH_S3C64XX @@ -1591,7 +1588,7 @@ source kernel/Kconfig.preempt config HZ int - default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \ + default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \ ARCH_S5PV210 || ARCH_EXYNOS4 default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER default AT91_TIMER_HZ if ARCH_AT91 @@ -2117,7 +2114,7 @@ config CPU_FREQ_S3C config CPU_FREQ_S3C24XX bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" - depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL + depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL select CPU_FREQ_S3C help This enables the CPUfreq driver for the Samsung S3C24XX family diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug index b895a2a92da8..03646c4c13d1 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/arch/arm/Kconfig.debug @@ -86,7 +86,7 @@ choice depends on HAVE_AT91_DBGU0 config AT91_DEBUG_LL_DBGU1 - bool "Kernel low-level debugging on 9263 and 9g45" + bool "Kernel low-level debugging on 9263, 9g45 and cap9" depends on HAVE_AT91_DBGU1 config DEBUG_CLPS711X_UART1 diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 0106f75530c0..1683bfb9166f 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -174,7 +174,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_REALVIEW) := realview machine-$(CONFIG_ARCH_RPC) := rpc -machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 +machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2412 s3c2416 s3c2440 s3c2443 machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 machine-$(CONFIG_ARCH_S5PC100) := s5pc100 diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S index 5f6045f1766c..c5d60250d43d 100644 --- a/trunk/arch/arm/boot/compressed/head.S +++ b/trunk/arch/arm/boot/compressed/head.S @@ -58,7 +58,7 @@ add \rb, \rb, #0x00010000 @ Ser1 #endif .endm -#elif defined(CONFIG_ARCH_S3C24XX) +#elif defined(CONFIG_ARCH_S3C2410) .macro loadsp, rb, tmp mov \rb, #0x50000000 add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT diff --git a/trunk/arch/arm/configs/at91cap9_defconfig b/trunk/arch/arm/configs/at91cap9_defconfig new file mode 100644 index 000000000000..8826eb218e73 --- /dev/null +++ b/trunk/arch/arm/configs/at91cap9_defconfig @@ -0,0 +1,108 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_ARCH_AT91CAP9=y +CONFIG_MACH_AT91CAP9ADK=y +CONFIG_MTD_AT91_DATAFLASH_CARD=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +# CONFIG_ARM_THUMB is not set +CONFIG_AEABI=y +CONFIG_LEDS=y +CONFIG_LEDS_CPU=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram0 rw" +CONFIG_FPE_NWFPE=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ATMEL=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_MACB=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_SERIO is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_SPI=y +CONFIG_SPI_ATMEL=y +# CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_FB=y +CONFIG_FB_ATMEL=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set +# CONFIG_USB_HID is not set +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_MON=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_ETH=m +CONFIG_USB_FILE_STORAGE=m +CONFIG_MMC=y +CONFIG_MMC_AT91=m +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91SAM9=y +CONFIG_EXT2_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_CRAMFS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_USER=y diff --git a/trunk/arch/arm/configs/mini2440_defconfig b/trunk/arch/arm/configs/mini2440_defconfig index 42da9183acc8..2472a9585834 100644 --- a/trunk/arch/arm/configs/mini2440_defconfig +++ b/trunk/arch/arm/configs/mini2440_defconfig @@ -13,7 +13,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_ARCH_S3C24XX=y +CONFIG_ARCH_S3C2410=y CONFIG_S3C_ADC=y CONFIG_S3C24XX_PWM=y CONFIG_MACH_MINI2440=y diff --git a/trunk/arch/arm/configs/s3c2410_defconfig b/trunk/arch/arm/configs/s3c2410_defconfig index 193448f31284..f9096c1b0a65 100644 --- a/trunk/arch/arm/configs/s3c2410_defconfig +++ b/trunk/arch/arm/configs/s3c2410_defconfig @@ -3,47 +3,40 @@ CONFIG_SYSVIPC=y CONFIG_IKCONFIG=m CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 +CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_BLK_DEV_INITRD=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_PARTITION_ADVANCED=y -CONFIG_BSD_DISKLABEL=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_ARCH_S3C24XX=y +CONFIG_ARCH_S3C2410=y CONFIG_S3C_BOOT_ERROR_RESET=y CONFIG_S3C_ADC=y CONFIG_S3C24XX_PWM=y -CONFIG_CPU_S3C2412=y -CONFIG_CPU_S3C2416=y -CONFIG_CPU_S3C2440=y -CONFIG_CPU_S3C2442=y -CONFIG_CPU_S3C2443=y -CONFIG_MACH_AML_M5900=y -CONFIG_ARCH_BAST=y +CONFIG_ARCH_SMDK2410=y CONFIG_ARCH_H1940=y CONFIG_MACH_N30=y +CONFIG_ARCH_BAST=y CONFIG_MACH_OTOM=y -CONFIG_MACH_QT2410=y -CONFIG_ARCH_SMDK2410=y +CONFIG_MACH_AML_M5900=y CONFIG_MACH_TCT_HAMMER=y CONFIG_MACH_VR1000=y +CONFIG_MACH_QT2410=y CONFIG_MACH_JIVE=y CONFIG_MACH_SMDK2412=y CONFIG_MACH_VSTMS=y CONFIG_MACH_SMDK2416=y CONFIG_MACH_ANUBIS=y -CONFIG_MACH_AT2440EVB=y -CONFIG_MACH_MINI2440=y -CONFIG_MACH_NEXCODER_2440=y +CONFIG_MACH_NEO1973_GTA02=y CONFIG_MACH_OSIRIS=y CONFIG_MACH_OSIRIS_DVS=m CONFIG_MACH_RX3715=y CONFIG_ARCH_S3C2440=y -CONFIG_MACH_NEO1973_GTA02=y -CONFIG_MACH_RX1950=y +CONFIG_MACH_NEXCODER_2440=y CONFIG_SMDK2440_CPU2442=y +CONFIG_MACH_AT2440EVB=y +CONFIG_MACH_MINI2440=y +CONFIG_MACH_RX1950=y CONFIG_MACH_SMDK2443=y # CONFIG_ARM_THUMB is not set CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -52,6 +45,7 @@ CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0" CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE_XP=y CONFIG_BINFMT_AOUT=y +CONFIG_PM=y CONFIG_APM_EMULATION=m CONFIG_NET=y CONFIG_PACKET=y @@ -64,6 +58,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m @@ -85,6 +80,7 @@ CONFIG_IPV6_MIP6=m CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y +CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CT_PROTO_DCCP=m @@ -142,6 +138,7 @@ CONFIG_IP_VS=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m @@ -153,6 +150,7 @@ CONFIG_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m @@ -179,6 +177,8 @@ CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m @@ -199,6 +199,7 @@ CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y CONFIG_MTD_CMDLINE_PARTS=y @@ -220,6 +221,9 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_UB=m CONFIG_BLK_DEV_RAM=y CONFIG_ATA_OVER_ETH=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_93CX6=m CONFIG_IDE=y CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m @@ -236,6 +240,7 @@ CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y +CONFIG_NET_ETHERNET=y CONFIG_DM9000=y CONFIG_INPUT_EVDEV=y CONFIG_MOUSE_APPLETOUCH=m @@ -269,6 +274,7 @@ CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_INPUT_MISC=y +CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_POWERMATE=m @@ -294,6 +300,7 @@ CONFIG_I2C_SIMTEC=y CONFIG_SPI=y CONFIG_SPI_GPIO=m CONFIG_SPI_S3C24XX=m +CONFIG_SPI_S3C24XX_GPIO=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_TLE62X0=m CONFIG_SENSORS_LM75=m @@ -308,6 +315,7 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_FB_S3C2410=y CONFIG_FB_SM501=y CONFIG_BACKLIGHT_PWM=m +# CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_SOUND=y CONFIG_SND=y @@ -322,6 +330,10 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_SOC=y +CONFIG_SND_S3C24XX_SOC=y +CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m +CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m +CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m # CONFIG_USB_HID is not set CONFIG_USB=y CONFIG_USB_DEVICEFS=y @@ -375,7 +387,9 @@ CONFIG_MMC_TEST=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SPI=m CONFIG_MMC_S3C=y +CONFIG_LEDS_CLASS=m CONFIG_LEDS_S3C24XX=m +CONFIG_LEDS_H1940=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_GPIO=m CONFIG_LEDS_PCA955X=m @@ -396,6 +410,8 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT4_FS=m CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_INOTIFY=y +CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m CONFIG_ISO9660_FS=y @@ -420,6 +436,9 @@ CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m +CONFIG_PARTITION_ADVANCED=y +CONFIG_BSD_DISKLABEL=y +CONFIG_SOLARIS_X86_PARTITION=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m @@ -462,7 +481,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MUTEXES=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_CRYPTO_ANSI_CPRNG is not set diff --git a/trunk/arch/arm/configs/tct_hammer_defconfig b/trunk/arch/arm/configs/tct_hammer_defconfig index 1d24f8458bef..95c0f0d63db6 100644 --- a/trunk/arch/arm/configs/tct_hammer_defconfig +++ b/trunk/arch/arm/configs/tct_hammer_defconfig @@ -14,7 +14,7 @@ CONFIG_SLOB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -CONFIG_ARCH_S3C24XX=y +CONFIG_ARCH_S3C2410=y CONFIG_MACH_TCT_HAMMER=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 diff --git a/trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S b/trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S index 8c215acd9b57..e0af4983723f 100644 --- a/trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S +++ b/trunk/arch/arm/include/asm/hardware/entry-macro-iomd.S @@ -11,6 +11,14 @@ /* IOC / IOMD based hardware */ #include + .macro disable_fiq + mov r12, #ioc_base_high + .if ioc_base_low + orr r12, r12, #ioc_base_low + .endif + strb r12, [r12, #0x38] @ Disable FIQ register + .endm + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp ldrb \irqstat, [\base, #IOMD_IRQREQB] @ get high priority first ldr \tmp, =irq_prio_h diff --git a/trunk/arch/arm/kernel/entry-armv.S b/trunk/arch/arm/kernel/entry-armv.S index 22f0ed324f37..be16a48007b4 100644 --- a/trunk/arch/arm/kernel/entry-armv.S +++ b/trunk/arch/arm/kernel/entry-armv.S @@ -19,9 +19,7 @@ #include #include #include -#ifndef CONFIG_MULTI_IRQ_HANDLER #include -#endif #include #include #include @@ -1103,6 +1101,7 @@ __stubs_start: * get out of that mode without clobbering one register. */ vector_fiq: + disable_fiq subs pc, lr, #4 /*============================================================================= diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index 54ee265dd819..9fd0ba90c1d2 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -10,14 +10,8 @@ #include #include -#include - -#ifdef CONFIG_NEED_RET_TO_USER #include -#else - .macro arch_ret_to_user, tmp1, tmp2 - .endm -#endif +#include #include "entry-header.S" diff --git a/trunk/arch/arm/mach-at91/Kconfig b/trunk/arch/arm/mach-at91/Kconfig index 0284e66c47f9..71feb00a1e99 100644 --- a/trunk/arch/arm/mach-at91/Kconfig +++ b/trunk/arch/arm/mach-at91/Kconfig @@ -102,6 +102,15 @@ config ARCH_AT91SAM9G45 select HAVE_AT91_DBGU1 select AT91_SAM9G45_RESET +config ARCH_AT91CAP9 + bool "AT91CAP9" + select CPU_ARM926T + select GENERIC_CLOCKEVENTS + select HAVE_FB_ATMEL + select HAVE_NET_MACB + select HAVE_AT91_DBGU1 + select AT91_SAM9G45_RESET + config ARCH_AT91X40 bool "AT91x40" select ARCH_USES_GETTIMEOFFSET @@ -438,6 +447,21 @@ endif # ---------------------------------------------------------- +if ARCH_AT91CAP9 + +comment "AT91CAP9 Board Type" + +config MACH_AT91CAP9ADK + bool "Atmel AT91CAP9A-DK Evaluation Kit" + select HAVE_AT91_DATAFLASH_CARD + help + Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit. + + +endif + +# ---------------------------------------------------------- + if ARCH_AT91X40 comment "AT91X40 Board Type" @@ -520,7 +544,7 @@ config AT91_EARLY_DBGU0 depends on HAVE_AT91_DBGU0 config AT91_EARLY_DBGU1 - bool "DBGU on 9263 and 9g45" + bool "DBGU on 9263, 9g45 and cap9" depends on HAVE_AT91_DBGU1 config AT91_EARLY_USART0 diff --git a/trunk/arch/arm/mach-at91/Makefile b/trunk/arch/arm/mach-at91/Makefile index aeb76f1690d9..705e1fbded39 100644 --- a/trunk/arch/arm/mach-at91/Makefile +++ b/trunk/arch/arm/mach-at91/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_d obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o +obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o # AT91RM9200 board-specific support @@ -80,6 +81,9 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o # AT91SAM board with device-tree obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o +# AT91CAP9 board-specific support +obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o + # AT91X40 board-specific support obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o diff --git a/trunk/arch/arm/mach-at91/Makefile.boot b/trunk/arch/arm/mach-at91/Makefile.boot index 2fd051eb2449..8ddafadfdc7d 100644 --- a/trunk/arch/arm/mach-at91/Makefile.boot +++ b/trunk/arch/arm/mach-at91/Makefile.boot @@ -3,7 +3,11 @@ # PARAMS_PHYS must be within 4MB of ZRELADDR # INITRD_PHYS must be in RAM -ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) +ifeq ($(CONFIG_ARCH_AT91CAP9),y) + zreladdr-y += 0x70008000 +params_phys-y := 0x70000100 +initrd_phys-y := 0x70410000 +else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) zreladdr-y += 0x70008000 params_phys-y := 0x70000100 initrd_phys-y := 0x70410000 diff --git a/trunk/arch/arm/mach-at91/at91cap9.c b/trunk/arch/arm/mach-at91/at91cap9.c new file mode 100644 index 000000000000..8967d75c2ea3 --- /dev/null +++ b/trunk/arch/arm/mach-at91/at91cap9.c @@ -0,0 +1,404 @@ +/* + * arch/arm/mach-at91/at91cap9.c + * + * Copyright (C) 2007 Stelian Pop + * Copyright (C) 2007 Lead Tech Design + * Copyright (C) 2007 Atmel Corporation. + * + * 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 + +#include +#include +#include +#include + +#include +#include +#include + +#include "soc.h" +#include "generic.h" +#include "clock.h" +#include "sam9_smc.h" + +/* -------------------------------------------------------------------- + * Clocks + * -------------------------------------------------------------------- */ + +/* + * The peripheral clocks. + */ +static struct clk pioABCD_clk = { + .name = "pioABCD_clk", + .pmc_mask = 1 << AT91CAP9_ID_PIOABCD, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mpb0_clk = { + .name = "mpb0_clk", + .pmc_mask = 1 << AT91CAP9_ID_MPB0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mpb1_clk = { + .name = "mpb1_clk", + .pmc_mask = 1 << AT91CAP9_ID_MPB1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mpb2_clk = { + .name = "mpb2_clk", + .pmc_mask = 1 << AT91CAP9_ID_MPB2, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mpb3_clk = { + .name = "mpb3_clk", + .pmc_mask = 1 << AT91CAP9_ID_MPB3, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mpb4_clk = { + .name = "mpb4_clk", + .pmc_mask = 1 << AT91CAP9_ID_MPB4, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart0_clk = { + .name = "usart0_clk", + .pmc_mask = 1 << AT91CAP9_ID_US0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart1_clk = { + .name = "usart1_clk", + .pmc_mask = 1 << AT91CAP9_ID_US1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk usart2_clk = { + .name = "usart2_clk", + .pmc_mask = 1 << AT91CAP9_ID_US2, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mmc0_clk = { + .name = "mci0_clk", + .pmc_mask = 1 << AT91CAP9_ID_MCI0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk mmc1_clk = { + .name = "mci1_clk", + .pmc_mask = 1 << AT91CAP9_ID_MCI1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk can_clk = { + .name = "can_clk", + .pmc_mask = 1 << AT91CAP9_ID_CAN, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk twi_clk = { + .name = "twi_clk", + .pmc_mask = 1 << AT91CAP9_ID_TWI, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk spi0_clk = { + .name = "spi0_clk", + .pmc_mask = 1 << AT91CAP9_ID_SPI0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk spi1_clk = { + .name = "spi1_clk", + .pmc_mask = 1 << AT91CAP9_ID_SPI1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ssc0_clk = { + .name = "ssc0_clk", + .pmc_mask = 1 << AT91CAP9_ID_SSC0, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ssc1_clk = { + .name = "ssc1_clk", + .pmc_mask = 1 << AT91CAP9_ID_SSC1, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ac97_clk = { + .name = "ac97_clk", + .pmc_mask = 1 << AT91CAP9_ID_AC97C, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk tcb_clk = { + .name = "tcb_clk", + .pmc_mask = 1 << AT91CAP9_ID_TCB, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk pwm_clk = { + .name = "pwm_clk", + .pmc_mask = 1 << AT91CAP9_ID_PWMC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk macb_clk = { + .name = "pclk", + .pmc_mask = 1 << AT91CAP9_ID_EMAC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk aestdes_clk = { + .name = "aestdes_clk", + .pmc_mask = 1 << AT91CAP9_ID_AESTDES, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk adc_clk = { + .name = "adc_clk", + .pmc_mask = 1 << AT91CAP9_ID_ADC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk isi_clk = { + .name = "isi_clk", + .pmc_mask = 1 << AT91CAP9_ID_ISI, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk lcdc_clk = { + .name = "lcdc_clk", + .pmc_mask = 1 << AT91CAP9_ID_LCDC, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk dma_clk = { + .name = "dma_clk", + .pmc_mask = 1 << AT91CAP9_ID_DMA, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk udphs_clk = { + .name = "udphs_clk", + .pmc_mask = 1 << AT91CAP9_ID_UDPHS, + .type = CLK_TYPE_PERIPHERAL, +}; +static struct clk ohci_clk = { + .name = "ohci_clk", + .pmc_mask = 1 << AT91CAP9_ID_UHP, + .type = CLK_TYPE_PERIPHERAL, +}; + +static struct clk *periph_clocks[] __initdata = { + &pioABCD_clk, + &mpb0_clk, + &mpb1_clk, + &mpb2_clk, + &mpb3_clk, + &mpb4_clk, + &usart0_clk, + &usart1_clk, + &usart2_clk, + &mmc0_clk, + &mmc1_clk, + &can_clk, + &twi_clk, + &spi0_clk, + &spi1_clk, + &ssc0_clk, + &ssc1_clk, + &ac97_clk, + &tcb_clk, + &pwm_clk, + &macb_clk, + &aestdes_clk, + &adc_clk, + &isi_clk, + &lcdc_clk, + &dma_clk, + &udphs_clk, + &ohci_clk, + // irq0 .. irq1 +}; + +static struct clk_lookup periph_clocks_lookups[] = { + /* One additional fake clock for macb_hclk */ + CLKDEV_CON_ID("hclk", &macb_clk), + CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk), + CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk), + CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk), + CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk), + CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), + CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), + CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), + /* fake hclk clock */ + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), + CLKDEV_CON_ID("pioA", &pioABCD_clk), + CLKDEV_CON_ID("pioB", &pioABCD_clk), + CLKDEV_CON_ID("pioC", &pioABCD_clk), + CLKDEV_CON_ID("pioD", &pioABCD_clk), +}; + +static struct clk_lookup usart_clocks_lookups[] = { + CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck), + CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk), + CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk), + CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk), +}; + +/* + * The four programmable clocks. + * You must configure pin multiplexing to bring these signals out. + */ +static struct clk pck0 = { + .name = "pck0", + .pmc_mask = AT91_PMC_PCK0, + .type = CLK_TYPE_PROGRAMMABLE, + .id = 0, +}; +static struct clk pck1 = { + .name = "pck1", + .pmc_mask = AT91_PMC_PCK1, + .type = CLK_TYPE_PROGRAMMABLE, + .id = 1, +}; +static struct clk pck2 = { + .name = "pck2", + .pmc_mask = AT91_PMC_PCK2, + .type = CLK_TYPE_PROGRAMMABLE, + .id = 2, +}; +static struct clk pck3 = { + .name = "pck3", + .pmc_mask = AT91_PMC_PCK3, + .type = CLK_TYPE_PROGRAMMABLE, + .id = 3, +}; + +static void __init at91cap9_register_clocks(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(periph_clocks); i++) + clk_register(periph_clocks[i]); + + clkdev_add_table(periph_clocks_lookups, + ARRAY_SIZE(periph_clocks_lookups)); + clkdev_add_table(usart_clocks_lookups, + ARRAY_SIZE(usart_clocks_lookups)); + + clk_register(&pck0); + clk_register(&pck1); + clk_register(&pck2); + clk_register(&pck3); +} + +static struct clk_lookup console_clock_lookup; + +void __init at91cap9_set_console_clock(int id) +{ + if (id >= ARRAY_SIZE(usart_clocks_lookups)) + return; + + console_clock_lookup.con_id = "usart"; + console_clock_lookup.clk = usart_clocks_lookups[id].clk; + clkdev_add(&console_clock_lookup); +} + +/* -------------------------------------------------------------------- + * GPIO + * -------------------------------------------------------------------- */ + +static struct at91_gpio_bank at91cap9_gpio[] __initdata = { + { + .id = AT91CAP9_ID_PIOABCD, + .regbase = AT91CAP9_BASE_PIOA, + }, { + .id = AT91CAP9_ID_PIOABCD, + .regbase = AT91CAP9_BASE_PIOB, + }, { + .id = AT91CAP9_ID_PIOABCD, + .regbase = AT91CAP9_BASE_PIOC, + }, { + .id = AT91CAP9_ID_PIOABCD, + .regbase = AT91CAP9_BASE_PIOD, + } +}; + +static void at91cap9_idle(void) +{ + at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK); + cpu_do_idle(); +} + +/* -------------------------------------------------------------------- + * AT91CAP9 processor initialization + * -------------------------------------------------------------------- */ + +static void __init at91cap9_map_io(void) +{ + at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE); +} + +static void __init at91cap9_ioremap_registers(void) +{ + at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC); + at91_ioremap_rstc(AT91CAP9_BASE_RSTC); + at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT); + at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC); +} + +static void __init at91cap9_initialize(void) +{ + arm_pm_idle = at91cap9_idle; + arm_pm_restart = at91sam9g45_restart; + at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); + + /* Register GPIO subsystem */ + at91_gpio_init(at91cap9_gpio, 4); + + /* Remember the silicon revision */ + if (cpu_is_at91cap9_revB()) + system_rev = 0xB; + else if (cpu_is_at91cap9_revC()) + system_rev = 0xC; +} + +/* -------------------------------------------------------------------- + * Interrupt initialization + * -------------------------------------------------------------------- */ + +/* + * The default interrupt priority levels (0 = lowest, 7 = highest). + */ +static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = { + 7, /* Advanced Interrupt Controller (FIQ) */ + 7, /* System Peripherals */ + 1, /* Parallel IO Controller A, B, C and D */ + 0, /* MP Block Peripheral 0 */ + 0, /* MP Block Peripheral 1 */ + 0, /* MP Block Peripheral 2 */ + 0, /* MP Block Peripheral 3 */ + 0, /* MP Block Peripheral 4 */ + 5, /* USART 0 */ + 5, /* USART 1 */ + 5, /* USART 2 */ + 0, /* Multimedia Card Interface 0 */ + 0, /* Multimedia Card Interface 1 */ + 3, /* CAN */ + 6, /* Two-Wire Interface */ + 5, /* Serial Peripheral Interface 0 */ + 5, /* Serial Peripheral Interface 1 */ + 4, /* Serial Synchronous Controller 0 */ + 4, /* Serial Synchronous Controller 1 */ + 5, /* AC97 Controller */ + 0, /* Timer Counter 0, 1 and 2 */ + 0, /* Pulse Width Modulation Controller */ + 3, /* Ethernet */ + 0, /* Advanced Encryption Standard, Triple DES*/ + 0, /* Analog-to-Digital Converter */ + 0, /* Image Sensor Interface */ + 3, /* LCD Controller */ + 0, /* DMA Controller */ + 2, /* USB Device Port */ + 2, /* USB Host port */ + 0, /* Advanced Interrupt Controller (IRQ0) */ + 0, /* Advanced Interrupt Controller (IRQ1) */ +}; + +struct at91_init_soc __initdata at91cap9_soc = { + .map_io = at91cap9_map_io, + .default_irq_priority = at91cap9_default_irq_priority, + .ioremap_registers = at91cap9_ioremap_registers, + .register_clocks = at91cap9_register_clocks, + .init = at91cap9_initialize, +}; diff --git a/trunk/arch/arm/mach-at91/at91cap9_devices.c b/trunk/arch/arm/mach-at91/at91cap9_devices.c new file mode 100644 index 000000000000..d298fb7cb210 --- /dev/null +++ b/trunk/arch/arm/mach-at91/at91cap9_devices.c @@ -0,0 +1,1273 @@ +/* + * arch/arm/mach-at91/at91cap9_devices.c + * + * Copyright (C) 2007 Stelian Pop + * Copyright (C) 2007 Lead Tech Design + * Copyright (C) 2007 Atmel Corporation. + * + * 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 +#include +#include + +#include +#include +#include +#include + +#include