From 6e6cb13efc10e5d00a8070e02925a721a9888c27 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 24 Jul 2008 12:16:40 -0700 Subject: [PATCH] --- yaml --- r: 105596 b: refs/heads/master c: ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 8 + .../ABI/testing/sysfs-devices-memory | 24 + .../Documentation/ABI/testing/sysfs-kernel-mm | 6 + .../ABI/testing/sysfs-kernel-mm-hugepages | 15 + trunk/Documentation/fb/sh7760fb.txt | 131 + trunk/Documentation/fb/tridentfb.txt | 46 +- trunk/Documentation/filesystems/Locking | 7 + trunk/Documentation/filesystems/proc.txt | 44 + trunk/Documentation/kernel-parameters.txt | 42 +- trunk/Documentation/power/00-INDEX | 4 +- trunk/Documentation/power/apm-acpi.txt | 32 + trunk/Documentation/power/pm.txt | 257 - trunk/Documentation/vm/hugetlbpage.txt | 23 + trunk/MAINTAINERS | 41 +- trunk/arch/Kconfig | 10 + trunk/arch/alpha/Kconfig | 5 - trunk/arch/alpha/mm/numa.c | 10 +- trunk/arch/arm/Kconfig | 14 + trunk/arch/arm/common/sa1111.c | 2 +- trunk/arch/arm/configs/ezx_defconfig | 1614 ++++++ trunk/arch/arm/kernel/Makefile | 1 + trunk/arch/arm/kernel/kgdb.c | 201 + trunk/arch/arm/kernel/module.c | 1 + trunk/arch/arm/kernel/setup.c | 2 + trunk/arch/arm/kernel/traps.c | 5 + trunk/arch/arm/mach-iop32x/n2100.c | 52 + trunk/arch/arm/mach-pxa/Kconfig | 219 +- trunk/arch/arm/mach-pxa/Makefile | 15 +- trunk/arch/arm/mach-pxa/clock.c | 30 - trunk/arch/arm/mach-pxa/clock.h | 33 + trunk/arch/arm/mach-pxa/cm-x270-pci.c | 27 +- trunk/arch/arm/mach-pxa/cm-x270-pci.h | 14 +- trunk/arch/arm/mach-pxa/cm-x270.c | 403 +- trunk/arch/arm/mach-pxa/corgi.c | 1 + trunk/arch/arm/mach-pxa/devices.c | 61 + trunk/arch/arm/mach-pxa/devices.h | 2 + trunk/arch/arm/mach-pxa/e400_lcd.c | 56 + trunk/arch/arm/mach-pxa/e740_lcd.c | 123 + trunk/arch/arm/mach-pxa/e750_lcd.c | 109 + trunk/arch/arm/mach-pxa/e800_lcd.c | 159 + trunk/arch/arm/mach-pxa/em-x270.c | 371 +- trunk/arch/arm/mach-pxa/eseries.c | 15 +- trunk/arch/arm/mach-pxa/eseries_udc.c | 57 + trunk/arch/arm/mach-pxa/ezx.c | 220 + trunk/arch/arm/mach-pxa/littleton.c | 70 +- trunk/arch/arm/mach-pxa/lubbock.c | 19 +- trunk/arch/arm/mach-pxa/magician.c | 49 +- trunk/arch/arm/mach-pxa/mainstone.c | 18 +- trunk/arch/arm/mach-pxa/mfp-pxa2xx.c | 71 +- trunk/arch/arm/mach-pxa/palmtx.c | 416 ++ trunk/arch/arm/mach-pxa/pcm027.c | 31 + trunk/arch/arm/mach-pxa/pcm990-baseboard.c | 74 +- trunk/arch/arm/mach-pxa/poodle.c | 1 + trunk/arch/arm/mach-pxa/pxa25x.c | 59 +- trunk/arch/arm/mach-pxa/pxa300.c | 19 +- trunk/arch/arm/mach-pxa/pxa320.c | 21 +- trunk/arch/arm/mach-pxa/pxa3xx.c | 25 +- trunk/arch/arm/mach-pxa/pxa930.c | 190 + trunk/arch/arm/mach-pxa/reset.c | 96 + trunk/arch/arm/mach-pxa/saar.c | 84 + trunk/arch/arm/mach-pxa/spitz.c | 10 +- trunk/arch/arm/mach-pxa/ssp.c | 13 +- trunk/arch/arm/mach-pxa/tavorevb.c | 84 + trunk/arch/arm/mach-pxa/tosa-bt.c | 150 + trunk/arch/arm/mach-pxa/tosa.c | 382 +- trunk/arch/arm/mach-pxa/trizeps4.c | 1 + trunk/arch/arm/mach-pxa/zylonite.c | 103 +- trunk/arch/arm/mach-pxa/zylonite_pxa300.c | 46 + trunk/arch/arm/mach-pxa/zylonite_pxa320.c | 6 + trunk/arch/arm/mach-sa1100/clock.c | 2 +- trunk/arch/arm/mm/Makefile | 2 + trunk/arch/arm/mm/discontig.c | 34 +- trunk/arch/arm/mm/init.c | 2 +- trunk/arch/arm/plat-omap/fb.c | 5 +- trunk/arch/arm/tools/mach-types | 10 +- trunk/arch/avr32/Kconfig | 1 + trunk/arch/avr32/mach-at32ap/at32ap700x.c | 27 +- trunk/arch/avr32/mm/init.c | 5 +- trunk/arch/avr32/mm/ioremap.c | 1 + trunk/arch/cris/arch-v10/mm/init.c | 2 +- trunk/arch/cris/arch-v32/mm/init.c | 2 +- trunk/arch/cris/kernel/profile.c | 17 +- trunk/arch/frv/kernel/pm.c | 1 - trunk/arch/h8300/kernel/setup.c | 1 + trunk/arch/ia64/ia32/sys_ia32.c | 2 +- trunk/arch/ia64/kernel/sys_ia64.c | 2 +- trunk/arch/ia64/mm/discontig.c | 30 +- trunk/arch/ia64/mm/hugetlbpage.c | 15 +- trunk/arch/m32r/mm/discontig.c | 10 +- trunk/arch/m32r/mm/init.c | 6 +- trunk/arch/m68k/amiga/chipram.c | 1 + trunk/arch/m68k/mm/init.c | 4 +- trunk/arch/m68k/mm/motorola.c | 2 +- trunk/arch/m68k/mm/sun3mmu.c | 2 +- trunk/arch/m68knommu/kernel/setup.c | 1 + trunk/arch/mips/au1000/common/power.c | 1 - trunk/arch/mips/kernel/module.c | 1 + trunk/arch/mips/kernel/syscall.c | 2 +- trunk/arch/mips/sgi-ip27/ip27-klnuma.c | 1 + trunk/arch/mips/sgi-ip27/ip27-memory.c | 4 +- trunk/arch/mn10300/mm/init.c | 6 +- trunk/arch/parisc/hpux/sys_hpux.c | 2 +- trunk/arch/parisc/mm/init.c | 5 +- trunk/arch/powerpc/Kconfig | 3 + trunk/arch/powerpc/Kconfig.debug | 50 +- trunk/arch/powerpc/kernel/Makefile | 1 + trunk/arch/powerpc/kernel/kgdb.c | 410 ++ trunk/arch/powerpc/kernel/setup_32.c | 16 - trunk/arch/powerpc/kernel/suspend.c | 1 + trunk/arch/powerpc/lib/code-patching.c | 1 + trunk/arch/powerpc/mm/hash_utils_64.c | 51 +- trunk/arch/powerpc/mm/hugetlbpage.c | 341 +- trunk/arch/powerpc/mm/init_64.c | 8 +- trunk/arch/powerpc/mm/numa.c | 3 +- trunk/arch/powerpc/mm/pgtable_32.c | 22 +- trunk/arch/powerpc/mm/pgtable_64.c | 16 + trunk/arch/powerpc/mm/tlb_64.c | 2 +- .../arch/powerpc/platforms/cell/spufs/file.c | 23 + trunk/arch/powerpc/platforms/powermac/setup.c | 6 - trunk/arch/s390/mm/hugetlbpage.c | 8 +- trunk/arch/sh/Kconfig | 1 + trunk/arch/sh/boards/renesas/migor/setup.c | 3 +- trunk/arch/sh/kernel/sys_sh32.c | 2 +- trunk/arch/sh/mm/hugetlbpage.c | 8 +- trunk/arch/sh/mm/init.c | 2 +- trunk/arch/sh/mm/numa.c | 5 +- trunk/arch/sparc/kernel/sys_sparc.c | 2 +- trunk/arch/sparc/mm/srmmu.c | 3 +- trunk/arch/sparc/mm/sun4c.c | 3 +- trunk/arch/sparc64/kernel/iommu_common.h | 2 +- trunk/arch/sparc64/kernel/irq.c | 10 +- trunk/arch/sparc64/kernel/ldc.c | 38 +- trunk/arch/sparc64/kernel/sys_sparc.c | 2 +- trunk/arch/sparc64/kernel/time.c | 15 +- trunk/arch/sparc64/mm/hugetlbpage.c | 10 +- trunk/arch/sparc64/mm/init.c | 3 +- trunk/arch/um/include/init.h | 8 + trunk/arch/um/include/irq_kern.h | 2 - trunk/arch/um/include/irq_user.h | 2 - trunk/arch/um/include/skas/skas.h | 1 - trunk/arch/um/include/um_uaccess.h | 1 - trunk/arch/um/kernel/irq.c | 35 +- trunk/arch/um/kernel/ksyms.c | 1 - trunk/arch/um/kernel/mem.c | 33 +- trunk/arch/um/kernel/physmem.c | 2 +- trunk/arch/um/kernel/ptrace.c | 2 +- trunk/arch/um/kernel/time.c | 8 - trunk/arch/um/kernel/uaccess.c | 2 +- trunk/arch/um/os-Linux/sigio.c | 2 +- trunk/arch/um/os-Linux/signal.c | 2 +- trunk/arch/um/os-Linux/skas/process.c | 2 +- trunk/arch/um/os-Linux/umid.c | 2 +- trunk/arch/um/sys-i386/bugs.c | 2 +- trunk/arch/um/sys-i386/checksum.S | 5 +- trunk/arch/um/sys-i386/ldt.c | 4 +- trunk/arch/v850/Kconfig | 353 -- trunk/arch/v850/Kconfig.debug | 10 - trunk/arch/v850/Makefile | 54 - trunk/arch/v850/README | 44 - trunk/arch/v850/configs/rte-ma1-cb_defconfig | 617 --- trunk/arch/v850/configs/rte-me2-cb_defconfig | 462 -- trunk/arch/v850/configs/sim_defconfig | 451 -- trunk/arch/v850/kernel/Makefile | 40 - trunk/arch/v850/kernel/anna-rom.ld | 16 - trunk/arch/v850/kernel/anna.c | 202 - trunk/arch/v850/kernel/anna.ld | 20 - trunk/arch/v850/kernel/as85ep1-rom.ld | 21 - trunk/arch/v850/kernel/as85ep1.c | 234 - trunk/arch/v850/kernel/as85ep1.ld | 49 - trunk/arch/v850/kernel/asm-offsets.c | 58 - trunk/arch/v850/kernel/bug.c | 142 - trunk/arch/v850/kernel/entry.S | 1121 ---- trunk/arch/v850/kernel/fpga85e2c.c | 167 - trunk/arch/v850/kernel/fpga85e2c.ld | 62 - trunk/arch/v850/kernel/gbus_int.c | 271 - trunk/arch/v850/kernel/head.S | 128 - trunk/arch/v850/kernel/highres_timer.c | 132 - trunk/arch/v850/kernel/init_task.c | 48 - trunk/arch/v850/kernel/intv.S | 87 - trunk/arch/v850/kernel/irq.c | 123 - trunk/arch/v850/kernel/ma.c | 69 - trunk/arch/v850/kernel/mach.c | 17 - trunk/arch/v850/kernel/mach.h | 56 - trunk/arch/v850/kernel/me2.c | 73 - trunk/arch/v850/kernel/memcons.c | 135 - trunk/arch/v850/kernel/module.c | 237 - trunk/arch/v850/kernel/process.c | 217 - trunk/arch/v850/kernel/procfs.c | 67 - trunk/arch/v850/kernel/ptrace.c | 235 - trunk/arch/v850/kernel/rte_cb.c | 193 - trunk/arch/v850/kernel/rte_cb_leds.c | 137 - trunk/arch/v850/kernel/rte_cb_multi.c | 121 - trunk/arch/v850/kernel/rte_ma1_cb-rom.ld | 14 - trunk/arch/v850/kernel/rte_ma1_cb.c | 107 - trunk/arch/v850/kernel/rte_ma1_cb.ld | 57 - trunk/arch/v850/kernel/rte_mb_a_pci.c | 819 --- trunk/arch/v850/kernel/rte_me2_cb.c | 298 -- trunk/arch/v850/kernel/rte_me2_cb.ld | 30 - trunk/arch/v850/kernel/rte_nb85e_cb-multi.ld | 57 - trunk/arch/v850/kernel/rte_nb85e_cb.c | 81 - trunk/arch/v850/kernel/rte_nb85e_cb.ld | 22 - trunk/arch/v850/kernel/setup.c | 330 -- trunk/arch/v850/kernel/signal.c | 523 -- trunk/arch/v850/kernel/sim.c | 172 - trunk/arch/v850/kernel/sim.ld | 13 - trunk/arch/v850/kernel/sim85e2.c | 195 - trunk/arch/v850/kernel/sim85e2.ld | 36 - trunk/arch/v850/kernel/simcons.c | 161 - trunk/arch/v850/kernel/syscalls.c | 196 - trunk/arch/v850/kernel/teg.c | 62 - trunk/arch/v850/kernel/time.c | 106 - trunk/arch/v850/kernel/v850_ksyms.c | 51 - trunk/arch/v850/kernel/v850e2_cache.c | 127 - trunk/arch/v850/kernel/v850e_cache.c | 174 - trunk/arch/v850/kernel/v850e_intc.c | 104 - trunk/arch/v850/kernel/v850e_timer_d.c | 54 - trunk/arch/v850/kernel/v850e_utils.c | 62 - trunk/arch/v850/kernel/vmlinux.lds.S | 306 -- trunk/arch/v850/lib/Makefile | 6 - trunk/arch/v850/lib/ashldi3.c | 62 - trunk/arch/v850/lib/ashrdi3.c | 63 - trunk/arch/v850/lib/checksum.c | 155 - trunk/arch/v850/lib/lshrdi3.c | 62 - trunk/arch/v850/lib/memcpy.c | 92 - trunk/arch/v850/lib/memset.c | 68 - trunk/arch/v850/lib/muldi3.c | 61 - trunk/arch/v850/lib/negdi2.c | 25 - trunk/arch/x86/Kconfig | 1 + trunk/arch/x86/ia32/ia32entry.S | 97 +- trunk/arch/x86/ia32/sys_ia32.c | 2 +- trunk/arch/x86/kernel/acpi/cstate.c | 3 +- trunk/arch/x86/kernel/acpi/sleep.c | 4 + trunk/arch/x86/kernel/apm_32.c | 1 - .../x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 16 +- .../arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- .../arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 23 +- .../kernel/cpu/cpufreq/speedstep-centrino.c | 157 +- .../x86/kernel/cpu/cpufreq/speedstep-ich.c | 7 +- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 5 +- trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 4 +- trunk/arch/x86/kernel/cpu/proc.c | 2 +- trunk/arch/x86/kernel/entry_32.S | 55 +- trunk/arch/x86/kernel/entry_64.S | 55 +- trunk/arch/x86/kernel/genapic_flat_64.c | 2 +- trunk/arch/x86/kernel/genx2apic_uv_x.c | 4 +- trunk/arch/x86/kernel/hpet.c | 10 +- trunk/arch/x86/kernel/io_apic_64.c | 12 +- trunk/arch/x86/kernel/ldt.c | 6 +- trunk/arch/x86/kernel/microcode.c | 13 +- trunk/arch/x86/kernel/module_64.c | 1 + trunk/arch/x86/kernel/reboot.c | 14 +- trunk/arch/x86/kernel/signal_32.c | 3 - trunk/arch/x86/kernel/signal_64.c | 3 - trunk/arch/x86/kernel/smpboot.c | 8 +- trunk/arch/x86/kernel/syscall_table_32.S | 6 + trunk/arch/x86/mm/discontig_32.c | 3 +- trunk/arch/x86/mm/hugetlbpage.c | 78 +- trunk/arch/x86/mm/ioremap.c | 8 + trunk/arch/x86/mm/numa_64.c | 4 +- trunk/arch/x86/pci/i386.c | 1 + trunk/arch/x86/xen/smp.c | 4 +- trunk/arch/xtensa/kernel/setup.c | 1 + trunk/arch/xtensa/kernel/syscall.c | 2 +- trunk/crypto/async_tx/async_memcpy.c | 12 +- trunk/crypto/async_tx/async_memset.c | 12 +- trunk/crypto/async_tx/async_tx.c | 33 +- trunk/crypto/async_tx/async_xor.c | 262 +- trunk/drivers/acpi/processor_throttling.c | 17 +- trunk/drivers/acpi/sleep/main.c | 42 + trunk/drivers/acpi/system.c | 1 + trunk/drivers/atm/fore200e.c | 15 +- trunk/drivers/auxdisplay/cfag12864b.c | 13 +- trunk/drivers/base/cpu.c | 4 +- trunk/drivers/base/memory.c | 19 + trunk/drivers/char/Kconfig | 7 - trunk/drivers/char/Makefile | 1 - trunk/drivers/char/lcd.c | 516 -- trunk/drivers/char/lcd.h | 154 - trunk/drivers/char/mem.c | 5 +- trunk/drivers/char/mspec.c | 23 +- trunk/drivers/char/nvram.c | 1 - trunk/drivers/char/random.c | 1 + trunk/drivers/char/rtc.c | 19 +- trunk/drivers/char/stallion.c | 1 - trunk/drivers/char/tty_io.c | 15 +- trunk/drivers/char/vt.c | 6 +- trunk/drivers/cpufreq/cpufreq.c | 14 +- trunk/drivers/cpufreq/cpufreq_conservative.c | 2 +- trunk/drivers/cpufreq/cpufreq_ondemand.c | 4 +- trunk/drivers/cpufreq/cpufreq_userspace.c | 79 +- trunk/drivers/dca/dca-core.c | 131 +- trunk/drivers/dca/dca-sysfs.c | 3 +- trunk/drivers/dma/Kconfig | 37 +- trunk/drivers/dma/Makefile | 3 + trunk/drivers/dma/dmaengine.c | 35 +- trunk/drivers/dma/dmatest.c | 444 ++ trunk/drivers/dma/dw_dmac.c | 1122 ++++ trunk/drivers/dma/dw_dmac_regs.h | 225 + trunk/drivers/dma/fsldma.c | 38 +- trunk/drivers/dma/ioat.c | 15 + trunk/drivers/dma/ioat_dca.c | 244 +- trunk/drivers/dma/ioat_dma.c | 402 +- trunk/drivers/dma/ioatdma.h | 28 +- trunk/drivers/dma/ioatdma_hw.h | 1 + trunk/drivers/dma/ioatdma_registers.h | 20 + trunk/drivers/dma/iop-adma.c | 53 +- trunk/drivers/dma/mv_xor.c | 1375 +++++ trunk/drivers/dma/mv_xor.h | 183 + trunk/drivers/firmware/dcdbas.c | 3 +- trunk/drivers/hid/hid-core.c | 10 +- trunk/drivers/hid/hid-input-quirks.c | 40 + trunk/drivers/hid/hid-input.c | 3 + trunk/drivers/hid/hidraw.c | 48 +- trunk/drivers/hid/usbhid/hid-quirks.c | 22 +- trunk/drivers/hid/usbhid/hiddev.c | 14 +- trunk/drivers/hid/usbhid/usbkbd.c | 10 +- trunk/drivers/hid/usbhid/usbmouse.c | 8 - trunk/drivers/ide/Kconfig | 2 + trunk/drivers/ide/arm/icside.c | 71 +- trunk/drivers/ide/arm/ide_arm.c | 14 +- trunk/drivers/ide/arm/palm_bk3710.c | 30 +- trunk/drivers/ide/arm/rapide.c | 24 +- trunk/drivers/ide/h8300/ide-h8300.c | 48 +- trunk/drivers/ide/ide-atapi.c | 58 +- trunk/drivers/ide/ide-cd.c | 157 +- trunk/drivers/ide/ide-cd.h | 38 - trunk/drivers/ide/ide-cd_ioctl.c | 35 +- trunk/drivers/ide/ide-disk.c | 2 +- trunk/drivers/ide/ide-dma.c | 103 +- trunk/drivers/ide/ide-floppy.c | 90 +- trunk/drivers/ide/ide-generic.c | 73 +- trunk/drivers/ide/ide-io.c | 42 +- trunk/drivers/ide/ide-iops.c | 230 +- trunk/drivers/ide/ide-lib.c | 17 +- trunk/drivers/ide/ide-pnp.c | 29 +- trunk/drivers/ide/ide-probe.c | 366 +- trunk/drivers/ide/ide-proc.c | 4 +- trunk/drivers/ide/ide-tape.c | 127 +- trunk/drivers/ide/ide-taskfile.c | 38 +- trunk/drivers/ide/ide.c | 49 +- trunk/drivers/ide/legacy/buddha.c | 24 +- trunk/drivers/ide/legacy/falconide.c | 56 +- trunk/drivers/ide/legacy/gayle.c | 39 +- trunk/drivers/ide/legacy/ide-4drives.c | 20 +- trunk/drivers/ide/legacy/ide-cs.c | 54 +- trunk/drivers/ide/legacy/ide_platform.c | 32 +- trunk/drivers/ide/legacy/macide.c | 15 +- trunk/drivers/ide/legacy/q40ide.c | 47 +- trunk/drivers/ide/mips/au1xxx-ide.c | 56 +- trunk/drivers/ide/mips/swarm.c | 24 +- trunk/drivers/ide/pci/aec62xx.c | 5 - trunk/drivers/ide/pci/alim15x3.c | 12 +- trunk/drivers/ide/pci/amd74xx.c | 1 - trunk/drivers/ide/pci/cmd640.c | 29 +- trunk/drivers/ide/pci/cmd64x.c | 12 +- trunk/drivers/ide/pci/cs5520.c | 41 +- trunk/drivers/ide/pci/cs5535.c | 3 +- trunk/drivers/ide/pci/delkin_cb.c | 25 +- trunk/drivers/ide/pci/hpt34x.c | 1 - trunk/drivers/ide/pci/hpt366.c | 23 +- trunk/drivers/ide/pci/ns87415.c | 115 +- trunk/drivers/ide/pci/pdc202xx_old.c | 3 +- trunk/drivers/ide/pci/piix.c | 4 +- trunk/drivers/ide/pci/scc_pata.c | 139 +- trunk/drivers/ide/pci/serverworks.c | 4 +- trunk/drivers/ide/pci/sgiioc4.c | 65 +- trunk/drivers/ide/pci/siimage.c | 6 +- trunk/drivers/ide/pci/sl82c105.c | 4 +- trunk/drivers/ide/pci/tc86c001.c | 16 +- trunk/drivers/ide/pci/via82cxxx.c | 1 - trunk/drivers/ide/ppc/pmac.c | 222 +- trunk/drivers/ide/setup-pci.c | 109 +- trunk/drivers/ieee1394/iso.c | 1 + trunk/drivers/infiniband/hw/ehca/ehca_irq.c | 4 +- trunk/drivers/input/keyboard/tosakbd.c | 2 - trunk/drivers/isdn/gigaset/asyncdata.c | 3 +- trunk/drivers/isdn/gigaset/bas-gigaset.c | 12 +- trunk/drivers/isdn/gigaset/common.c | 2 +- trunk/drivers/isdn/gigaset/gigaset.h | 3 - trunk/drivers/isdn/gigaset/i4l.c | 56 +- trunk/drivers/isdn/gigaset/interface.c | 25 +- trunk/drivers/isdn/gigaset/usb-gigaset.c | 7 +- trunk/drivers/leds/Kconfig | 16 + trunk/drivers/leds/Makefile | 2 + trunk/drivers/leds/led-triggers.c | 3 +- trunk/drivers/leds/leds-atmel-pwm.c | 2 +- trunk/drivers/leds/leds-h1940.c | 9 +- trunk/drivers/leds/leds-pca9532.c | 337 ++ trunk/drivers/leds/leds-pca955x.c | 384 ++ .../drivers/media/video/pvrusb2/pvrusb2-dvb.c | 1 + .../media/video/pvrusb2/pvrusb2-ioread.c | 1 + trunk/drivers/media/video/uvc/uvc_queue.c | 1 + trunk/drivers/media/video/videobuf-core.c | 1 + trunk/drivers/message/i2o/device.c | 54 +- trunk/drivers/mfd/Kconfig | 11 + trunk/drivers/mfd/Makefile | 4 + trunk/drivers/mfd/mfd-core.c | 114 + trunk/drivers/mfd/tc6393xb.c | 600 +++ trunk/drivers/misc/atmel_pwm.c | 3 +- trunk/drivers/misc/sgi-xp/xpc_main.c | 3 +- trunk/drivers/mmc/card/mmc_test.c | 225 +- trunk/drivers/mmc/card/queue.c | 97 +- trunk/drivers/mmc/host/au1xmmc.c | 54 +- trunk/drivers/mmc/host/pxamci.c | 2 +- trunk/drivers/mmc/host/s3cmci.c | 50 +- trunk/drivers/mmc/host/sdhci.c | 167 +- trunk/drivers/mmc/host/sdhci.h | 7 +- trunk/drivers/mtd/maps/uclinux.c | 1 + trunk/drivers/mtd/nand/cmx270_nand.c | 79 +- trunk/drivers/net/e1000e/netdev.c | 2 - trunk/drivers/net/mlx4/eq.c | 1 + trunk/drivers/net/sky2.c | 5 - trunk/drivers/net/smc91x.c | 94 +- trunk/drivers/net/smc91x.h | 76 +- trunk/drivers/pcmcia/Kconfig | 3 +- trunk/drivers/pcmcia/Makefile | 1 + trunk/drivers/pcmcia/electra_cf.c | 1 + trunk/drivers/pcmcia/pxa2xx_cm_x270.c | 93 +- trunk/drivers/pcmcia/pxa2xx_palmtx.c | 118 + trunk/drivers/power/Kconfig | 6 + trunk/drivers/power/Makefile | 1 + trunk/drivers/power/palmtx_battery.c | 198 + trunk/drivers/rtc/Kconfig | 19 + trunk/drivers/rtc/Makefile | 2 + trunk/drivers/rtc/rtc-at91rm9200.c | 16 +- trunk/drivers/rtc/rtc-cmos.c | 294 +- trunk/drivers/rtc/rtc-dev.c | 58 +- trunk/drivers/rtc/rtc-ds1305.c | 847 +++ trunk/drivers/rtc/rtc-m41t80.c | 20 +- trunk/drivers/rtc/rtc-m41t94.c | 173 + trunk/drivers/rtc/rtc-omap.c | 21 +- trunk/drivers/rtc/rtc-pcf8583.c | 129 +- trunk/drivers/rtc/rtc-s3c.c | 89 +- trunk/drivers/rtc/rtc-vr41xx.c | 65 +- trunk/drivers/scsi/ide-scsi.c | 32 +- trunk/drivers/scsi/sun_esp.c | 1 + trunk/drivers/serial/8250.c | 17 +- trunk/drivers/serial/8250_gsc.c | 2 + trunk/drivers/serial/8250_pci.c | 17 + trunk/drivers/serial/Kconfig | 16 - trunk/drivers/serial/cpm_uart/cpm_uart_core.c | 116 +- trunk/drivers/serial/dz.c | 24 + trunk/drivers/serial/mpsc.c | 148 +- trunk/drivers/serial/zs.c | 21 +- trunk/drivers/spi/Kconfig | 45 +- trunk/drivers/spi/au1550_spi.c | 207 +- trunk/drivers/spi/spi.c | 4 +- trunk/drivers/spi/spi_mpc83xx.c | 29 +- trunk/drivers/spi/spidev.c | 19 +- trunk/drivers/spi/xilinx_spi.c | 5 +- trunk/drivers/usb/gadget/pxa25x_udc.c | 6 +- trunk/drivers/video/Kconfig | 53 + trunk/drivers/video/Makefile | 5 + trunk/drivers/video/acornfb.c | 1 + trunk/drivers/video/amifb.c | 24 +- trunk/drivers/video/atafb.c | 7 +- trunk/drivers/video/atmel_lcdfb.c | 92 +- trunk/drivers/video/aty/aty128fb.c | 6 +- trunk/drivers/video/aty/atyfb_base.c | 100 +- trunk/drivers/video/aty/radeon_base.c | 20 +- trunk/drivers/video/backlight/Kconfig | 36 + trunk/drivers/video/backlight/Makefile | 6 +- trunk/drivers/video/backlight/atmel-pwm-bl.c | 244 + trunk/drivers/video/backlight/ili9320.c | 330 ++ trunk/drivers/video/backlight/ili9320.h | 80 + trunk/drivers/video/backlight/lcd.c | 2 +- trunk/drivers/video/backlight/platform_lcd.c | 172 + trunk/drivers/video/backlight/vgg2432a4.c | 284 + trunk/drivers/video/bf54x-lq043fb.c | 2 +- trunk/drivers/video/bfin-t350mcqb-fb.c | 2 +- trunk/drivers/video/carminefb.c | 790 +++ trunk/drivers/video/carminefb.h | 64 + trunk/drivers/video/carminefb_regs.h | 159 + trunk/drivers/video/cobalt_lcdfb.c | 371 ++ trunk/drivers/video/console/fbcon.c | 5 +- trunk/drivers/video/console/fbcon.h | 8 +- trunk/drivers/video/console/mdacon.c | 4 +- trunk/drivers/video/fbmem.c | 10 +- trunk/drivers/video/fbmon.c | 2 +- trunk/drivers/video/fsl-diu-fb.c | 60 +- trunk/drivers/video/geode/lxfb.h | 2 - trunk/drivers/video/geode/lxfb_ops.c | 28 +- trunk/drivers/video/hgafb.c | 36 +- trunk/drivers/video/imxfb.c | 1 + trunk/drivers/video/neofb.c | 215 +- trunk/drivers/video/omap/dispc.c | 1 + trunk/drivers/video/omap/omapfb_main.c | 1 + trunk/drivers/video/pxafb.c | 72 +- trunk/drivers/video/pxafb.h | 2 +- trunk/drivers/video/sa1100fb.c | 8 +- trunk/drivers/video/sa1100fb.h | 2 +- trunk/drivers/video/sh7760fb.c | 658 +++ trunk/drivers/video/sh_mobile_lcdcfb.c | 725 +++ trunk/drivers/video/sis/init.h | 1 - trunk/drivers/video/sis/init301.h | 1 - trunk/drivers/video/sis/initextlfb.c | 1 - trunk/drivers/video/sis/osdef.h | 1 - trunk/drivers/video/sis/sis.h | 22 +- trunk/drivers/video/sis/sis_accel.c | 1 - trunk/drivers/video/sis/sis_main.c | 44 +- trunk/drivers/video/sis/sis_main.h | 4 +- trunk/drivers/video/sis/vgatypes.h | 4 - trunk/drivers/video/skeletonfb.c | 37 +- trunk/drivers/video/sm501fb.c | 329 +- trunk/drivers/video/tdfxfb.c | 8 +- trunk/drivers/video/tridentfb.c | 1350 +++-- trunk/drivers/video/uvesafb.c | 4 +- trunk/drivers/video/vfb.c | 14 +- trunk/drivers/video/vga16fb.c | 122 +- trunk/drivers/watchdog/Kconfig | 2 - trunk/drivers/watchdog/Makefile | 2 - trunk/drivers/zorro/zorro-sysfs.c | 1 - trunk/fs/anon_inodes.c | 11 +- trunk/fs/autofs4/autofs_i.h | 28 +- trunk/fs/autofs4/expire.c | 91 +- trunk/fs/autofs4/inode.c | 33 +- trunk/fs/autofs4/root.c | 589 +-- trunk/fs/autofs4/waitq.c | 267 +- trunk/fs/binfmt_misc.c | 20 +- trunk/fs/compat.c | 22 +- trunk/fs/compat_ioctl.c | 2 - trunk/fs/dcache.c | 335 +- trunk/fs/ecryptfs/Makefile | 2 +- trunk/fs/ecryptfs/crypto.c | 37 +- trunk/fs/ecryptfs/ecryptfs_kernel.h | 23 +- trunk/fs/ecryptfs/file.c | 17 + trunk/fs/ecryptfs/inode.c | 31 +- trunk/fs/ecryptfs/keystore.c | 9 +- trunk/fs/ecryptfs/kthread.c | 203 + trunk/fs/ecryptfs/main.c | 79 +- trunk/fs/ecryptfs/miscdev.c | 59 - trunk/fs/ecryptfs/mmap.c | 11 +- trunk/fs/eventfd.c | 17 +- trunk/fs/eventpoll.c | 30 +- trunk/fs/exec.c | 4 +- trunk/fs/fcntl.c | 15 +- trunk/fs/hugetlbfs/inode.c | 101 +- trunk/fs/inotify_user.c | 18 +- trunk/fs/open.c | 3 +- trunk/fs/pipe.c | 35 +- trunk/fs/proc/proc_misc.c | 19 +- trunk/fs/signalfd.c | 19 +- trunk/fs/super.c | 1 + trunk/fs/sync.c | 3 +- trunk/fs/timerfd.c | 9 +- trunk/fs/ufs/super.c | 2 +- trunk/include/asm-alpha/page.h | 3 - trunk/include/asm-alpha/socket.h | 5 + trunk/include/asm-arm/arch-iop13xx/adma.h | 18 +- trunk/include/asm-arm/arch-pxa/cm-x270.h | 50 - trunk/include/asm-arm/arch-pxa/eseries-gpio.h | 50 + trunk/include/asm-arm/arch-pxa/eseries-irq.h | 27 + trunk/include/asm-arm/arch-pxa/hardware.h | 33 + trunk/include/asm-arm/arch-pxa/irqs.h | 3 + trunk/include/asm-arm/arch-pxa/mfp-pxa2xx.h | 1 + trunk/include/asm-arm/arch-pxa/mfp-pxa930.h | 491 ++ trunk/include/asm-arm/arch-pxa/mfp.h | 8 + trunk/include/asm-arm/arch-pxa/palmtx.h | 106 + trunk/include/asm-arm/arch-pxa/pxa27x-udc.h | 2 +- trunk/include/asm-arm/arch-pxa/pxa2xx_spi.h | 2 + trunk/include/asm-arm/arch-pxa/pxa3xx_nand.h | 2 + trunk/include/asm-arm/arch-pxa/pxafb.h | 3 +- trunk/include/asm-arm/arch-pxa/regs-lcd.h | 6 + trunk/include/asm-arm/arch-pxa/regs-ssp.h | 16 +- trunk/include/asm-arm/arch-pxa/system.h | 17 +- trunk/include/asm-arm/arch-pxa/tosa.h | 50 +- trunk/include/asm-arm/arch-pxa/tosa_bt.h | 22 + trunk/include/asm-arm/arch-pxa/uncompress.h | 13 +- trunk/include/asm-arm/arch-pxa/zylonite.h | 2 + trunk/include/asm-arm/arch-sa1100/h3600.h | 5 + trunk/include/asm-arm/hardware/iop3xx-adma.h | 4 +- trunk/include/asm-arm/kgdb.h | 104 + trunk/include/asm-arm/mach/udc_pxa2xx.h | 1 + trunk/include/asm-arm/page-nommu.h | 4 +- trunk/include/asm-arm/page.h | 3 - trunk/include/asm-arm/plat-orion/mv_xor.h | 28 + trunk/include/asm-arm/traps.h | 2 + .../asm-avr32/arch-at32ap/at32ap700x.h | 16 + trunk/include/asm-avr32/page.h | 3 - trunk/include/asm-blackfin/page.h | 3 - trunk/include/asm-cris/cacheflush.h | 1 - trunk/include/asm-cris/page.h | 3 - trunk/include/asm-frv/page.h | 3 - trunk/include/asm-h8300/keyboard.h | 24 - trunk/include/asm-h8300/page.h | 3 - trunk/include/asm-ia64/hugetlb.h | 5 +- trunk/include/asm-ia64/page.h | 1 - trunk/include/asm-m32r/page.h | 3 - trunk/include/asm-m68k/dvma.h | 2 +- trunk/include/asm-m68k/page.h | 3 - trunk/include/asm-m68knommu/page.h | 3 - .../include/asm-mips/mach-au1x00/au1550_spi.h | 1 - trunk/include/asm-mips/page.h | 3 - trunk/include/asm-mips/processor.h | 2 +- trunk/include/asm-mips/socket.h | 7 + trunk/include/asm-mn10300/page.h | 3 - trunk/include/asm-mn10300/pci.h | 9 - trunk/include/asm-mn10300/scatterlist.h | 9 + trunk/include/asm-parisc/page.h | 4 - trunk/include/asm-parisc/socket.h | 5 + trunk/include/asm-powerpc/hugetlb.h | 10 +- trunk/include/asm-powerpc/io.h | 5 +- trunk/include/asm-powerpc/kgdb.h | 92 +- trunk/include/asm-powerpc/mmu-hash64.h | 6 +- trunk/include/asm-powerpc/page.h | 3 - trunk/include/asm-powerpc/page_64.h | 1 + trunk/include/asm-powerpc/pgalloc-64.h | 4 +- trunk/include/asm-powerpc/pgtable-4k.h | 3 + trunk/include/asm-powerpc/pgtable-64k.h | 2 +- trunk/include/asm-powerpc/pgtable-ppc32.h | 16 + trunk/include/asm-powerpc/pgtable-ppc64.h | 8 + trunk/include/asm-s390/hugetlb.h | 3 +- trunk/include/asm-s390/page.h | 3 - trunk/include/asm-sh/hugetlb.h | 5 +- trunk/include/asm-sh/page.h | 3 - trunk/include/asm-sh/sh7760fb.h | 197 + trunk/include/asm-sh/sh_mobile_lcdc.h | 66 + trunk/include/asm-sparc/hugetlb.h | 5 +- trunk/include/asm-sparc/page_32.h | 3 - trunk/include/asm-sparc/page_64.h | 3 - trunk/include/asm-um/page.h | 6 - trunk/include/asm-um/ptrace-generic.h | 3 - trunk/include/asm-v850/Kbuild | 1 - trunk/include/asm-v850/a.out.h | 21 - trunk/include/asm-v850/anna.h | 137 - trunk/include/asm-v850/as85ep1.h | 152 - trunk/include/asm-v850/asm.h | 32 - trunk/include/asm-v850/atomic.h | 131 - trunk/include/asm-v850/auxvec.h | 4 - trunk/include/asm-v850/bitops.h | 161 - trunk/include/asm-v850/bug.h | 25 - trunk/include/asm-v850/bugs.h | 16 - trunk/include/asm-v850/byteorder.h | 48 - trunk/include/asm-v850/cache.h | 26 - trunk/include/asm-v850/cacheflush.h | 70 - trunk/include/asm-v850/checksum.h | 112 - trunk/include/asm-v850/clinkage.h | 26 - trunk/include/asm-v850/cputime.h | 6 - trunk/include/asm-v850/current.h | 47 - trunk/include/asm-v850/delay.h | 47 - trunk/include/asm-v850/device.h | 7 - trunk/include/asm-v850/div64.h | 1 - trunk/include/asm-v850/dma-mapping.h | 11 - trunk/include/asm-v850/dma.h | 18 - trunk/include/asm-v850/elf.h | 99 - trunk/include/asm-v850/emergency-restart.h | 6 - trunk/include/asm-v850/entry.h | 113 - trunk/include/asm-v850/errno.h | 6 - trunk/include/asm-v850/fb.h | 12 - trunk/include/asm-v850/fcntl.h | 11 - trunk/include/asm-v850/flat.h | 133 - trunk/include/asm-v850/fpga85e2c.h | 82 - trunk/include/asm-v850/futex.h | 6 - trunk/include/asm-v850/gbus_int.h | 97 - trunk/include/asm-v850/hardirq.h | 28 - trunk/include/asm-v850/highres_timer.h | 44 - trunk/include/asm-v850/hw_irq.h | 4 - trunk/include/asm-v850/io.h | 142 - trunk/include/asm-v850/ioctl.h | 1 - trunk/include/asm-v850/ioctls.h | 84 - trunk/include/asm-v850/ipcbuf.h | 29 - trunk/include/asm-v850/irq.h | 55 - trunk/include/asm-v850/irq_regs.h | 1 - trunk/include/asm-v850/kdebug.h | 1 - trunk/include/asm-v850/kmap_types.h | 19 - trunk/include/asm-v850/kvm.h | 6 - trunk/include/asm-v850/linkage.h | 8 - trunk/include/asm-v850/local.h | 6 - trunk/include/asm-v850/ma.h | 101 - trunk/include/asm-v850/ma1.h | 50 - trunk/include/asm-v850/machdep.h | 60 - trunk/include/asm-v850/macrology.h | 17 - trunk/include/asm-v850/me2.h | 182 - trunk/include/asm-v850/mman.h | 15 - trunk/include/asm-v850/mmu.h | 11 - trunk/include/asm-v850/mmu_context.h | 13 - trunk/include/asm-v850/module.h | 62 - trunk/include/asm-v850/msgbuf.h | 31 - trunk/include/asm-v850/mutex.h | 9 - trunk/include/asm-v850/page.h | 128 - trunk/include/asm-v850/param.h | 33 - trunk/include/asm-v850/pci.h | 119 - trunk/include/asm-v850/percpu.h | 14 - trunk/include/asm-v850/pgalloc.h | 22 - trunk/include/asm-v850/pgtable.h | 59 - trunk/include/asm-v850/poll.h | 9 - trunk/include/asm-v850/posix_types.h | 72 - trunk/include/asm-v850/processor.h | 120 - trunk/include/asm-v850/ptrace.h | 121 - trunk/include/asm-v850/resource.h | 6 - trunk/include/asm-v850/rte_cb.h | 78 - trunk/include/asm-v850/rte_ma1_cb.h | 128 - trunk/include/asm-v850/rte_mb_a_pci.h | 56 - trunk/include/asm-v850/rte_me2_cb.h | 202 - trunk/include/asm-v850/rte_nb85e_cb.h | 111 - trunk/include/asm-v850/scatterlist.h | 31 - trunk/include/asm-v850/sections.h | 6 - trunk/include/asm-v850/segment.h | 36 - trunk/include/asm-v850/semaphore.h | 1 - trunk/include/asm-v850/sembuf.h | 25 - trunk/include/asm-v850/serial.h | 56 - trunk/include/asm-v850/setup.h | 6 - trunk/include/asm-v850/shmbuf.h | 42 - trunk/include/asm-v850/shmparam.h | 6 - trunk/include/asm-v850/sigcontext.h | 25 - trunk/include/asm-v850/siginfo.h | 6 - trunk/include/asm-v850/signal.h | 168 - trunk/include/asm-v850/sim.h | 47 - trunk/include/asm-v850/sim85e2.h | 69 - trunk/include/asm-v850/sim85e2c.h | 26 - trunk/include/asm-v850/sim85e2s.h | 28 - trunk/include/asm-v850/simsyscall.h | 99 - trunk/include/asm-v850/socket.h | 57 - trunk/include/asm-v850/sockios.h | 13 - trunk/include/asm-v850/stat.h | 73 - trunk/include/asm-v850/statfs.h | 6 - trunk/include/asm-v850/string.h | 25 - trunk/include/asm-v850/system.h | 123 - trunk/include/asm-v850/teg.h | 101 - trunk/include/asm-v850/termbits.h | 200 - trunk/include/asm-v850/termios.h | 90 - trunk/include/asm-v850/thread_info.h | 129 - trunk/include/asm-v850/timex.h | 18 - trunk/include/asm-v850/tlb.h | 21 - trunk/include/asm-v850/tlbflush.h | 64 - trunk/include/asm-v850/topology.h | 6 - trunk/include/asm-v850/types.h | 36 - trunk/include/asm-v850/uaccess.h | 159 - trunk/include/asm-v850/ucontext.h | 14 - trunk/include/asm-v850/unaligned.h | 22 - trunk/include/asm-v850/unistd.h | 244 - trunk/include/asm-v850/user.h | 52 - trunk/include/asm-v850/v850e.h | 21 - trunk/include/asm-v850/v850e2.h | 69 - trunk/include/asm-v850/v850e2_cache.h | 75 - trunk/include/asm-v850/v850e_cache.h | 48 - trunk/include/asm-v850/v850e_intc.h | 133 - trunk/include/asm-v850/v850e_timer_c.h | 48 - trunk/include/asm-v850/v850e_timer_d.h | 62 - trunk/include/asm-v850/v850e_uart.h | 76 - trunk/include/asm-v850/v850e_uarta.h | 278 - trunk/include/asm-v850/v850e_uartb.h | 262 - trunk/include/asm-v850/v850e_utils.h | 35 - trunk/include/asm-x86/hugetlb.h | 10 +- trunk/include/asm-x86/io_32.h | 2 + trunk/include/asm-x86/io_64.h | 2 + trunk/include/asm-x86/ipi.h | 2 +- trunk/include/asm-x86/page.h | 3 +- trunk/include/asm-x86/processor.h | 2 +- trunk/include/asm-x86/thread_info.h | 4 +- trunk/include/asm-x86/unistd_32.h | 6 + trunk/include/asm-x86/unistd_64.h | 14 + trunk/include/asm-xtensa/page.h | 2 - trunk/include/linux/acpi.h | 1 + trunk/include/linux/anon_inodes.h | 2 +- trunk/include/linux/async_tx.h | 11 +- trunk/include/linux/atmel-pwm-bl.h | 43 + trunk/include/linux/audit.h | 1 - trunk/include/linux/auto_fs4.h | 2 - trunk/include/linux/bcd.h | 9 +- trunk/include/linux/binfmts.h | 2 +- trunk/include/linux/bootmem.h | 97 +- trunk/include/linux/cpumask.h | 172 +- trunk/include/linux/cpuset.h | 7 + trunk/include/linux/dca.h | 7 +- trunk/include/linux/dmaengine.h | 69 +- trunk/include/linux/dw_dmac.h | 62 + trunk/include/linux/eventfd.h | 7 + trunk/include/linux/eventpoll.h | 4 + trunk/include/linux/fb.h | 5 +- trunk/include/linux/fs.h | 11 +- trunk/include/linux/gfp.h | 24 +- trunk/include/linux/hid.h | 2 +- trunk/include/linux/hugetlb.h | 143 +- trunk/include/linux/ide.h | 193 +- trunk/include/linux/inotify.h | 6 + trunk/include/linux/kobject.h | 2 + trunk/include/linux/lcd.h | 2 +- trunk/include/linux/leds-pca9532.h | 45 + trunk/include/linux/leds.h | 16 +- trunk/include/linux/major.h | 2 +- trunk/include/linux/memory_hotplug.h | 20 +- trunk/include/linux/mempolicy.h | 19 + trunk/include/linux/mfd/core.h | 55 + trunk/include/linux/mfd/tc6393xb.h | 49 + trunk/include/linux/mfd/tmio.h | 17 + trunk/include/linux/migrate.h | 21 - trunk/include/linux/mm.h | 30 +- trunk/include/linux/module.h | 2 +- trunk/include/linux/net.h | 15 +- trunk/include/linux/page-flags.h | 29 +- trunk/include/linux/pagemap.h | 2 +- trunk/include/linux/parser.h | 2 +- trunk/include/linux/pci_ids.h | 8 + trunk/include/linux/pm.h | 109 +- trunk/include/linux/pm_legacy.h | 35 - trunk/include/linux/rtc.h | 17 + trunk/include/linux/scatterlist.h | 38 + trunk/include/linux/sched.h | 21 +- trunk/include/linux/security.h | 2 - trunk/include/linux/serial_core.h | 3 - trunk/include/linux/signalfd.h | 6 + trunk/include/linux/slab.h | 2 +- trunk/include/linux/sm501.h | 2 + trunk/include/linux/smc91x.h | 12 +- trunk/include/linux/spi/ds1305.h | 35 + trunk/include/linux/spi/spi.h | 2 +- trunk/include/linux/string.h | 3 + trunk/include/linux/syscalls.h | 9 +- trunk/include/linux/timerfd.h | 6 + trunk/include/linux/vmstat.h | 6 + trunk/include/linux/workqueue.h | 3 + trunk/include/video/atmel_lcdc.h | 1 + trunk/include/video/ili9320.h | 201 + trunk/include/video/neomagic.h | 17 - trunk/include/video/platform_lcd.h | 21 + trunk/include/video/trident.h | 77 +- trunk/init/main.c | 7 + trunk/ipc/shm.c | 3 +- trunk/kernel/Kconfig.hz | 2 +- trunk/kernel/Makefile | 2 + trunk/kernel/auditsc.c | 3 +- trunk/kernel/capability.c | 338 +- trunk/kernel/cpu.c | 42 +- trunk/kernel/cpuset.c | 2 +- trunk/kernel/fork.c | 9 + trunk/kernel/irq/manage.c | 103 +- trunk/kernel/kmod.c | 4 +- trunk/kernel/power/Kconfig | 11 + trunk/kernel/power/main.c | 194 +- trunk/kernel/power/poweroff.c | 4 +- trunk/kernel/power/process.c | 2 +- trunk/kernel/power/snapshot.c | 88 +- trunk/kernel/printk.c | 2 +- trunk/kernel/rcuclassic.c | 2 +- trunk/kernel/rcupreempt.c | 10 +- trunk/kernel/sched.c | 349 +- trunk/kernel/sched_fair.c | 10 +- trunk/kernel/sched_rt.c | 81 +- trunk/kernel/softlockup.c | 45 +- trunk/kernel/stop_machine.c | 3 +- trunk/kernel/sys_ni.c | 4 + trunk/kernel/sysctl.c | 30 +- trunk/kernel/taskstats.c | 4 +- trunk/kernel/time/clocksource.c | 4 +- trunk/kernel/time/tick-broadcast.c | 3 +- trunk/kernel/time/tick-common.c | 14 +- trunk/kernel/time/tick-sched.c | 4 +- trunk/kernel/trace/trace_sysprof.c | 4 +- trunk/kernel/workqueue.c | 45 +- trunk/lib/Kconfig.debug | 38 +- trunk/lib/Kconfig.kgdb | 3 - trunk/lib/Makefile | 2 +- trunk/lib/bcd.c | 14 + trunk/lib/cpumask.c | 9 + trunk/lib/debugobjects.c | 4 +- trunk/lib/scatterlist.c | 176 +- trunk/lib/smp_processor_id.c | 6 +- trunk/mm/Kconfig | 2 +- trunk/mm/Makefile | 2 +- trunk/mm/allocpercpu.c | 4 +- trunk/mm/bootmem.c | 935 ++-- trunk/mm/filemap.c | 159 +- trunk/mm/hugetlb.c | 1712 ++++-- trunk/mm/internal.h | 61 + trunk/mm/memory.c | 243 +- trunk/mm/memory_hotplug.c | 80 +- trunk/mm/mempolicy.c | 9 +- trunk/mm/migrate.c | 3 +- trunk/mm/mm_init.c | 152 + trunk/mm/mmap.c | 12 +- trunk/mm/mprotect.c | 6 +- trunk/mm/page_alloc.c | 152 +- trunk/mm/shmem.c | 55 +- trunk/mm/slob.c | 12 +- trunk/mm/slub.c | 65 +- trunk/mm/sparse.c | 115 +- trunk/mm/swap.c | 8 +- trunk/mm/swapfile.c | 49 +- trunk/mm/vmalloc.c | 20 + trunk/mm/vmstat.c | 3 +- trunk/net/9p/trans_fd.c | 2 +- trunk/net/compat.c | 52 +- trunk/net/core/dev.c | 7 +- trunk/net/core/sock.c | 2 +- trunk/net/core/user_dma.c | 1 + trunk/net/ipv4/netfilter/Kconfig | 2 +- trunk/net/ipv4/tcp_input.c | 3 +- trunk/net/ipv6/netfilter/Kconfig | 2 +- trunk/net/iucv/iucv.c | 2 +- trunk/net/sched/sch_sfq.c | 9 +- trunk/net/sctp/socket.c | 2 +- trunk/net/socket.c | 142 +- trunk/net/sunrpc/svc.c | 3 +- trunk/scripts/checkpatch.pl | 310 +- trunk/scripts/genksyms/genksyms.c | 3 +- trunk/scripts/mod/file2alias.c | 2 +- trunk/scripts/mod/mk_elfconfig.c | 2 +- trunk/security/Kconfig | 3 +- trunk/security/commoncap.c | 108 +- trunk/sound/core/info.c | 1 + trunk/sound/oss/Kconfig | 41 - trunk/sound/oss/Makefile | 3 - trunk/sound/oss/trident.c | 4654 ----------------- trunk/sound/oss/trident.h | 358 -- trunk/sound/soc/pxa/Kconfig | 1 + trunk/sound/soc/pxa/tosa.c | 29 +- trunk/virt/kvm/kvm_main.c | 4 +- 910 files changed, 31492 insertions(+), 33095 deletions(-) create mode 100644 trunk/Documentation/ABI/testing/sysfs-devices-memory create mode 100644 trunk/Documentation/ABI/testing/sysfs-kernel-mm create mode 100644 trunk/Documentation/ABI/testing/sysfs-kernel-mm-hugepages create mode 100644 trunk/Documentation/fb/sh7760fb.txt create mode 100644 trunk/Documentation/power/apm-acpi.txt delete mode 100644 trunk/Documentation/power/pm.txt create mode 100644 trunk/arch/arm/configs/ezx_defconfig create mode 100644 trunk/arch/arm/kernel/kgdb.c create mode 100644 trunk/arch/arm/mach-pxa/e400_lcd.c create mode 100644 trunk/arch/arm/mach-pxa/e740_lcd.c create mode 100644 trunk/arch/arm/mach-pxa/e750_lcd.c create mode 100644 trunk/arch/arm/mach-pxa/e800_lcd.c create mode 100644 trunk/arch/arm/mach-pxa/eseries_udc.c create mode 100644 trunk/arch/arm/mach-pxa/ezx.c create mode 100644 trunk/arch/arm/mach-pxa/palmtx.c create mode 100644 trunk/arch/arm/mach-pxa/pxa930.c create mode 100644 trunk/arch/arm/mach-pxa/reset.c create mode 100644 trunk/arch/arm/mach-pxa/saar.c create mode 100644 trunk/arch/arm/mach-pxa/tavorevb.c create mode 100644 trunk/arch/arm/mach-pxa/tosa-bt.c create mode 100644 trunk/arch/powerpc/kernel/kgdb.c delete mode 100644 trunk/arch/v850/Kconfig delete mode 100644 trunk/arch/v850/Kconfig.debug delete mode 100644 trunk/arch/v850/Makefile delete mode 100644 trunk/arch/v850/README delete mode 100644 trunk/arch/v850/configs/rte-ma1-cb_defconfig delete mode 100644 trunk/arch/v850/configs/rte-me2-cb_defconfig delete mode 100644 trunk/arch/v850/configs/sim_defconfig delete mode 100644 trunk/arch/v850/kernel/Makefile delete mode 100644 trunk/arch/v850/kernel/anna-rom.ld delete mode 100644 trunk/arch/v850/kernel/anna.c delete mode 100644 trunk/arch/v850/kernel/anna.ld delete mode 100644 trunk/arch/v850/kernel/as85ep1-rom.ld delete mode 100644 trunk/arch/v850/kernel/as85ep1.c delete mode 100644 trunk/arch/v850/kernel/as85ep1.ld delete mode 100644 trunk/arch/v850/kernel/asm-offsets.c delete mode 100644 trunk/arch/v850/kernel/bug.c delete mode 100644 trunk/arch/v850/kernel/entry.S delete mode 100644 trunk/arch/v850/kernel/fpga85e2c.c delete mode 100644 trunk/arch/v850/kernel/fpga85e2c.ld delete mode 100644 trunk/arch/v850/kernel/gbus_int.c delete mode 100644 trunk/arch/v850/kernel/head.S delete mode 100644 trunk/arch/v850/kernel/highres_timer.c delete mode 100644 trunk/arch/v850/kernel/init_task.c delete mode 100644 trunk/arch/v850/kernel/intv.S delete mode 100644 trunk/arch/v850/kernel/irq.c delete mode 100644 trunk/arch/v850/kernel/ma.c delete mode 100644 trunk/arch/v850/kernel/mach.c delete mode 100644 trunk/arch/v850/kernel/mach.h delete mode 100644 trunk/arch/v850/kernel/me2.c delete mode 100644 trunk/arch/v850/kernel/memcons.c delete mode 100644 trunk/arch/v850/kernel/module.c delete mode 100644 trunk/arch/v850/kernel/process.c delete mode 100644 trunk/arch/v850/kernel/procfs.c delete mode 100644 trunk/arch/v850/kernel/ptrace.c delete mode 100644 trunk/arch/v850/kernel/rte_cb.c delete mode 100644 trunk/arch/v850/kernel/rte_cb_leds.c delete mode 100644 trunk/arch/v850/kernel/rte_cb_multi.c delete mode 100644 trunk/arch/v850/kernel/rte_ma1_cb-rom.ld delete mode 100644 trunk/arch/v850/kernel/rte_ma1_cb.c delete mode 100644 trunk/arch/v850/kernel/rte_ma1_cb.ld delete mode 100644 trunk/arch/v850/kernel/rte_mb_a_pci.c delete mode 100644 trunk/arch/v850/kernel/rte_me2_cb.c delete mode 100644 trunk/arch/v850/kernel/rte_me2_cb.ld delete mode 100644 trunk/arch/v850/kernel/rte_nb85e_cb-multi.ld delete mode 100644 trunk/arch/v850/kernel/rte_nb85e_cb.c delete mode 100644 trunk/arch/v850/kernel/rte_nb85e_cb.ld delete mode 100644 trunk/arch/v850/kernel/setup.c delete mode 100644 trunk/arch/v850/kernel/signal.c delete mode 100644 trunk/arch/v850/kernel/sim.c delete mode 100644 trunk/arch/v850/kernel/sim.ld delete mode 100644 trunk/arch/v850/kernel/sim85e2.c delete mode 100644 trunk/arch/v850/kernel/sim85e2.ld delete mode 100644 trunk/arch/v850/kernel/simcons.c delete mode 100644 trunk/arch/v850/kernel/syscalls.c delete mode 100644 trunk/arch/v850/kernel/teg.c delete mode 100644 trunk/arch/v850/kernel/time.c delete mode 100644 trunk/arch/v850/kernel/v850_ksyms.c delete mode 100644 trunk/arch/v850/kernel/v850e2_cache.c delete mode 100644 trunk/arch/v850/kernel/v850e_cache.c delete mode 100644 trunk/arch/v850/kernel/v850e_intc.c delete mode 100644 trunk/arch/v850/kernel/v850e_timer_d.c delete mode 100644 trunk/arch/v850/kernel/v850e_utils.c delete mode 100644 trunk/arch/v850/kernel/vmlinux.lds.S delete mode 100644 trunk/arch/v850/lib/Makefile delete mode 100644 trunk/arch/v850/lib/ashldi3.c delete mode 100644 trunk/arch/v850/lib/ashrdi3.c delete mode 100644 trunk/arch/v850/lib/checksum.c delete mode 100644 trunk/arch/v850/lib/lshrdi3.c delete mode 100644 trunk/arch/v850/lib/memcpy.c delete mode 100644 trunk/arch/v850/lib/memset.c delete mode 100644 trunk/arch/v850/lib/muldi3.c delete mode 100644 trunk/arch/v850/lib/negdi2.c delete mode 100644 trunk/drivers/char/lcd.c delete mode 100644 trunk/drivers/char/lcd.h create mode 100644 trunk/drivers/dma/dmatest.c create mode 100644 trunk/drivers/dma/dw_dmac.c create mode 100644 trunk/drivers/dma/dw_dmac_regs.h create mode 100644 trunk/drivers/dma/mv_xor.c create mode 100644 trunk/drivers/dma/mv_xor.h create mode 100644 trunk/drivers/leds/leds-pca9532.c create mode 100644 trunk/drivers/leds/leds-pca955x.c create mode 100644 trunk/drivers/mfd/mfd-core.c create mode 100644 trunk/drivers/mfd/tc6393xb.c create mode 100644 trunk/drivers/pcmcia/pxa2xx_palmtx.c create mode 100644 trunk/drivers/power/palmtx_battery.c create mode 100644 trunk/drivers/rtc/rtc-ds1305.c create mode 100644 trunk/drivers/rtc/rtc-m41t94.c create mode 100644 trunk/drivers/video/backlight/atmel-pwm-bl.c create mode 100644 trunk/drivers/video/backlight/ili9320.c create mode 100644 trunk/drivers/video/backlight/ili9320.h create mode 100644 trunk/drivers/video/backlight/platform_lcd.c create mode 100644 trunk/drivers/video/backlight/vgg2432a4.c create mode 100644 trunk/drivers/video/carminefb.c create mode 100644 trunk/drivers/video/carminefb.h create mode 100644 trunk/drivers/video/carminefb_regs.h create mode 100644 trunk/drivers/video/cobalt_lcdfb.c create mode 100644 trunk/drivers/video/sh7760fb.c create mode 100644 trunk/drivers/video/sh_mobile_lcdcfb.c create mode 100644 trunk/fs/ecryptfs/kthread.c delete mode 100644 trunk/include/asm-arm/arch-pxa/cm-x270.h create mode 100644 trunk/include/asm-arm/arch-pxa/eseries-gpio.h create mode 100644 trunk/include/asm-arm/arch-pxa/eseries-irq.h create mode 100644 trunk/include/asm-arm/arch-pxa/mfp-pxa930.h create mode 100644 trunk/include/asm-arm/arch-pxa/palmtx.h create mode 100644 trunk/include/asm-arm/arch-pxa/tosa_bt.h create mode 100644 trunk/include/asm-arm/kgdb.h create mode 100644 trunk/include/asm-arm/plat-orion/mv_xor.h delete mode 100644 trunk/include/asm-h8300/keyboard.h create mode 100644 trunk/include/asm-sh/sh7760fb.h create mode 100644 trunk/include/asm-sh/sh_mobile_lcdc.h delete mode 100644 trunk/include/asm-v850/Kbuild delete mode 100644 trunk/include/asm-v850/a.out.h delete mode 100644 trunk/include/asm-v850/anna.h delete mode 100644 trunk/include/asm-v850/as85ep1.h delete mode 100644 trunk/include/asm-v850/asm.h delete mode 100644 trunk/include/asm-v850/atomic.h delete mode 100644 trunk/include/asm-v850/auxvec.h delete mode 100644 trunk/include/asm-v850/bitops.h delete mode 100644 trunk/include/asm-v850/bug.h delete mode 100644 trunk/include/asm-v850/bugs.h delete mode 100644 trunk/include/asm-v850/byteorder.h delete mode 100644 trunk/include/asm-v850/cache.h delete mode 100644 trunk/include/asm-v850/cacheflush.h delete mode 100644 trunk/include/asm-v850/checksum.h delete mode 100644 trunk/include/asm-v850/clinkage.h delete mode 100644 trunk/include/asm-v850/cputime.h delete mode 100644 trunk/include/asm-v850/current.h delete mode 100644 trunk/include/asm-v850/delay.h delete mode 100644 trunk/include/asm-v850/device.h delete mode 100644 trunk/include/asm-v850/div64.h delete mode 100644 trunk/include/asm-v850/dma-mapping.h delete mode 100644 trunk/include/asm-v850/dma.h delete mode 100644 trunk/include/asm-v850/elf.h delete mode 100644 trunk/include/asm-v850/emergency-restart.h delete mode 100644 trunk/include/asm-v850/entry.h delete mode 100644 trunk/include/asm-v850/errno.h delete mode 100644 trunk/include/asm-v850/fb.h delete mode 100644 trunk/include/asm-v850/fcntl.h delete mode 100644 trunk/include/asm-v850/flat.h delete mode 100644 trunk/include/asm-v850/fpga85e2c.h delete mode 100644 trunk/include/asm-v850/futex.h delete mode 100644 trunk/include/asm-v850/gbus_int.h delete mode 100644 trunk/include/asm-v850/hardirq.h delete mode 100644 trunk/include/asm-v850/highres_timer.h delete mode 100644 trunk/include/asm-v850/hw_irq.h delete mode 100644 trunk/include/asm-v850/io.h delete mode 100644 trunk/include/asm-v850/ioctl.h delete mode 100644 trunk/include/asm-v850/ioctls.h delete mode 100644 trunk/include/asm-v850/ipcbuf.h delete mode 100644 trunk/include/asm-v850/irq.h delete mode 100644 trunk/include/asm-v850/irq_regs.h delete mode 100644 trunk/include/asm-v850/kdebug.h delete mode 100644 trunk/include/asm-v850/kmap_types.h delete mode 100644 trunk/include/asm-v850/kvm.h delete mode 100644 trunk/include/asm-v850/linkage.h delete mode 100644 trunk/include/asm-v850/local.h delete mode 100644 trunk/include/asm-v850/ma.h delete mode 100644 trunk/include/asm-v850/ma1.h delete mode 100644 trunk/include/asm-v850/machdep.h delete mode 100644 trunk/include/asm-v850/macrology.h delete mode 100644 trunk/include/asm-v850/me2.h delete mode 100644 trunk/include/asm-v850/mman.h delete mode 100644 trunk/include/asm-v850/mmu.h delete mode 100644 trunk/include/asm-v850/mmu_context.h delete mode 100644 trunk/include/asm-v850/module.h delete mode 100644 trunk/include/asm-v850/msgbuf.h delete mode 100644 trunk/include/asm-v850/mutex.h delete mode 100644 trunk/include/asm-v850/page.h delete mode 100644 trunk/include/asm-v850/param.h delete mode 100644 trunk/include/asm-v850/pci.h delete mode 100644 trunk/include/asm-v850/percpu.h delete mode 100644 trunk/include/asm-v850/pgalloc.h delete mode 100644 trunk/include/asm-v850/pgtable.h delete mode 100644 trunk/include/asm-v850/poll.h delete mode 100644 trunk/include/asm-v850/posix_types.h delete mode 100644 trunk/include/asm-v850/processor.h delete mode 100644 trunk/include/asm-v850/ptrace.h delete mode 100644 trunk/include/asm-v850/resource.h delete mode 100644 trunk/include/asm-v850/rte_cb.h delete mode 100644 trunk/include/asm-v850/rte_ma1_cb.h delete mode 100644 trunk/include/asm-v850/rte_mb_a_pci.h delete mode 100644 trunk/include/asm-v850/rte_me2_cb.h delete mode 100644 trunk/include/asm-v850/rte_nb85e_cb.h delete mode 100644 trunk/include/asm-v850/scatterlist.h delete mode 100644 trunk/include/asm-v850/sections.h delete mode 100644 trunk/include/asm-v850/segment.h delete mode 100644 trunk/include/asm-v850/semaphore.h delete mode 100644 trunk/include/asm-v850/sembuf.h delete mode 100644 trunk/include/asm-v850/serial.h delete mode 100644 trunk/include/asm-v850/setup.h delete mode 100644 trunk/include/asm-v850/shmbuf.h delete mode 100644 trunk/include/asm-v850/shmparam.h delete mode 100644 trunk/include/asm-v850/sigcontext.h delete mode 100644 trunk/include/asm-v850/siginfo.h delete mode 100644 trunk/include/asm-v850/signal.h delete mode 100644 trunk/include/asm-v850/sim.h delete mode 100644 trunk/include/asm-v850/sim85e2.h delete mode 100644 trunk/include/asm-v850/sim85e2c.h delete mode 100644 trunk/include/asm-v850/sim85e2s.h delete mode 100644 trunk/include/asm-v850/simsyscall.h delete mode 100644 trunk/include/asm-v850/socket.h delete mode 100644 trunk/include/asm-v850/sockios.h delete mode 100644 trunk/include/asm-v850/stat.h delete mode 100644 trunk/include/asm-v850/statfs.h delete mode 100644 trunk/include/asm-v850/string.h delete mode 100644 trunk/include/asm-v850/system.h delete mode 100644 trunk/include/asm-v850/teg.h delete mode 100644 trunk/include/asm-v850/termbits.h delete mode 100644 trunk/include/asm-v850/termios.h delete mode 100644 trunk/include/asm-v850/thread_info.h delete mode 100644 trunk/include/asm-v850/timex.h delete mode 100644 trunk/include/asm-v850/tlb.h delete mode 100644 trunk/include/asm-v850/tlbflush.h delete mode 100644 trunk/include/asm-v850/topology.h delete mode 100644 trunk/include/asm-v850/types.h delete mode 100644 trunk/include/asm-v850/uaccess.h delete mode 100644 trunk/include/asm-v850/ucontext.h delete mode 100644 trunk/include/asm-v850/unaligned.h delete mode 100644 trunk/include/asm-v850/unistd.h delete mode 100644 trunk/include/asm-v850/user.h delete mode 100644 trunk/include/asm-v850/v850e.h delete mode 100644 trunk/include/asm-v850/v850e2.h delete mode 100644 trunk/include/asm-v850/v850e2_cache.h delete mode 100644 trunk/include/asm-v850/v850e_cache.h delete mode 100644 trunk/include/asm-v850/v850e_intc.h delete mode 100644 trunk/include/asm-v850/v850e_timer_c.h delete mode 100644 trunk/include/asm-v850/v850e_timer_d.h delete mode 100644 trunk/include/asm-v850/v850e_uart.h delete mode 100644 trunk/include/asm-v850/v850e_uarta.h delete mode 100644 trunk/include/asm-v850/v850e_uartb.h delete mode 100644 trunk/include/asm-v850/v850e_utils.h create mode 100644 trunk/include/linux/atmel-pwm-bl.h create mode 100644 trunk/include/linux/dw_dmac.h create mode 100644 trunk/include/linux/leds-pca9532.h create mode 100644 trunk/include/linux/mfd/core.h create mode 100644 trunk/include/linux/mfd/tc6393xb.h create mode 100644 trunk/include/linux/mfd/tmio.h delete mode 100644 trunk/include/linux/pm_legacy.h create mode 100644 trunk/include/linux/spi/ds1305.h create mode 100644 trunk/include/video/ili9320.h create mode 100644 trunk/include/video/platform_lcd.h create mode 100644 trunk/lib/bcd.c create mode 100644 trunk/mm/mm_init.c delete mode 100644 trunk/sound/oss/trident.c delete mode 100644 trunk/sound/oss/trident.h diff --git a/[refs] b/[refs] index 27830cd0519d..8832e1e81351 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6ec2d96796d0accda6c325890206f3629130729 +refs/heads/master: ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc diff --git a/trunk/CREDITS b/trunk/CREDITS index 077b147388bd..c62dcb3b7e26 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -317,6 +317,14 @@ S: 2322 37th Ave SW S: Seattle, Washington 98126-2010 S: USA +N: Muli Ben-Yehuda +E: mulix@mulix.org +E: muli@il.ibm.com +W: http://www.mulix.org +D: trident OSS sound driver, x86-64 dma-ops and Calgary IOMMU, +D: KVM and Xen bits and other misc. hackery. +S: Haifa, Israel + N: Johannes Berg E: johannes@sipsolutions.net W: http://johannes.sipsolutions.net/ diff --git a/trunk/Documentation/ABI/testing/sysfs-devices-memory b/trunk/Documentation/ABI/testing/sysfs-devices-memory new file mode 100644 index 000000000000..7a16fe1e2270 --- /dev/null +++ b/trunk/Documentation/ABI/testing/sysfs-devices-memory @@ -0,0 +1,24 @@ +What: /sys/devices/system/memory +Date: June 2008 +Contact: Badari Pulavarty +Description: + The /sys/devices/system/memory contains a snapshot of the + internal state of the kernel memory blocks. Files could be + added or removed dynamically to represent hot-add/remove + operations. + +Users: hotplug memory add/remove tools + https://w3.opensource.ibm.com/projects/powerpc-utils/ + +What: /sys/devices/system/memory/memoryX/removable +Date: June 2008 +Contact: Badari Pulavarty +Description: + The file /sys/devices/system/memory/memoryX/removable + indicates whether this memory block is removable or not. + This is useful for a user-level agent to determine + identify removable sections of the memory before attempting + potentially expensive hot-remove memory operation + +Users: hotplug memory remove tools + https://w3.opensource.ibm.com/projects/powerpc-utils/ diff --git a/trunk/Documentation/ABI/testing/sysfs-kernel-mm b/trunk/Documentation/ABI/testing/sysfs-kernel-mm new file mode 100644 index 000000000000..190d523ac159 --- /dev/null +++ b/trunk/Documentation/ABI/testing/sysfs-kernel-mm @@ -0,0 +1,6 @@ +What: /sys/kernel/mm +Date: July 2008 +Contact: Nishanth Aravamudan , VM maintainers +Description: + /sys/kernel/mm/ should contain any and all VM + related information in /sys/kernel/. diff --git a/trunk/Documentation/ABI/testing/sysfs-kernel-mm-hugepages b/trunk/Documentation/ABI/testing/sysfs-kernel-mm-hugepages new file mode 100644 index 000000000000..e21c00571cf4 --- /dev/null +++ b/trunk/Documentation/ABI/testing/sysfs-kernel-mm-hugepages @@ -0,0 +1,15 @@ +What: /sys/kernel/mm/hugepages/ +Date: June 2008 +Contact: Nishanth Aravamudan , hugetlb maintainers +Description: + /sys/kernel/mm/hugepages/ contains a number of subdirectories + of the form hugepages-kB, where is the page size + of the hugepages supported by the kernel/CPU combination. + + Under these directories are a number of files: + nr_hugepages + nr_overcommit_hugepages + free_hugepages + surplus_hugepages + resv_hugepages + See Documentation/vm/hugetlbpage.txt for details. diff --git a/trunk/Documentation/fb/sh7760fb.txt b/trunk/Documentation/fb/sh7760fb.txt new file mode 100644 index 000000000000..c87bfe5c630a --- /dev/null +++ b/trunk/Documentation/fb/sh7760fb.txt @@ -0,0 +1,131 @@ +SH7760/SH7763 integrated LCDC Framebuffer driver +================================================ + +0. Overwiew +----------- +The SH7760/SH7763 have an integrated LCD Display controller (LCDC) which +supports (in theory) resolutions ranging from 1x1 to 1024x1024, +with color depths ranging from 1 to 16 bits, on STN, DSTN and TFT Panels. + +Caveats: +* Framebuffer memory must be a large chunk allocated at the top + of Area3 (HW requirement). Because of this requirement you should NOT + make the driver a module since at runtime it may become impossible to + get a large enough contiguous chunk of memory. + +* The driver does not support changing resolution while loaded + (displays aren't hotpluggable anyway) + +* Heavy flickering may be observed + a) if you're using 15/16bit color modes at >= 640x480 px resolutions, + b) during PCMCIA (or any other slow bus) activity. + +* Rotation works only 90degress clockwise, and only if horizontal + resolution is <= 320 pixels. + +files: drivers/video/sh7760fb.c + include/asm-sh/sh7760fb.h + Documentation/fb/sh7760fb.txt + +1. Platform setup +----------------- +SH7760: + Video data is fetched via the DMABRG DMA engine, so you have to + configure the SH DMAC for DMABRG mode (write 0x94808080 to the + DMARSRA register somewhere at boot). + + PFC registers PCCR and PCDR must be set to peripheral mode. + (write zeros to both). + +The driver does NOT do the above for you since board setup is, well, job +of the board setup code. + +2. Panel definitions +-------------------- +The LCDC must explicitly be told about the type of LCD panel +attached. Data must be wrapped in a "struct sh7760fb_platdata" and +passed to the driver as platform_data. + +Suggest you take a closer look at the SH7760 Manual, Section 30. +(http://documentation.renesas.com/eng/products/mpumcu/e602291_sh7760.pdf) + +The following code illustrates what needs to be done to +get the framebuffer working on a 640x480 TFT: + +====================== cut here ====================================== + +#include +#include + +/* + * NEC NL6440bc26-01 640x480 TFT + * dotclock 25175 kHz + * Xres 640 Yres 480 + * Htotal 800 Vtotal 525 + * HsynStart 656 VsynStart 490 + * HsynLenn 30 VsynLenn 2 + * + * The linux framebuffer layer does not use the syncstart/synclen + * values but right/left/upper/lower margin values. The comments + * for the x_margin explain how to calculate those from given + * panel sync timings. + */ +static struct fb_videomode nl6448bc26 = { + .name = "NL6448BC26", + .refresh = 60, + .xres = 640, + .yres = 480, + .pixclock = 39683, /* in picoseconds! */ + .hsync_len = 30, + .vsync_len = 2, + .left_margin = 114, /* HTOT - (HSYNSLEN + HSYNSTART) */ + .right_margin = 16, /* HSYNSTART - XRES */ + .upper_margin = 33, /* VTOT - (VSYNLEN + VSYNSTART) */ + .lower_margin = 10, /* VSYNSTART - YRES */ + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + .vmode = FB_VMODE_NONINTERLACED, + .flag = 0, +}; + +static struct sh7760fb_platdata sh7760fb_nl6448 = { + .def_mode = &nl6448bc26, + .ldmtr = LDMTR_TFT_COLOR_16, /* 16bit TFT panel */ + .lddfr = LDDFR_8BPP, /* we want 8bit output */ + .ldpmmr = 0x0070, + .ldpspr = 0x0500, + .ldaclnr = 0, + .ldickr = LDICKR_CLKSRC(LCDC_CLKSRC_EXTERNAL) | + LDICKR_CLKDIV(1), + .rotate = 0, + .novsync = 1, + .blank = NULL, +}; + +/* SH7760: + * 0xFE300800: 256 * 4byte xRGB palette ram + * 0xFE300C00: 42 bytes ctrl registers + */ +static struct resource sh7760_lcdc_res[] = { + [0] = { + .start = 0xFE300800, + .end = 0xFE300CFF, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = 65, + .end = 65, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device sh7760_lcdc_dev = { + .dev = { + .platform_data = &sh7760fb_nl6448, + }, + .name = "sh7760-lcdc", + .id = -1, + .resource = sh7760_lcdc_res, + .num_resources = ARRAY_SIZE(sh7760_lcdc_res), +}; + +====================== cut here ====================================== diff --git a/trunk/Documentation/fb/tridentfb.txt b/trunk/Documentation/fb/tridentfb.txt index 8a6c8a43e6a3..45d9de5b13a3 100644 --- a/trunk/Documentation/fb/tridentfb.txt +++ b/trunk/Documentation/fb/tridentfb.txt @@ -3,11 +3,25 @@ Tridentfb is a framebuffer driver for some Trident chip based cards. The following list of chips is thought to be supported although not all are tested: -those from the Image series with Cyber in their names - accelerated -those with Blade in their names (Blade3D,CyberBlade...) - accelerated -the newer CyberBladeXP family - nonaccelerated - -Only PCI/AGP based cards are supported, none of the older Tridents. +those from the TGUI series 9440/96XX and with Cyber in their names +those from the Image series and with Cyber in their names +those with Blade in their names (Blade3D,CyberBlade...) +the newer CyberBladeXP family + +All families are accelerated. Only PCI/AGP based cards are supported, +none of the older Tridents. +The driver supports 8, 16 and 32 bits per pixel depths. +The TGUI family requires a line length to be power of 2 if acceleration +is enabled. This means that range of possible resolutions and bpp is +limited comparing to the range if acceleration is disabled (see list +of parameters below). + +Known bugs: +1. The driver randomly locks up on 3DImage975 chip with acceleration + enabled. The same happens in X11 (Xorg). +2. The ramdac speeds require some more fine tuning. It is possible to + switch resolution which the chip does not support at some depths for + older chips. How to use it? ============== @@ -17,12 +31,11 @@ video=tridentfb The parameters for tridentfb are concatenated with a ':' as in this example. -video=tridentfb:800x600,bpp=16,noaccel +video=tridentfb:800x600-16@75,noaccel The second level parameters that tridentfb understands are: noaccel - turns off acceleration (when it doesn't work for your card) -accel - force text acceleration (for boards which by default are noacceled) fp - use flat panel related stuff crt - assume monitor is present instead of fp @@ -31,21 +44,24 @@ center - for flat panels and resolutions smaller than native size center the image, otherwise use stretch -memsize - integer value in Kb, use if your card's memory size is misdetected. +memsize - integer value in KB, use if your card's memory size is misdetected. look at the driver output to see what it says when initializing. -memdiff - integer value in Kb,should be nonzero if your card reports - more memory than it actually has.For instance mine is 192K less than + +memdiff - integer value in KB, should be nonzero if your card reports + more memory than it actually has. For instance mine is 192K less than detection says in all three BIOS selectable situations 2M, 4M, 8M. Only use if your video memory is taken from main memory hence of - configurable size.Otherwise use memsize. - If in some modes which barely fit the memory you see garbage at the bottom - this might help by not letting change to that mode anymore. + configurable size. Otherwise use memsize. + If in some modes which barely fit the memory you see garbage + at the bottom this might help by not letting change to that mode + anymore. nativex - the width in pixels of the flat panel.If you know it (usually 1024 800 or 1280) and it is not what the driver seems to detect use it. -bpp - bits per pixel (8,16 or 32) -mode - a mode name like 800x600 (as described in Documentation/fb/modedb.txt) +bpp - bits per pixel (8,16 or 32) +mode - a mode name like 800x600-8@75 as described in + Documentation/fb/modedb.txt Using insane values for the above parameters will probably result in driver misbehaviour so take care(for instance memsize=12345678 or memdiff=23784 or diff --git a/trunk/Documentation/filesystems/Locking b/trunk/Documentation/filesystems/Locking index 8b22d7d8b991..680fb566b928 100644 --- a/trunk/Documentation/filesystems/Locking +++ b/trunk/Documentation/filesystems/Locking @@ -510,6 +510,7 @@ prototypes: void (*close)(struct vm_area_struct*); int (*fault)(struct vm_area_struct*, struct vm_fault *); int (*page_mkwrite)(struct vm_area_struct *, struct page *); + int (*access)(struct vm_area_struct *, unsigned long, void*, int, int); locking rules: BKL mmap_sem PageLocked(page) @@ -517,6 +518,7 @@ open: no yes close: no yes fault: no yes page_mkwrite: no yes no +access: no yes ->page_mkwrite() is called when a previously read-only page is about to become writeable. The file system is responsible for @@ -525,6 +527,11 @@ taking to lock out truncate, the page range should be verified to be within i_size. The page mapping should also be checked that it is not NULL. + ->access() is called when get_user_pages() fails in +acces_process_vm(), typically used to debug a process through +/proc/pid/mem or ptrace. This function is needed only for +VM_IO | VM_PFNMAP VMAs. + ================================================================================ Dubious stuff diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt index 7f268f327d75..8c6384bdfed4 100644 --- a/trunk/Documentation/filesystems/proc.txt +++ b/trunk/Documentation/filesystems/proc.txt @@ -296,6 +296,7 @@ Table 1-4: Kernel info in /proc uptime System uptime version Kernel version video bttv info of video resources (2.4) + vmallocinfo Show vmalloced areas .............................................................................. You can, for example, check which interrupts are currently in use and what @@ -557,6 +558,49 @@ VmallocTotal: total size of vmalloc memory area VmallocUsed: amount of vmalloc area which is used VmallocChunk: largest contigious block of vmalloc area which is free +.............................................................................. + +vmallocinfo: + +Provides information about vmalloced/vmaped areas. One line per area, +containing the virtual address range of the area, size in bytes, +caller information of the creator, and optional information depending +on the kind of area : + + pages=nr number of pages + phys=addr if a physical address was specified + ioremap I/O mapping (ioremap() and friends) + vmalloc vmalloc() area + vmap vmap()ed pages + user VM_USERMAP area + vpages buffer for pages pointers was vmalloced (huge area) + N=nr (Only on NUMA kernels) + Number of pages allocated on memory node + +> cat /proc/vmallocinfo +0xffffc20000000000-0xffffc20000201000 2101248 alloc_large_system_hash+0x204 ... + /0x2c0 pages=512 vmalloc N0=128 N1=128 N2=128 N3=128 +0xffffc20000201000-0xffffc20000302000 1052672 alloc_large_system_hash+0x204 ... + /0x2c0 pages=256 vmalloc N0=64 N1=64 N2=64 N3=64 +0xffffc20000302000-0xffffc20000304000 8192 acpi_tb_verify_table+0x21/0x4f... + phys=7fee8000 ioremap +0xffffc20000304000-0xffffc20000307000 12288 acpi_tb_verify_table+0x21/0x4f... + phys=7fee7000 ioremap +0xffffc2000031d000-0xffffc2000031f000 8192 init_vdso_vars+0x112/0x210 +0xffffc2000031f000-0xffffc2000032b000 49152 cramfs_uncompress_init+0x2e ... + /0x80 pages=11 vmalloc N0=3 N1=3 N2=2 N3=3 +0xffffc2000033a000-0xffffc2000033d000 12288 sys_swapon+0x640/0xac0 ... + pages=2 vmalloc N1=2 +0xffffc20000347000-0xffffc2000034c000 20480 xt_alloc_table_info+0xfe ... + /0x130 [x_tables] pages=4 vmalloc N0=4 +0xffffffffa0000000-0xffffffffa000f000 61440 sys_init_module+0xc27/0x1d00 ... + pages=14 vmalloc N2=14 +0xffffffffa000f000-0xffffffffa0014000 20480 sys_init_module+0xc27/0x1d00 ... + pages=4 vmalloc N1=4 +0xffffffffa0014000-0xffffffffa0017000 12288 sys_init_module+0xc27/0x1d00 ... + pages=2 vmalloc N1=2 +0xffffffffa0017000-0xffffffffa0022000 45056 sys_init_module+0xc27/0x1d00 ... + pages=10 vmalloc N0=10 1.3 IDE devices in /proc/ide ---------------------------- diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 30d44b78171a..497a98dafdaa 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -87,7 +87,8 @@ parameter is applicable: SH SuperH architecture is enabled. SMP The kernel is an SMP kernel. SPARC Sparc architecture is enabled. - SWSUSP Software suspend is enabled. + SWSUSP Software suspend (hibernation) is enabled. + SUSPEND System suspend states are enabled. TS Appropriate touchscreen support is enabled. USB USB support is enabled. USBHID USB Human Interface Device support is enabled. @@ -147,10 +148,12 @@ and is between 256 and 4096 characters. It is defined in the file default: 0 acpi_sleep= [HW,ACPI] Sleep options - Format: { s3_bios, s3_mode, s3_beep, old_ordering } + Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, old_ordering } See Documentation/power/video.txt for s3_bios and s3_mode. s3_beep is for debugging; it makes the PC's speaker beep as soon as the kernel's real-mode entry point is called. + s4_nohwsig prevents ACPI hardware signature from being + used during resume from hibernation. old_ordering causes the ACPI 1.0 ordering of the _PTS control method, wrt putting devices into low power states, to be enforced (the ACPI 2.0 ordering of _PTS is @@ -774,8 +777,22 @@ and is between 256 and 4096 characters. It is defined in the file hisax= [HW,ISDN] See Documentation/isdn/README.HiSax. - hugepages= [HW,X86-32,IA-64] Maximal number of HugeTLB pages. - hugepagesz= [HW,IA-64,PPC] The size of the HugeTLB pages. + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. + hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. + On x86-64 and powerpc, this option can be specified + multiple times interleaved with hugepages= to reserve + huge pages of different sizes. Valid pages sizes on + x86-64 are 2M (when the CPU supports "pse") and 1G + (when the CPU supports the "pdpe1gb" cpuinfo flag) + Note that 1GB pages can only be allocated at boot time + using hugepages= and not freed afterwards. + default_hugepagesz= + [same as hugepagesz=] The size of the default + HugeTLB page size. This is the size represented by + the legacy /proc/ hugepages APIs, used for SHM, and + default size when mounting hugetlbfs filesystems. + Defaults to the default architecture's huge page size + if not specified. i8042.direct [HW] Put keyboard port into non-translated mode i8042.dumbkbd [HW] Pretend that controller can only read data from @@ -1225,6 +1242,14 @@ and is between 256 and 4096 characters. It is defined in the file mga= [HW,DRM] + mminit_loglevel= + [KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this + parameter allows control of the logging verbosity for + the additional memory initialisation checks. A value + of 0 disables mminit logging and a level of 4 will + log everything. Information is printed at KERN_DEBUG + so loglevel=8 may also need to be specified. + mousedev.tap_time= [MOUSE] Maximum time between finger touching and leaving touchpad surface for touch to be considered @@ -2034,6 +2059,9 @@ and is between 256 and 4096 characters. It is defined in the file snd-ymfpci= [HW,ALSA] + softlockup_panic= + [KNL] Should the soft-lockup detector generate panics. + sonypi.*= [HW] Sony Programmable I/O Control Device driver See Documentation/sonypi.txt @@ -2098,6 +2126,12 @@ and is between 256 and 4096 characters. It is defined in the file tdfx= [HW,DRM] + test_suspend= [SUSPEND] + Specify "mem" (for Suspend-to-RAM) or "standby" (for + standby suspend) as the system sleep state to briefly + enter during system startup. The system is woken from + this state using a wakeup-capable RTC alarm. + thash_entries= [KNL,NET] Set number of hash buckets for TCP connection diff --git a/trunk/Documentation/power/00-INDEX b/trunk/Documentation/power/00-INDEX index a55d7f1c836d..fb742c213c9e 100644 --- a/trunk/Documentation/power/00-INDEX +++ b/trunk/Documentation/power/00-INDEX @@ -1,5 +1,7 @@ 00-INDEX - This file +apm-acpi.txt + - basic info about the APM and ACPI support. basic-pm-debugging.txt - Debugging suspend and resume devices.txt @@ -14,8 +16,6 @@ notifiers.txt - Registering suspend notifiers in device drivers pci.txt - How the PCI Subsystem Does Power Management -pm.txt - - info on Linux power management support. pm_qos_interface.txt - info on Linux PM Quality of Service interface power_supply_class.txt diff --git a/trunk/Documentation/power/apm-acpi.txt b/trunk/Documentation/power/apm-acpi.txt new file mode 100644 index 000000000000..1bd799dc17e8 --- /dev/null +++ b/trunk/Documentation/power/apm-acpi.txt @@ -0,0 +1,32 @@ +APM or ACPI? +------------ +If you have a relatively recent x86 mobile, desktop, or server system, +odds are it supports either Advanced Power Management (APM) or +Advanced Configuration and Power Interface (ACPI). ACPI is the newer +of the two technologies and puts power management in the hands of the +operating system, allowing for more intelligent power management than +is possible with BIOS controlled APM. + +The best way to determine which, if either, your system supports is to +build a kernel with both ACPI and APM enabled (as of 2.3.x ACPI is +enabled by default). If a working ACPI implementation is found, the +ACPI driver will override and disable APM, otherwise the APM driver +will be used. + +No, sorry, you cannot have both ACPI and APM enabled and running at +once. Some people with broken ACPI or broken APM implementations +would like to use both to get a full set of working features, but you +simply cannot mix and match the two. Only one power management +interface can be in control of the machine at once. Think about it.. + +User-space Daemons +------------------ +Both APM and ACPI rely on user-space daemons, apmd and acpid +respectively, to be completely functional. Obtain both of these +daemons from your Linux distribution or from the Internet (see below) +and be sure that they are started sometime in the system boot process. +Go ahead and start both. If ACPI or APM is not available on your +system the associated daemon will exit gracefully. + + apmd: http://worldvisions.ca/~apenwarr/apmd/ + acpid: http://acpid.sf.net/ diff --git a/trunk/Documentation/power/pm.txt b/trunk/Documentation/power/pm.txt deleted file mode 100644 index be841507e43f..000000000000 --- a/trunk/Documentation/power/pm.txt +++ /dev/null @@ -1,257 +0,0 @@ - Linux Power Management Support - -This document briefly describes how to use power management with your -Linux system and how to add power management support to Linux drivers. - -APM or ACPI? ------------- -If you have a relatively recent x86 mobile, desktop, or server system, -odds are it supports either Advanced Power Management (APM) or -Advanced Configuration and Power Interface (ACPI). ACPI is the newer -of the two technologies and puts power management in the hands of the -operating system, allowing for more intelligent power management than -is possible with BIOS controlled APM. - -The best way to determine which, if either, your system supports is to -build a kernel with both ACPI and APM enabled (as of 2.3.x ACPI is -enabled by default). If a working ACPI implementation is found, the -ACPI driver will override and disable APM, otherwise the APM driver -will be used. - -No, sorry, you cannot have both ACPI and APM enabled and running at -once. Some people with broken ACPI or broken APM implementations -would like to use both to get a full set of working features, but you -simply cannot mix and match the two. Only one power management -interface can be in control of the machine at once. Think about it.. - -User-space Daemons ------------------- -Both APM and ACPI rely on user-space daemons, apmd and acpid -respectively, to be completely functional. Obtain both of these -daemons from your Linux distribution or from the Internet (see below) -and be sure that they are started sometime in the system boot process. -Go ahead and start both. If ACPI or APM is not available on your -system the associated daemon will exit gracefully. - - apmd: http://worldvisions.ca/~apenwarr/apmd/ - acpid: http://acpid.sf.net/ - -Driver Interface -- OBSOLETE, DO NOT USE! -----------------************************* - -Note: pm_register(), pm_access(), pm_dev_idle() and friends are -obsolete. Please do not use them. Instead you should properly hook -your driver into the driver model, and use its suspend()/resume() -callbacks to do this kind of stuff. - -If you are writing a new driver or maintaining an old driver, it -should include power management support. Without power management -support, a single driver may prevent a system with power management -capabilities from ever being able to suspend (safely). - -Overview: -1) Register each instance of a device with "pm_register" -2) Call "pm_access" before accessing the hardware. - (this will ensure that the hardware is awake and ready) -3) Your "pm_callback" is called before going into a - suspend state (ACPI D1-D3) or after resuming (ACPI D0) - from a suspend. -4) Call "pm_dev_idle" when the device is not being used - (optional but will improve device idle detection) -5) When unloaded, unregister the device with "pm_unregister" - -/* - * Description: Register a device with the power-management subsystem - * - * Parameters: - * type - device type (PCI device, system device, ...) - * id - instance number or unique identifier - * cback - request handler callback (suspend, resume, ...) - * - * Returns: Registered PM device or NULL on error - * - * Examples: - * dev = pm_register(PM_SYS_DEV, PM_SYS_VGA, vga_callback); - * - * struct pci_dev *pci_dev = pci_find_dev(...); - * dev = pm_register(PM_PCI_DEV, PM_PCI_ID(pci_dev), callback); - */ -struct pm_dev *pm_register(pm_dev_t type, unsigned long id, pm_callback cback); - -/* - * Description: Unregister a device with the power management subsystem - * - * Parameters: - * dev - PM device previously returned from pm_register - */ -void pm_unregister(struct pm_dev *dev); - -/* - * Description: Unregister all devices with a matching callback function - * - * Parameters: - * cback - previously registered request callback - * - * Notes: Provided for easier porting from old APM interface - */ -void pm_unregister_all(pm_callback cback); - -/* - * Power management request callback - * - * Parameters: - * dev - PM device previously returned from pm_register - * rqst - request type - * data - data, if any, associated with the request - * - * Returns: 0 if the request is successful - * EINVAL if the request is not supported - * EBUSY if the device is now busy and cannot handle the request - * ENOMEM if the device was unable to handle the request due to memory - * - * Details: The device request callback will be called before the - * device/system enters a suspend state (ACPI D1-D3) or - * or after the device/system resumes from suspend (ACPI D0). - * For PM_SUSPEND, the ACPI D-state being entered is passed - * as the "data" argument to the callback. The device - * driver should save (PM_SUSPEND) or restore (PM_RESUME) - * device context when the request callback is called. - * - * Once a driver returns 0 (success) from a suspend - * request, it should not process any further requests or - * access the device hardware until a call to "pm_access" is made. - */ -typedef int (*pm_callback)(struct pm_dev *dev, pm_request_t rqst, void *data); - -Driver Details --------------- -This is just a quick Q&A as a stopgap until a real driver writers' -power management guide is available. - -Q: When is a device suspended? - -Devices can be suspended based on direct user request (eg. laptop lid -closes), system power policy (eg. sleep after 30 minutes of console -inactivity), or device power policy (eg. power down device after 5 -minutes of inactivity) - -Q: Must a driver honor a suspend request? - -No, a driver can return -EBUSY from a suspend request and this -will stop the system from suspending. When a suspend request -fails, all suspended devices are resumed and the system continues -to run. Suspend can be retried at a later time. - -Q: Can the driver block suspend/resume requests? - -Yes, a driver can delay its return from a suspend or resume -request until the device is ready to handle requests. It -is advantageous to return as quickly as possible from a -request as suspend/resume are done serially. - -Q: What context is a suspend/resume initiated from? - -A suspend or resume is initiated from a kernel thread context. -It is safe to block, allocate memory, initiate requests -or anything else you can do within the kernel. - -Q: Will requests continue to arrive after a suspend? - -Possibly. It is the driver's responsibility to queue(*), -fail, or drop any requests that arrive after returning -success to a suspend request. It is important that the -driver not access its device until after it receives -a resume request as the device's bus may no longer -be active. - -(*) If a driver queues requests for processing after - resume be aware that the device, network, etc. - might be in a different state than at suspend time. - It's probably better to drop requests unless - the driver is a storage device. - -Q: Do I have to manage bus-specific power management registers - -No. It is the responsibility of the bus driver to manage -PCI, USB, etc. power management registers. The bus driver -or the power management subsystem will also enable any -wake-on functionality that the device has. - -Q: So, really, what do I need to do to support suspend/resume? - -You need to save any device context that would -be lost if the device was powered off and then restore -it at resume time. When ACPI is active, there are -three levels of device suspend states; D1, D2, and D3. -(The suspend state is passed as the "data" argument -to the device callback.) With D3, the device is powered -off and loses all context, D1 and D2 are shallower power -states and require less device context to be saved. To -play it safe, just save everything at suspend and restore -everything at resume. - -Q: Where do I store device context for suspend? - -Anywhere in memory, kmalloc a buffer or store it -in the device descriptor. You are guaranteed that the -contents of memory will be restored and accessible -before resume, even when the system suspends to disk. - -Q: What do I need to do for ACPI vs. APM vs. etc? - -Drivers need not be aware of the specific power management -technology that is active. They just need to be aware -of when the overlying power management system requests -that they suspend or resume. - -Q: What about device dependencies? - -When a driver registers a device, the power management -subsystem uses the information provided to build a -tree of device dependencies (eg. USB device X is on -USB controller Y which is on PCI bus Z) When power -management wants to suspend a device, it first sends -a suspend request to its driver, then the bus driver, -and so on up to the system bus. Device resumes -proceed in the opposite direction. - -Q: Who do I contact for additional information about - enabling power management for my specific driver/device? - -ACPI Development mailing list: linux-acpi@vger.kernel.org - -System Interface -- OBSOLETE, DO NOT USE! -----------------************************* -If you are providing new power management support to Linux (ie. -adding support for something like APM or ACPI), you should -communicate with drivers through the existing generic power -management interface. - -/* - * Send a request to all devices - * - * Parameters: - * rqst - request type - * data - data, if any, associated with the request - * - * Returns: 0 if the request is successful - * See "pm_callback" return for errors - * - * Details: Walk list of registered devices and call pm_send - * for each until complete or an error is encountered. - * If an error is encountered for a suspend request, - * return all devices to the state they were in before - * the suspend request. - */ -int pm_send_all(pm_request_t rqst, void *data); - -/* - * Find a matching device - * - * Parameters: - * type - device type (PCI device, system device, or 0 to match all devices) - * from - previous match or NULL to start from the beginning - * - * Returns: Matching device or NULL if none found - */ -struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from); diff --git a/trunk/Documentation/vm/hugetlbpage.txt b/trunk/Documentation/vm/hugetlbpage.txt index 3102b81bef88..8a5b5763f0fe 100644 --- a/trunk/Documentation/vm/hugetlbpage.txt +++ b/trunk/Documentation/vm/hugetlbpage.txt @@ -95,6 +95,29 @@ this condition holds, however, no more surplus huge pages will be allowed on the system until one of the two sysctls are increased sufficiently, or the surplus huge pages go out of use and are freed. +With support for multiple hugepage pools at run-time available, much of +the hugepage userspace interface has been duplicated in sysfs. The above +information applies to the default hugepage size (which will be +controlled by the proc interfaces for backwards compatibility). The root +hugepage control directory is + + /sys/kernel/mm/hugepages + +For each hugepage size supported by the running kernel, a subdirectory +will exist, of the form + + hugepages-${size}kB + +Inside each of these directories, the same set of files will exist: + + nr_hugepages + nr_overcommit_hugepages + free_hugepages + resv_hugepages + surplus_hugepages + +which function as described above for the default hugepage-sized case. + If the user applications are going to request hugepages using mmap system call, then it is required that system administrator mount a file system of type hugetlbfs: diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 0652ab384d51..5ecb97e13e59 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -441,10 +441,7 @@ M: spyro@f2s.com S: Maintained ARM PRIMECELL MMCI PL180/1 DRIVER -P: Russell King -M: rmk@arm.linux.org.uk -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) -S: Maintained +S: Orphan ARM/ADI ROADRUNNER MACHINE SUPPORT P: Lennert Buytenhek @@ -483,11 +480,28 @@ M: kernel@wantstofly.org L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT +P: Mike Rapoport +M: mike@compulab.co.il +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +S: Maintained + ARM/CORGI MACHINE SUPPORT P: Richard Purdie M: rpurdie@rpsys.net S: Maintained +ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) +P: Daniel Ribeiro +M: drwyrm@gmail.com +P: Stefan Schmidt +M: stefan@openezx.org +P: Harald Welte +M: laforge@openezx.org +L: openezx-devel@lists.openezx.org (subscribers-only) +W: http://www.openezx.org/ +S: Maintained + ARM/GLOMATION GESBC9312SX MACHINE SUPPORT P: Lennert Buytenhek M: kernel@wantstofly.org @@ -575,10 +589,18 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained ARM/TOSA MACHINE SUPPORT +P: Dmitry Baryshkov +M: dbaryshkov@gmail.com P: Dirk Opfer M: dirk@opfer-online.de S: Maintained +ARM/PALMTX SUPPORT +P: Marek Vasut +M: marek.vasut@gmail.com +W: http://hackndev.com +S: Maintained + ARM/PLEB SUPPORT P: Peter Chubb M: pleb@gelato.unsw.edu.au @@ -1962,7 +1984,7 @@ P: Carlos Corbacho M: carlos@strangeworlds.co.uk S: Odd Fixes -HPET: High Precision Event Timers driver (hpet.c) +HPET: High Precision Event Timers driver (drivers/char/hpet.c) P: Clemens Ladisch M: clemens@ladisch.de S: Maintained @@ -4058,12 +4080,6 @@ W: http://www.prosec.rub.de/tpm/ L: tpmdd-devel@lists.sourceforge.net S: Maintained -TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE -P: Muli Ben-Yehuda -M: mulix@mulix.org -L: linux-kernel@vger.kernel.org -S: Maintained - TRIVIAL PATCHES P: Jesper Juhl M: trivial@kernel.org @@ -4109,9 +4125,6 @@ W: http://www.uclinux.org/ L: uclinux-dev@uclinux.org (subscribers-only) S: Maintained -UCLINUX FOR NEC V850 -P: Miles Bader - UCLINUX FOR RENESAS H8/300 P: Yoshinori Sato M: ysato@users.sourceforge.jp diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index ad89a33d8c6e..6093c0be58b0 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -31,6 +31,9 @@ config KRETPROBES def_bool y depends on KPROBES && HAVE_KRETPROBES +config HAVE_IOREMAP_PROT + def_bool n + config HAVE_KPROBES def_bool n @@ -42,3 +45,10 @@ config HAVE_DMA_ATTRS config USE_GENERIC_SMP_HELPERS def_bool n + +config HAVE_CLK + def_bool n + help + The calls support software clock gating and + thus are a key power management tool on many systems. + diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index dbe8c280fea9..1bec55d63ef6 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -333,11 +333,6 @@ config PCI_SYSCALL config IOMMU_HELPER def_bool PCI -config ALPHA_CORE_AGP - bool - depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL - default y - config ALPHA_NONAME bool depends on ALPHA_BOOK1 || ALPHA_NONAME_CH diff --git a/trunk/arch/alpha/mm/numa.c b/trunk/arch/alpha/mm/numa.c index 10ab7833e83c..d8c4ceaf00b9 100644 --- a/trunk/arch/alpha/mm/numa.c +++ b/trunk/arch/alpha/mm/numa.c @@ -19,7 +19,6 @@ #include pg_data_t node_data[MAX_NUMNODES]; -bootmem_data_t node_bdata[MAX_NUMNODES]; EXPORT_SYMBOL(node_data); #undef DEBUG_DISCONTIG @@ -141,7 +140,7 @@ setup_memory_node(int nid, void *kernel_end) printk(" not enough mem to reserve NODE_DATA"); return; } - NODE_DATA(nid)->bdata = &node_bdata[nid]; + NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; printk(" Detected node memory: start %8lu, end %8lu\n", node_min_pfn, node_max_pfn); @@ -304,8 +303,9 @@ void __init paging_init(void) dma_local_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; for_each_online_node(nid) { - unsigned long start_pfn = node_bdata[nid].node_boot_start >> PAGE_SHIFT; - unsigned long end_pfn = node_bdata[nid].node_low_pfn; + bootmem_data_t *bdata = &bootmem_node_data[nid]; + unsigned long start_pfn = bdata->node_min_pfn; + unsigned long end_pfn = bdata->node_low_pfn; if (dma_local_pfn >= end_pfn - start_pfn) zones_size[ZONE_DMA] = end_pfn - start_pfn; @@ -313,7 +313,7 @@ void __init paging_init(void) zones_size[ZONE_DMA] = dma_local_pfn; zones_size[ZONE_NORMAL] = (end_pfn - start_pfn) - dma_local_pfn; } - free_area_init_node(nid, NODE_DATA(nid), zones_size, start_pfn, NULL); + free_area_init_node(nid, zones_size, start_pfn, NULL); } /* Initialize the kernel's ZERO_PGE. */ diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index c7ad324ddf2c..6fb4f03369f2 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -12,6 +12,7 @@ config ARM select RTC_LIB select SYS_SUPPORTS_APM_EMULATION select HAVE_OPROFILE + select HAVE_ARCH_KGDB select HAVE_KPROBES if (!XIP_KERNEL) select HAVE_KRETPROBES if (HAVE_KPROBES) select HAVE_FTRACE if (!XIP_KERNEL) @@ -197,12 +198,14 @@ choice config ARCH_AAEC2000 bool "Agilent AAEC-2000 based" select ARM_AMBA + select HAVE_CLK help This enables support for systems based on the Agilent AAEC-2000 config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" select ARM_AMBA + select HAVE_CLK select ICST525 help Support for ARM's Integrator platform. @@ -210,6 +213,7 @@ config ARCH_INTEGRATOR config ARCH_REALVIEW bool "ARM Ltd. RealView family" select ARM_AMBA + select HAVE_CLK select ICST307 select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -220,6 +224,7 @@ config ARCH_VERSATILE bool "ARM Ltd. Versatile family" select ARM_AMBA select ARM_VIC + select HAVE_CLK select ICST307 select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -261,6 +266,8 @@ config ARCH_EP93XX select ARM_AMBA select ARM_VIC select GENERIC_GPIO + select HAVE_CLK + select HAVE_CLK select HAVE_GPIO_LIB help This enables support for the Cirrus EP93xx series of CPUs. @@ -380,6 +387,7 @@ config ARCH_NS9XXX select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS + select HAVE_CLK help Say Y here if you intend to run this kernel on a NetSilicon NS9xxx System. @@ -429,6 +437,7 @@ config ARCH_ORION5X config ARCH_PNX4008 bool "Philips Nexperia PNX4008 Mobile" + select HAVE_CLK help This enables support for Philips PNX4008 mobile platform. @@ -437,6 +446,7 @@ config ARCH_PXA depends on MMU select ARCH_MTD_XIP select GENERIC_GPIO + select HAVE_CLK select HAVE_GPIO_LIB select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -467,6 +477,7 @@ config ARCH_SA1100 select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS + select HAVE_CLK select TICK_ONESHOT select HAVE_GPIO_LIB help @@ -475,6 +486,7 @@ config ARCH_SA1100 config ARCH_S3C2410 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" select GENERIC_GPIO + select HAVE_CLK help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or @@ -502,12 +514,14 @@ config ARCH_DAVINCI select GENERIC_TIME select GENERIC_CLOCKEVENTS select GENERIC_GPIO + select HAVE_CLK help Support for TI's DaVinci platform. config ARCH_OMAP bool "TI OMAP" select GENERIC_GPIO + select HAVE_CLK select HAVE_GPIO_LIB select GENERIC_TIME select GENERIC_CLOCKEVENTS diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c index c8e8f0ea59e1..0a8e1ff2af8a 100644 --- a/trunk/arch/arm/common/sa1111.c +++ b/trunk/arch/arm/common/sa1111.c @@ -627,7 +627,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) if (!sachip) return -ENOMEM; - sachip->clk = clk_get(me, "GPIO27_CLK"); + sachip->clk = clk_get(me, "SA1111_CLK"); if (!sachip->clk) { ret = PTR_ERR(sachip->clk); goto err_free; diff --git a/trunk/arch/arm/configs/ezx_defconfig b/trunk/arch/arm/configs/ezx_defconfig new file mode 100644 index 000000000000..2a84d557adc2 --- /dev/null +++ b/trunk/arch/arm/configs/ezx_defconfig @@ -0,0 +1,1614 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.26-rc3 +# Mon Jul 7 17:52:21 2008 +# +CONFIG_ARM=y +CONFIG_HAVE_PWM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +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_ARCH_SUPPORTS_AOUT=y +CONFIG_ZONE_DMA=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="-ezxdev" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +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_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +# CONFIG_COMPAT_BRK is not set +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=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_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +# CONFIG_HAVE_DMA_ATTRS is not set +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# 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 is not set +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_CLASSIC_RCU=y + +# +# 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 is not set +# 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_ORION5X is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# 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 +# CONFIG_ARCH_MSM7X00A is not set + +# +# Intel PXA2xx/PXA3xx Implementations +# +# CONFIG_ARCH_GUMSTIX is not set +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_PXA_SHARPSL is not set +# CONFIG_ARCH_PXA_ESERIES is not set +# CONFIG_MACH_TRIZEPS4 is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_COLIBRI is not set +# CONFIG_MACH_ZYLONITE is not set +# CONFIG_MACH_LITTLETON is not set +# CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_PCM027 is not set +CONFIG_PXA_EZX=y +CONFIG_MACH_EZX_A780=y +CONFIG_MACH_EZX_E680=y +CONFIG_MACH_EZX_A1200=y +CONFIG_MACH_EZX_A910=y +CONFIG_MACH_EZX_E6=y +CONFIG_MACH_EZX_E2=y +CONFIG_PXA27x=y +CONFIG_PXA_SSP=y +CONFIG_PXA_PWM=y + +# +# Boot options +# + +# +# Power management +# + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_PABRT_NOIFAR=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_PREEMPT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=tty1 root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug" +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=m + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_APM_EMULATION=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=m +# 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_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CT_PROTO_DCCP is not set +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=m +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_SCHED is not set +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +CONFIG_BT=y +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +# CONFIG_BT_HCIUSB is not set +# CONFIG_BT_HCIBTUSB is not set +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_H4=y +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIUART_LL is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_NONE is not set + +# +# Selecting 'y' for an algorithm will +# + +# +# build the algorithm into mac80211. +# +CONFIG_MAC80211_RC_DEFAULT="pid" +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +CONFIG_MTD_MAP_BANK_WIDTH_2=y +# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +# CONFIG_MTD_CFI_I2 is not set +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +CONFIG_MTD_XIP=y + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=0x0 +CONFIG_MTD_PHYSMAP_LEN=0x0 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_PXA2XX is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set +# CONFIG_SCSI_DMA is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_ATA is not set +# CONFIG_MD is not set +CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_NET_ETHERNET is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set +# CONFIG_IWLWIFI_LEDS is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set +# CONFIG_INPUT_APMPOWER is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_KEYBOARD_PXA27x=y +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +CONFIG_TOUCHSCREEN_PCAP=y +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +CONFIG_INPUT_UINPUT=y + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=8 +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set +# CONFIG_I2C_PCA_PLATFORM is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_PCF8575 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_TPS65010 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_PXA2XX=m + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_HAVE_GPIO_LIB=y + +# +# GPIO Support +# + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_WATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TC6393XB is not set +CONFIG_EZX_PCAP=y + +# +# Multimedia devices +# + +# +# Multimedia core support +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_ALLOW_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_MEDIA=m + +# +# Multimedia drivers +# +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER=m +# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L1=m +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_V4L_USB_DRIVERS is not set +# CONFIG_SOC_CAMERA is not set +# CONFIG_VIDEO_PXA27x is not set +CONFIG_RADIO_ADAPTERS=y +# CONFIG_USB_DSBR is not set +# CONFIG_USB_SI470X is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_UVESA is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_SMARTPANEL is not set +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set +# CONFIG_FB_AM200EPD is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_PWM=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_PXA2XX_AC97 is not set + +# +# SPI devices +# + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set + +# +# System on Chip audio support +# +CONFIG_SND_SOC=y +CONFIG_SND_PXA2XX_SOC=y + +# +# ALSA SoC audio for Freescale SOCs +# + +# +# SoC Audio for the Texas Instruments OMAP +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MON is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_M66592 is not set +CONFIG_USB_GADGET_PXA27X=y +CONFIG_USB_PXA27X=y +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=y + +# +# MMC/SD Host Controller Drivers +# +CONFIG_MMC_PXA=y +# CONFIG_MMC_SPI is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_GPIO is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_S35390A is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_SA1100=m +# CONFIG_UIO is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_OCFS2_FS is not set +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=m +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V4 is not set +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +# CONFIG_NFSD_V4 is not set +# CONFIG_ROOT_NFS is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_FRAME_POINTER=y +# CONFIG_SAMPLES is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +# CONFIG_CRYPTO_CAMELLIA is not set +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_SALSA20 is not set +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_HW=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +# CONFIG_GENERIC_FIND_FIRST_BIT is not set +# CONFIG_GENERIC_FIND_NEXT_BIT is not set +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/trunk/arch/arm/kernel/Makefile b/trunk/arch/arm/kernel/Makefile index eb9092ca8008..1d296fc8494e 100644 --- a/trunk/arch/arm/kernel/Makefile +++ b/trunk/arch/arm/kernel/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o kprobes-decode.o obj-$(CONFIG_ATAGS_PROC) += atags.o obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o obj-$(CONFIG_ARM_THUMBEE) += thumbee.o +obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_CRUNCH) += crunch.o crunch-bits.o AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312 diff --git a/trunk/arch/arm/kernel/kgdb.c b/trunk/arch/arm/kernel/kgdb.c new file mode 100644 index 000000000000..aaffaecffcd1 --- /dev/null +++ b/trunk/arch/arm/kernel/kgdb.c @@ -0,0 +1,201 @@ +/* + * arch/arm/kernel/kgdb.c + * + * ARM KGDB support + * + * Copyright (c) 2002-2004 MontaVista Software, Inc + * Copyright (c) 2008 Wind River Systems, Inc. + * + * Authors: George Davis + * Deepak Saxena + */ +#include +#include + +/* Make a local copy of the registers passed into the handler (bletch) */ +void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *kernel_regs) +{ + int regno; + + /* Initialize all to zero. */ + for (regno = 0; regno < GDB_MAX_REGS; regno++) + gdb_regs[regno] = 0; + + gdb_regs[_R0] = kernel_regs->ARM_r0; + gdb_regs[_R1] = kernel_regs->ARM_r1; + gdb_regs[_R2] = kernel_regs->ARM_r2; + gdb_regs[_R3] = kernel_regs->ARM_r3; + gdb_regs[_R4] = kernel_regs->ARM_r4; + gdb_regs[_R5] = kernel_regs->ARM_r5; + gdb_regs[_R6] = kernel_regs->ARM_r6; + gdb_regs[_R7] = kernel_regs->ARM_r7; + gdb_regs[_R8] = kernel_regs->ARM_r8; + gdb_regs[_R9] = kernel_regs->ARM_r9; + gdb_regs[_R10] = kernel_regs->ARM_r10; + gdb_regs[_FP] = kernel_regs->ARM_fp; + gdb_regs[_IP] = kernel_regs->ARM_ip; + gdb_regs[_SPT] = kernel_regs->ARM_sp; + gdb_regs[_LR] = kernel_regs->ARM_lr; + gdb_regs[_PC] = kernel_regs->ARM_pc; + gdb_regs[_CPSR] = kernel_regs->ARM_cpsr; +} + +/* Copy local gdb registers back to kgdb regs, for later copy to kernel */ +void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *kernel_regs) +{ + kernel_regs->ARM_r0 = gdb_regs[_R0]; + kernel_regs->ARM_r1 = gdb_regs[_R1]; + kernel_regs->ARM_r2 = gdb_regs[_R2]; + kernel_regs->ARM_r3 = gdb_regs[_R3]; + kernel_regs->ARM_r4 = gdb_regs[_R4]; + kernel_regs->ARM_r5 = gdb_regs[_R5]; + kernel_regs->ARM_r6 = gdb_regs[_R6]; + kernel_regs->ARM_r7 = gdb_regs[_R7]; + kernel_regs->ARM_r8 = gdb_regs[_R8]; + kernel_regs->ARM_r9 = gdb_regs[_R9]; + kernel_regs->ARM_r10 = gdb_regs[_R10]; + kernel_regs->ARM_fp = gdb_regs[_FP]; + kernel_regs->ARM_ip = gdb_regs[_IP]; + kernel_regs->ARM_sp = gdb_regs[_SPT]; + kernel_regs->ARM_lr = gdb_regs[_LR]; + kernel_regs->ARM_pc = gdb_regs[_PC]; + kernel_regs->ARM_cpsr = gdb_regs[_CPSR]; +} + +void +sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) +{ + struct pt_regs *thread_regs; + int regno; + + /* Just making sure... */ + if (task == NULL) + return; + + /* Initialize to zero */ + for (regno = 0; regno < GDB_MAX_REGS; regno++) + gdb_regs[regno] = 0; + + /* Otherwise, we have only some registers from switch_to() */ + thread_regs = task_pt_regs(task); + gdb_regs[_R0] = thread_regs->ARM_r0; + gdb_regs[_R1] = thread_regs->ARM_r1; + gdb_regs[_R2] = thread_regs->ARM_r2; + gdb_regs[_R3] = thread_regs->ARM_r3; + gdb_regs[_R4] = thread_regs->ARM_r4; + gdb_regs[_R5] = thread_regs->ARM_r5; + gdb_regs[_R6] = thread_regs->ARM_r6; + gdb_regs[_R7] = thread_regs->ARM_r7; + gdb_regs[_R8] = thread_regs->ARM_r8; + gdb_regs[_R9] = thread_regs->ARM_r9; + gdb_regs[_R10] = thread_regs->ARM_r10; + gdb_regs[_FP] = thread_regs->ARM_fp; + gdb_regs[_IP] = thread_regs->ARM_ip; + gdb_regs[_SPT] = thread_regs->ARM_sp; + gdb_regs[_LR] = thread_regs->ARM_lr; + gdb_regs[_PC] = thread_regs->ARM_pc; + gdb_regs[_CPSR] = thread_regs->ARM_cpsr; +} + +static int compiled_break; + +int kgdb_arch_handle_exception(int exception_vector, int signo, + int err_code, char *remcom_in_buffer, + char *remcom_out_buffer, + struct pt_regs *linux_regs) +{ + unsigned long addr; + char *ptr; + + switch (remcom_in_buffer[0]) { + case 'D': + case 'k': + case 'c': + kgdb_contthread = NULL; + + /* + * Try to read optional parameter, pc unchanged if no parm. + * If this was a compiled breakpoint, we need to move + * to the next instruction or we will just breakpoint + * over and over again. + */ + ptr = &remcom_in_buffer[1]; + if (kgdb_hex2long(&ptr, &addr)) + linux_regs->ARM_pc = addr; + else if (compiled_break == 1) + linux_regs->ARM_pc += 4; + + compiled_break = 0; + + return 0; + } + + return -1; +} + +static int kgdb_brk_fn(struct pt_regs *regs, unsigned int instr) +{ + kgdb_handle_exception(1, SIGTRAP, 0, regs); + + return 0; +} + +static int kgdb_compiled_brk_fn(struct pt_regs *regs, unsigned int instr) +{ + compiled_break = 1; + kgdb_handle_exception(1, SIGTRAP, 0, regs); + + return 0; +} + +static struct undef_hook kgdb_brkpt_hook = { + .instr_mask = 0xffffffff, + .instr_val = KGDB_BREAKINST, + .fn = kgdb_brk_fn +}; + +static struct undef_hook kgdb_compiled_brkpt_hook = { + .instr_mask = 0xffffffff, + .instr_val = KGDB_COMPILED_BREAK, + .fn = kgdb_compiled_brk_fn +}; + +/** + * kgdb_arch_init - Perform any architecture specific initalization. + * + * This function will handle the initalization of any architecture + * specific callbacks. + */ +int kgdb_arch_init(void) +{ + register_undef_hook(&kgdb_brkpt_hook); + register_undef_hook(&kgdb_compiled_brkpt_hook); + + return 0; +} + +/** + * kgdb_arch_exit - Perform any architecture specific uninitalization. + * + * This function will handle the uninitalization of any architecture + * specific callbacks, for dynamic registration and unregistration. + */ +void kgdb_arch_exit(void) +{ + unregister_undef_hook(&kgdb_brkpt_hook); + unregister_undef_hook(&kgdb_compiled_brkpt_hook); +} + +/* + * Register our undef instruction hooks with ARM undef core. + * We regsiter a hook specifically looking for the KGB break inst + * and we handle the normal undef case within the do_undefinstr + * handler. + */ +struct kgdb_arch arch_kgdb_ops = { +#ifndef __ARMEB__ + .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} +#else /* ! __ARMEB__ */ + .gdb_bpt_instr = {0xe7, 0xff, 0xde, 0xfe} +#endif +}; diff --git a/trunk/arch/arm/kernel/module.c b/trunk/arch/arm/kernel/module.c index 79b7e5cf5416..a68259a0cccd 100644 --- a/trunk/arch/arm/kernel/module.c +++ b/trunk/arch/arm/kernel/module.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c index b7b0720bc1bb..38f0e7940a13 100644 --- a/trunk/arch/arm/kernel/setup.c +++ b/trunk/arch/arm/kernel/setup.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "compat.h" #include "atags.h" @@ -853,6 +854,7 @@ void __init setup_arch(char **cmdline_p) conswitchp = &dummy_con; #endif #endif + early_trap_init(); } diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c index 5595fdd75e82..7277aef83098 100644 --- a/trunk/arch/arm/kernel/traps.c +++ b/trunk/arch/arm/kernel/traps.c @@ -707,6 +707,11 @@ void abort(void) EXPORT_SYMBOL(abort); void __init trap_init(void) +{ + return; +} + +void __init early_trap_init(void) { unsigned long vectors = CONFIG_VECTORS_BASE; extern char __stubs_start[], __stubs_end[]; diff --git a/trunk/arch/arm/mach-iop32x/n2100.c b/trunk/arch/arm/mach-iop32x/n2100.c index 2741063bf361..28f164ea4726 100644 --- a/trunk/arch/arm/mach-iop32x/n2100.c +++ b/trunk/arch/arm/mach-iop32x/n2100.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -206,6 +207,53 @@ static struct f75375s_platform_data n2100_f75375s = { .pwm_enable = { 0, 0 }, }; +static struct pca9532_platform_data n2100_leds = { + .leds = { + { .name = "n2100:red:satafail0", + .state = PCA9532_OFF, + .type = PCA9532_TYPE_LED, + }, + { .name = "n2100:red:satafail1", + .state = PCA9532_OFF, + .type = PCA9532_TYPE_LED, + }, + { .name = "n2100:blue:usb", + .state = PCA9532_OFF, + .type = PCA9532_TYPE_LED, + }, + { .type = PCA9532_TYPE_NONE }, + + { .type = PCA9532_TYPE_NONE }, + { .type = PCA9532_TYPE_NONE }, + { .type = PCA9532_TYPE_NONE }, + { .name = "n2100:red:usb", + .state = PCA9532_OFF, + .type = PCA9532_TYPE_LED, + }, + + { .type = PCA9532_TYPE_NONE }, /* power OFF gpio */ + { .type = PCA9532_TYPE_NONE }, /* reset gpio */ + { .type = PCA9532_TYPE_NONE }, + { .type = PCA9532_TYPE_NONE }, + + { .type = PCA9532_TYPE_NONE }, + { .name = "n2100:orange:system", + .state = PCA9532_OFF, + .type = PCA9532_TYPE_LED, + }, + { .name = "n2100:red:system", + .state = PCA9532_OFF, + .type = PCA9532_TYPE_LED, + }, + { .name = "N2100 beeper" , + .state = PCA9532_OFF, + .type = PCA9532_TYPE_N2100_BEEP, + }, + }, + .psc = { 0, 0 }, + .pwm = { 0, 0 }, +}; + static struct i2c_board_info __initdata n2100_i2c_devices[] = { { I2C_BOARD_INFO("rs5c372b", 0x32), @@ -214,6 +262,10 @@ static struct i2c_board_info __initdata n2100_i2c_devices[] = { I2C_BOARD_INFO("f75375", 0x2e), .platform_data = &n2100_f75375s, }, + { + I2C_BOARD_INFO("pca9532", 0x60), + .platform_data = &n2100_leds, + }, }; /* diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 914bb33dab92..e8ee7ec9ff6d 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -16,18 +16,24 @@ config CPU_PXA310 config CPU_PXA320 bool "PXA320 (codename Monahans-P)" +config CPU_PXA930 + bool "PXA930 (codename Tavor-P)" + endmenu endif -menu "Select target boards" - config ARCH_GUMSTIX bool "Gumstix XScale boards" help Say Y here if you intend to run this kernel on a Gumstix Full Function Minature Computer. +config MACH_GUMSTIX_F + bool "Basix, Connex, ws-200ax, ws-400ax systems" + depends on ARCH_GUMSTIX + select PXA25x + config ARCH_LUBBOCK bool "Intel DBPXA250 Development Platform" select PXA25x @@ -58,6 +64,57 @@ config PXA_SHARPSL SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) handheld computer. +config MACH_POODLE + bool "Enable Sharp SL-5600 (Poodle) Support" + depends on PXA_SHARPSL + select PXA25x + select SHARP_LOCOMO + select PXA_SSP + +config MACH_CORGI + bool "Enable Sharp SL-C700 (Corgi) Support" + depends on PXA_SHARPSL + select PXA25x + select PXA_SHARP_C7xx + +config MACH_SHEPHERD + bool "Enable Sharp SL-C750 (Shepherd) Support" + depends on PXA_SHARPSL + select PXA25x + select PXA_SHARP_C7xx + +config MACH_HUSKY + bool "Enable Sharp SL-C760 (Husky) Support" + depends on PXA_SHARPSL + select PXA25x + select PXA_SHARP_C7xx + +config MACH_AKITA + bool "Enable Sharp SL-1000 (Akita) Support" + depends on PXA_SHARPSL + select PXA27x + select PXA_SHARP_Cxx00 + select MACH_SPITZ + select I2C + select I2C_PXA + +config MACH_SPITZ + bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" + depends on PXA_SHARPSL + select PXA27x + select PXA_SHARP_Cxx00 + +config MACH_BORZOI + bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" + depends on PXA_SHARPSL + select PXA27x + select PXA_SHARP_Cxx00 + +config MACH_TOSA + bool "Enable Sharp SL-6000x (Tosa) Support" + depends on PXA_SHARPSL + select PXA25x + config ARCH_PXA_ESERIES bool "PXA based Toshiba e-series PDAs" select PXA25x @@ -70,10 +127,19 @@ config MACH_E330 Say Y here if you intend to run this kernel on a Toshiba e330 family PDA. +config MACH_E350 + bool "Toshiba e350" + default y + depends on ARCH_PXA_ESERIES + help + Say Y here if you intend to run this kernel on a Toshiba + e350 family PDA. + config MACH_E740 bool "Toshiba e740" default y depends on ARCH_PXA_ESERIES + select FB_W100 help Say Y here if you intend to run this kernel on a Toshiba e740 family PDA. @@ -82,6 +148,7 @@ config MACH_E750 bool "Toshiba e750" default y depends on ARCH_PXA_ESERIES + select FB_W100 help Say Y here if you intend to run this kernel on a Toshiba e750 family PDA. @@ -98,6 +165,7 @@ config MACH_E800 bool "Toshiba e800" default y depends on ARCH_PXA_ESERIES + select FB_W100 help Say Y here if you intend to run this kernel on a Toshiba e800 family PDA. @@ -106,6 +174,10 @@ config MACH_TRIZEPS4 bool "Keith und Koep Trizeps4 DIMM-Module" select PXA27x +config MACH_TRIZEPS4_CONXS + bool "ConXS Eval Board" + depends on MACH_TRIZEPS4 + config MACH_EM_X270 bool "CompuLab EM-x270 platform" select PXA27x @@ -115,7 +187,7 @@ config MACH_COLIBRI select PXA27x config MACH_ZYLONITE - bool "PXA3xx Development Platform" + bool "PXA3xx Development Platform (aka Zylonite)" select PXA3xx select HAVE_PWM @@ -124,6 +196,16 @@ config MACH_LITTLETON select PXA3xx select PXA_SSP +config MACH_TAVOREVB + bool "PXA930 Evaluation Board (aka TavorEVB)" + select PXA3xx + select PXA930 + +config MACH_SAAR + bool "PXA930 Handheld Platform (aka SAAR)" + select PXA3xx + select PXA930 + config MACH_ARMCORE bool "CompuLab CM-X270 modules" select PXA27x @@ -131,7 +213,6 @@ config MACH_ARMCORE config MACH_MAGICIAN bool "Enable HTC Magician Support" - depends on ARCH_PXA select PXA27x select IWMMXT @@ -139,18 +220,26 @@ config MACH_PCM027 bool "Phytec phyCORE-PXA270 CPU module (PCM-027)" select PXA27x select IWMMXT + select PXA_SSP -endmenu +config ARCH_PXA_PALM + bool "PXA based Palm PDAs" + select HAVE_PWM -choice - prompt "Used baseboard" - depends on MACH_PCM027 +config MACH_PALMTX + bool "Palm T|X" + default y + depends on ARCH_PXA_PALM + select PXA27x + select IWMMXT + help + Say Y here if you intend to run this kernel on a Palm T|X + handheld computer. config MACH_PCM990_BASEBOARD bool "PHYTEC PCM-990 development board" select HAVE_PWM - -endchoice + depends on MACH_PCM027 choice prompt "display on pcm990" @@ -167,88 +256,45 @@ config PCM990_DISPLAY_NONE endchoice -if ARCH_GUMSTIX - -choice - prompt "Select target Gumstix board" - -config MACH_GUMSTIX_F - bool "Basix, Connex, ws-200ax, ws-400ax systems" - select PXA25x - -endchoice - -endif +config PXA_EZX + bool "Motorola EZX Platform" + select PXA27x + select IWMMXT + select HAVE_PWM -if MACH_TRIZEPS4 +config MACH_EZX_A780 + bool "Motorola EZX A780" + default y + depends on PXA_EZX -choice - prompt "Select base board for Trizeps 4 module" +config MACH_EZX_E680 + bool "Motorola EZX E680" + default y + depends on PXA_EZX -config MACH_TRIZEPS4_CONXS - bool "ConXS Eval Board" +config MACH_EZX_A1200 + bool "Motorola EZX A1200" + default y + depends on PXA_EZX -config MACH_TRIZEPS4_ANY - bool "another Board" +config MACH_EZX_A910 + bool "Motorola EZX A910" + default y + depends on PXA_EZX -endchoice +config MACH_EZX_E6 + bool "Motorola EZX E6" + default y + depends on PXA_EZX -endif +config MACH_EZX_E2 + bool "Motorola EZX E2" + default y + depends on PXA_EZX endmenu -config MACH_POODLE - bool "Enable Sharp SL-5600 (Poodle) Support" - depends on PXA_SHARPSL - select PXA25x - select SHARP_LOCOMO - select PXA_SSP - -config MACH_CORGI - bool "Enable Sharp SL-C700 (Corgi) Support" - depends on PXA_SHARPSL - select PXA25x - select PXA_SHARP_C7xx - -config MACH_SHEPHERD - bool "Enable Sharp SL-C750 (Shepherd) Support" - depends on PXA_SHARPSL - select PXA25x - select PXA_SHARP_C7xx - -config MACH_HUSKY - bool "Enable Sharp SL-C760 (Husky) Support" - depends on PXA_SHARPSL - select PXA25x - select PXA_SHARP_C7xx - -config MACH_AKITA - bool "Enable Sharp SL-1000 (Akita) Support" - depends on PXA_SHARPSL - select PXA27x - select PXA_SHARP_Cxx00 - select MACH_SPITZ - select I2C - select I2C_PXA - -config MACH_SPITZ - bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" - depends on PXA_SHARPSL - select PXA27x - select PXA_SHARP_Cxx00 - -config MACH_BORZOI - bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" - depends on PXA_SHARPSL - select PXA27x - select PXA_SHARP_Cxx00 - -config MACH_TOSA - bool "Enable Sharp SL-6000x (Tosa) Support" - depends on PXA_SHARPSL - select PXA25x - config PXA25x bool help @@ -288,4 +334,13 @@ config PXA_PWM default BACKLIGHT_PWM help Enable support for PXA2xx/PXA3xx PWM controllers + +config TOSA_BT + tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" + depends on MACH_TOSA + select RFKILL + help + This is a simple driver that is able to control + the state of built in bluetooth chip on tosa. + endif diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index c4dfbe87fc4e..99ecbe7f8506 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/arch/arm/mach-pxa/Makefile @@ -4,7 +4,7 @@ # Common support (must be linked before board specific support) obj-y += clock.o devices.o generic.o irq.o dma.o \ - time.o gpio.o + time.o gpio.o reset.o obj-$(CONFIG_PM) += pm.o sleep.o standby.o obj-$(CONFIG_CPU_FREQ) += cpu-pxa.o @@ -18,6 +18,7 @@ obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa2xx.o pxa27x.o obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o obj-$(CONFIG_CPU_PXA300) += pxa300.o obj-$(CONFIG_CPU_PXA320) += pxa320.o +obj-$(CONFIG_CPU_PXA930) += pxa930.o # Specific board support obj-$(CONFIG_ARCH_GUMSTIX) += gumstix.o @@ -36,7 +37,12 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD) += pcm990-baseboard.o obj-$(CONFIG_MACH_TOSA) += tosa.o obj-$(CONFIG_MACH_EM_X270) += em-x270.o obj-$(CONFIG_MACH_MAGICIAN) += magician.o -obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o +obj-$(CONFIG_ARCH_PXA_ESERIES) += eseries.o eseries_udc.o +obj-$(CONFIG_MACH_E740) += e740_lcd.o +obj-$(CONFIG_MACH_E750) += e750_lcd.o +obj-$(CONFIG_MACH_E400) += e400_lcd.o +obj-$(CONFIG_MACH_E800) += e800_lcd.o +obj-$(CONFIG_MACH_PALMTX) += palmtx.o ifeq ($(CONFIG_MACH_ZYLONITE),y) obj-y += zylonite.o @@ -44,8 +50,11 @@ ifeq ($(CONFIG_MACH_ZYLONITE),y) obj-$(CONFIG_CPU_PXA320) += zylonite_pxa320.o endif obj-$(CONFIG_MACH_LITTLETON) += littleton.o +obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o +obj-$(CONFIG_MACH_SAAR) += saar.o obj-$(CONFIG_MACH_ARMCORE) += cm-x270.o +obj-$(CONFIG_PXA_EZX) += ezx.o # Support for blinky lights led-y := leds.o @@ -59,3 +68,5 @@ obj-$(CONFIG_LEDS) += $(led-y) ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o endif + +obj-$(CONFIG_TOSA_BT) += tosa-bt.o diff --git a/trunk/arch/arm/mach-pxa/clock.c b/trunk/arch/arm/mach-pxa/clock.c index b4d04955dcb0..630063ffa6fc 100644 --- a/trunk/arch/arm/mach-pxa/clock.c +++ b/trunk/arch/arm/mach-pxa/clock.c @@ -101,21 +101,6 @@ unsigned long clk_get_rate(struct clk *clk) EXPORT_SYMBOL(clk_get_rate); -static void clk_gpio27_enable(struct clk *clk) -{ - pxa_gpio_mode(GPIO11_3_6MHz_MD); -} - -static void clk_gpio27_disable(struct clk *clk) -{ -} - -static const struct clkops clk_gpio27_ops = { - .enable = clk_gpio27_enable, - .disable = clk_gpio27_disable, -}; - - void clk_cken_enable(struct clk *clk) { CKEN |= 1 << clk->cken; @@ -131,14 +116,6 @@ const struct clkops clk_cken_ops = { .disable = clk_cken_disable, }; -static struct clk common_clks[] = { - { - .name = "GPIO27_CLK", - .ops = &clk_gpio27_ops, - .rate = 3686400, - }, -}; - void clks_register(struct clk *clks, size_t num) { int i; @@ -148,10 +125,3 @@ void clks_register(struct clk *clks, size_t num) list_add(&clks[i].node, &clocks); mutex_unlock(&clocks_mutex); } - -static int __init clk_init(void) -{ - clks_register(common_clks, ARRAY_SIZE(common_clks)); - return 0; -} -arch_initcall(clk_init); diff --git a/trunk/arch/arm/mach-pxa/clock.h b/trunk/arch/arm/mach-pxa/clock.h index 83cbfaba485d..1ec8f9178aaf 100644 --- a/trunk/arch/arm/mach-pxa/clock.h +++ b/trunk/arch/arm/mach-pxa/clock.h @@ -47,9 +47,42 @@ struct clk { .other = _other, \ } +#define INIT_CLK(_name, _ops, _rate, _delay, _dev) \ + { \ + .name = _name, \ + .dev = _dev, \ + .ops = _ops, \ + .rate = _rate, \ + .delay = _delay, \ + } + extern const struct clkops clk_cken_ops; void clk_cken_enable(struct clk *clk); void clk_cken_disable(struct clk *clk); +#ifdef CONFIG_PXA3xx +#define PXA3xx_CKEN(_name, _cken, _rate, _delay, _dev) \ + { \ + .name = _name, \ + .dev = _dev, \ + .ops = &clk_pxa3xx_cken_ops, \ + .rate = _rate, \ + .cken = CKEN_##_cken, \ + .delay = _delay, \ + } + +#define PXA3xx_CK(_name, _cken, _ops, _dev) \ + { \ + .name = _name, \ + .dev = _dev, \ + .ops = _ops, \ + .cken = CKEN_##_cken, \ + } + +extern const struct clkops clk_pxa3xx_cken_ops; +extern void clk_pxa3xx_cken_enable(struct clk *); +extern void clk_pxa3xx_cken_disable(struct clk *); +#endif + void clks_register(struct clk *clks, size_t num); diff --git a/trunk/arch/arm/mach-pxa/cm-x270-pci.c b/trunk/arch/arm/mach-pxa/cm-x270-pci.c index 319c9ff3ab9a..bcf0cde6ccc9 100644 --- a/trunk/arch/arm/mach-pxa/cm-x270-pci.c +++ b/trunk/arch/arm/mach-pxa/cm-x270-pci.c @@ -5,7 +5,7 @@ * * Bits taken from various places. * - * Copyright (C) 2007 Compulab, Ltd. + * Copyright (C) 2007, 2008 Compulab, Ltd. * Mike Rapoport * * This program is free software; you can redistribute it and/or modify @@ -19,16 +19,16 @@ #include #include #include +#include #include -#include #include -#include #include #include -unsigned long it8152_base_address = CMX270_IT8152_VIRT; +unsigned long it8152_base_address; +static int cmx270_it8152_irq_gpio; /* * Only first 64MB of memory can be accessed via PCI. @@ -42,7 +42,7 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, unsigned int sz = SZ_64M >> PAGE_SHIFT; if (machine_is_armcore()) { - pr_info("Adjusting zones for CM-x270\n"); + pr_info("Adjusting zones for CM-X270\n"); /* * Only adjust if > 64M on current system @@ -60,19 +60,20 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc) { /* clear our parent irq */ - GEDR(GPIO_IT8152_IRQ) = GPIO_bit(GPIO_IT8152_IRQ); + GEDR(cmx270_it8152_irq_gpio) = GPIO_bit(cmx270_it8152_irq_gpio); it8152_irq_demux(irq, desc); } -void __cmx270_pci_init_irq(void) +void __cmx270_pci_init_irq(int irq_gpio) { it8152_init_irq(); - pxa_gpio_mode(IRQ_TO_GPIO(GPIO_IT8152_IRQ)); - set_irq_type(IRQ_GPIO(GPIO_IT8152_IRQ), IRQT_RISING); - set_irq_chained_handler(IRQ_GPIO(GPIO_IT8152_IRQ), - cmx270_it8152_irq_demux); + cmx270_it8152_irq_gpio = irq_gpio; + + set_irq_type(gpio_to_irq(irq_gpio), IRQT_RISING); + + set_irq_chained_handler(gpio_to_irq(irq_gpio), cmx270_it8152_irq_demux); } #ifdef CONFIG_PM @@ -115,8 +116,8 @@ static int __init cmx270_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) /* Here comes the ugly part. The routing is baseboard specific, - but defining a platform for each possible base of CM-x270 is - unrealistic. Here we keep mapping for ATXBase and SB-x270. + but defining a platform for each possible base of CM-X270 is + unrealistic. Here we keep mapping for ATXBase and SB-X270. */ /* ATXBASE PCI slot */ if (slot == 7) diff --git a/trunk/arch/arm/mach-pxa/cm-x270-pci.h b/trunk/arch/arm/mach-pxa/cm-x270-pci.h index ffe37b66f9a0..48f532f4cb51 100644 --- a/trunk/arch/arm/mach-pxa/cm-x270-pci.h +++ b/trunk/arch/arm/mach-pxa/cm-x270-pci.h @@ -1,13 +1,13 @@ -extern void __cmx270_pci_init_irq(void); +extern void __cmx270_pci_init_irq(int irq_gpio); extern void __cmx270_pci_suspend(void); extern void __cmx270_pci_resume(void); #ifdef CONFIG_PCI -#define cmx270_pci_init_irq __cmx270_pci_init_irq -#define cmx270_pci_suspend __cmx270_pci_suspend -#define cmx270_pci_resume __cmx270_pci_resume +#define cmx270_pci_init_irq(x) __cmx270_pci_init_irq(x) +#define cmx270_pci_suspend(x) __cmx270_pci_suspend(x) +#define cmx270_pci_resume(x) __cmx270_pci_resume(x) #else -#define cmx270_pci_init_irq() do {} while (0) -#define cmx270_pci_suspend() do {} while (0) -#define cmx270_pci_resume() do {} while (0) +#define cmx270_pci_init_irq(x) do {} while (0) +#define cmx270_pci_suspend(x) do {} while (0) +#define cmx270_pci_resume(x) do {} while (0) #endif diff --git a/trunk/arch/arm/mach-pxa/cm-x270.c b/trunk/arch/arm/mach-pxa/cm-x270.c index 01b9964acec1..402e807eae54 100644 --- a/trunk/arch/arm/mach-pxa/cm-x270.c +++ b/trunk/arch/arm/mach-pxa/cm-x270.c @@ -1,7 +1,7 @@ /* * linux/arch/arm/mach-pxa/cm-x270.c * - * Copyright (C) 2007 CompuLab, Ltd. + * Copyright (C) 2007, 2008 CompuLab, Ltd. * Mike Rapoport * * This program is free software; you can redistribute it and/or modify @@ -9,44 +9,156 @@ * published by the Free Software Foundation. */ -#include -#include -#include #include -#include #include -#include -#include +#include +#include #include #include -#include - #include