From 6fd8a8678a95ecd71038694186479c1bef898ae3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 6 Nov 2012 12:23:43 +0900 Subject: [PATCH] --- yaml --- r: 339962 b: refs/heads/master c: ed9c0754cef1d9f81f70b3147189a5a1b4a307a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/.gitignore | 6 + trunk/Documentation/DocBook/media/Makefile | 76 +- trunk/Documentation/DocBook/networking.tmpl | 4 +- trunk/Documentation/IPMI.txt | 65 +- trunk/Documentation/hwmon/coretemp | 1 - trunk/Documentation/hwmon/submitting-patches | 3 +- trunk/Documentation/sysrq.txt | 1 - trunk/MAINTAINERS | 24 +- trunk/Makefile | 17 +- trunk/arch/arm/Kconfig | 2 +- trunk/arch/arm/boot/dts/Makefile | 2 - trunk/arch/arm/boot/dts/dove.dtsi | 49 +- trunk/arch/arm/boot/dts/imx6q-arm2.dts | 10 +- trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi | 18 +- trunk/arch/arm/boot/dts/wm8505.dtsi | 4 +- trunk/arch/arm/configs/clps711x_defconfig | 78 - trunk/arch/arm/configs/edb7211_defconfig | 27 + trunk/arch/arm/configs/fortunet_defconfig | 28 + trunk/arch/arm/kernel/entry-common.S | 4 +- trunk/arch/arm/mach-clps711x/Makefile | 2 +- trunk/arch/arm/mach-clps711x/autcpu12.c | 15 +- trunk/arch/arm/mach-clps711x/cdb89712.c | 4 +- trunk/arch/arm/mach-clps711x/common.c | 113 +- .../{edb7211.c => edb7211-arch.c} | 58 +- trunk/arch/arm/mach-clps711x/edb7211-mm.c | 82 + .../arm/mach-clps711x/include/mach/autcpu12.h | 14 +- .../arm/mach-clps711x/include/mach/clps711x.h | 3 - .../arm/mach-clps711x/include/mach/hardware.h | 56 +- .../arm/mach-clps711x/include/mach/irqs.h | 4 + .../arm/mach-clps711x/include/mach/syspld.h | 9 +- trunk/arch/arm/mach-clps711x/p720t.c | 18 +- trunk/arch/arm/mach-dove/common.c | 8 +- trunk/arch/arm/mach-dove/pcie.c | 5 - trunk/arch/arm/mach-kirkwood/board-dt.c | 2 + trunk/arch/arm/mach-kirkwood/common.c | 4 +- trunk/arch/arm/mach-omap1/board-ams-delta.c | 12 - trunk/arch/arm/mach-omap2/clock44xx_data.c | 2 +- trunk/arch/arm/mach-omap2/clockdomain.c | 15 +- trunk/arch/arm/mach-omap2/devices.c | 2 +- trunk/arch/arm/mach-omap2/gpmc.c | 24 +- trunk/arch/arm/mach-omap2/timer.c | 2 +- .../arch/arm/mach-prima2/include/mach/gpio.h | 13 + trunk/arch/arm/mach-s3c24xx/clock-s3c2440.c | 2 +- trunk/arch/arm/mach-shmobile/Kconfig | 6 - trunk/arch/arm/mach-shmobile/Makefile | 3 - .../arm/mach-shmobile/board-armadillo800eva.c | 2 +- trunk/arch/arm/mach-shmobile/clock-r8a7779.c | 22 +- trunk/arch/arm/mach-shmobile/clock-sh7367.c | 355 ---- .../arm/mach-shmobile/include/mach/common.h | 9 - .../arm/mach-shmobile/include/mach/sh7367.h | 332 ---- trunk/arch/arm/mach-shmobile/intc-sh7367.c | 413 ---- trunk/arch/arm/mach-shmobile/pfc-sh7367.c | 1727 ----------------- trunk/arch/arm/mach-shmobile/setup-sh7367.c | 481 ----- trunk/arch/arm/mach-tegra/board-dt-tegra20.c | 2 +- trunk/arch/arm/mach-tegra/board-dt-tegra30.c | 2 +- trunk/arch/arm/mach-tegra/board.h | 2 +- .../arch/arm/mach-tegra/tegra20_clocks_data.c | 1 - trunk/arch/arm/mach-tegra/tegra30_clocks.c | 2 +- .../arch/arm/mach-tegra/tegra30_clocks_data.c | 1 - trunk/arch/arm/mach-tegra/timer.c | 2 +- trunk/arch/arm/mach-ux500/board-mop500.c | 13 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 5 +- trunk/arch/arm/plat-omap/debug-devices.c | 1 - trunk/arch/arm64/Kconfig | 1 - trunk/arch/arm64/include/asm/Kbuild | 1 + trunk/arch/arm64/include/asm/linkage.h | 7 - trunk/arch/arm64/include/asm/processor.h | 10 + trunk/arch/arm64/include/uapi/asm/ptrace.h | 3 +- trunk/arch/arm64/kernel/ptrace.c | 73 +- trunk/arch/arm64/kernel/setup.c | 12 - trunk/arch/arm64/kernel/smp.c | 1 + trunk/arch/arm64/kernel/vdso.c | 20 +- trunk/arch/frv/kernel/entry.S | 4 +- trunk/arch/frv/kernel/process.c | 2 +- trunk/arch/frv/kernel/setup.c | 2 - trunk/arch/hexagon/include/asm/Kbuild | 3 + trunk/arch/hexagon/include/asm/atomic.h | 2 +- trunk/arch/hexagon/include/asm/barrier.h | 2 +- trunk/arch/hexagon/include/asm/bitops.h | 2 +- .../include/{uapi => }/asm/bitsperlong.h | 2 +- .../include/{uapi => }/asm/byteorder.h | 2 +- trunk/arch/hexagon/include/asm/cache.h | 2 +- trunk/arch/hexagon/include/asm/cacheflush.h | 2 +- trunk/arch/hexagon/include/asm/checksum.h | 2 +- trunk/arch/hexagon/include/asm/cmpxchg.h | 2 +- trunk/arch/hexagon/include/asm/delay.h | 2 +- trunk/arch/hexagon/include/asm/dma-mapping.h | 2 +- trunk/arch/hexagon/include/asm/dma.h | 2 +- trunk/arch/hexagon/include/asm/elf.h | 2 +- trunk/arch/hexagon/include/asm/exec.h | 2 +- trunk/arch/hexagon/include/asm/fixmap.h | 2 +- trunk/arch/hexagon/include/asm/hexagon_vm.h | 2 +- trunk/arch/hexagon/include/asm/intrinsics.h | 2 +- trunk/arch/hexagon/include/asm/io.h | 2 +- trunk/arch/hexagon/include/asm/irq.h | 2 +- trunk/arch/hexagon/include/asm/irqflags.h | 2 +- trunk/arch/hexagon/include/asm/kgdb.h | 2 +- .../hexagon/include/{uapi => }/asm/kvm_para.h | 0 trunk/arch/hexagon/include/asm/linkage.h | 2 +- trunk/arch/hexagon/include/asm/mem-layout.h | 2 +- trunk/arch/hexagon/include/asm/mmu.h | 2 +- trunk/arch/hexagon/include/asm/mmu_context.h | 2 +- trunk/arch/hexagon/include/asm/module.h | 2 +- trunk/arch/hexagon/include/asm/page.h | 2 +- .../hexagon/include/{uapi => }/asm/param.h | 2 +- trunk/arch/hexagon/include/asm/perf_event.h | 2 +- trunk/arch/hexagon/include/asm/pgalloc.h | 2 +- trunk/arch/hexagon/include/asm/pgtable.h | 2 +- trunk/arch/hexagon/include/asm/processor.h | 2 +- .../hexagon/include/{uapi => }/asm/ptrace.h | 2 +- .../include/{uapi => }/asm/registers.h | 17 +- .../hexagon/include/{uapi => }/asm/setup.h | 2 +- .../include/{uapi => }/asm/sigcontext.h | 2 +- .../hexagon/include/{uapi => }/asm/signal.h | 2 +- trunk/arch/hexagon/include/asm/smp.h | 2 +- trunk/arch/hexagon/include/asm/spinlock.h | 2 +- .../arch/hexagon/include/asm/spinlock_types.h | 2 +- trunk/arch/hexagon/include/asm/string.h | 2 +- trunk/arch/hexagon/include/asm/suspend.h | 2 +- .../hexagon/include/{uapi => }/asm/swab.h | 2 +- trunk/arch/hexagon/include/asm/switch_to.h | 2 +- trunk/arch/hexagon/include/asm/syscall.h | 2 +- trunk/arch/hexagon/include/asm/thread_info.h | 2 +- trunk/arch/hexagon/include/asm/time.h | 2 +- trunk/arch/hexagon/include/asm/timer-regs.h | 2 +- trunk/arch/hexagon/include/asm/timex.h | 2 +- trunk/arch/hexagon/include/asm/tlb.h | 2 +- trunk/arch/hexagon/include/asm/tlbflush.h | 2 +- trunk/arch/hexagon/include/asm/traps.h | 2 +- trunk/arch/hexagon/include/asm/uaccess.h | 2 +- .../hexagon/include/{uapi => }/asm/unistd.h | 2 +- .../hexagon/include/{uapi => }/asm/user.h | 18 + trunk/arch/hexagon/include/asm/vdso.h | 2 +- trunk/arch/hexagon/include/asm/vm_fault.h | 2 +- trunk/arch/hexagon/include/asm/vm_mmu.h | 2 +- trunk/arch/hexagon/include/uapi/asm/Kbuild | 12 - trunk/arch/hexagon/kernel/asm-offsets.c | 2 +- trunk/arch/hexagon/kernel/dma.c | 2 +- trunk/arch/hexagon/kernel/head.S | 2 +- trunk/arch/hexagon/kernel/hexagon_ksyms.c | 2 +- trunk/arch/hexagon/kernel/irq_cpu.c | 2 +- trunk/arch/hexagon/kernel/kgdb.c | 2 +- trunk/arch/hexagon/kernel/module.c | 2 +- trunk/arch/hexagon/kernel/process.c | 2 +- trunk/arch/hexagon/kernel/ptrace.c | 2 +- trunk/arch/hexagon/kernel/reset.c | 2 +- trunk/arch/hexagon/kernel/setup.c | 2 +- trunk/arch/hexagon/kernel/signal.c | 2 +- trunk/arch/hexagon/kernel/smp.c | 2 +- trunk/arch/hexagon/kernel/stacktrace.c | 2 +- trunk/arch/hexagon/kernel/syscall.c | 2 +- trunk/arch/hexagon/kernel/syscalltab.c | 2 +- trunk/arch/hexagon/kernel/time.c | 2 +- trunk/arch/hexagon/kernel/topology.c | 2 +- trunk/arch/hexagon/kernel/trampoline.S | 2 +- trunk/arch/hexagon/kernel/traps.c | 2 +- trunk/arch/hexagon/kernel/vdso.c | 2 +- trunk/arch/hexagon/kernel/vm_entry.S | 2 +- trunk/arch/hexagon/kernel/vm_events.c | 2 +- trunk/arch/hexagon/kernel/vm_init_segtable.S | 2 +- trunk/arch/hexagon/kernel/vm_ops.S | 2 +- trunk/arch/hexagon/kernel/vm_switch.S | 2 +- trunk/arch/hexagon/kernel/vm_vectors.S | 2 +- trunk/arch/hexagon/kernel/vmlinux.lds.S | 2 +- trunk/arch/hexagon/lib/checksum.c | 2 +- trunk/arch/hexagon/lib/io.c | 2 +- trunk/arch/hexagon/lib/memcpy.S | 2 +- trunk/arch/hexagon/lib/memset.S | 2 +- trunk/arch/hexagon/mm/cache.c | 2 +- trunk/arch/hexagon/mm/copy_from_user.S | 2 +- trunk/arch/hexagon/mm/copy_to_user.S | 2 +- trunk/arch/hexagon/mm/copy_user_template.S | 2 +- trunk/arch/hexagon/mm/init.c | 2 +- trunk/arch/hexagon/mm/ioremap.c | 2 +- trunk/arch/hexagon/mm/pgalloc.c | 2 +- trunk/arch/hexagon/mm/strnlen_user.S | 2 +- trunk/arch/hexagon/mm/uaccess.c | 2 +- trunk/arch/hexagon/mm/vm_fault.c | 2 +- trunk/arch/hexagon/mm/vm_tlb.c | 2 +- trunk/arch/ia64/include/uapi/asm/Kbuild | 2 - trunk/arch/ia64/include/uapi/asm/kvm_para.h | 0 trunk/arch/mips/include/asm/Kbuild | 1 - trunk/arch/mips/include/asm/delay.h | 6 +- trunk/arch/mips/include/asm/pgtable-64.h | 15 +- trunk/arch/mips/jz4740/serial.h | 3 - trunk/arch/mips/kernel/smp-cmp.c | 2 +- trunk/arch/mips/lib/delay.c | 6 +- trunk/arch/mips/lib/dump_tlb.c | 4 +- trunk/arch/mips/mm/tlb-r4k.c | 1 - trunk/arch/mips/mm/tlbex.c | 56 +- trunk/arch/mn10300/include/uapi/asm/setup.h | 4 - trunk/arch/parisc/include/asm/Kbuild | 9 +- trunk/arch/parisc/include/asm/auxvec.h | 4 + .../include/{uapi => }/asm/bitsperlong.h | 0 .../parisc/include/{uapi => }/asm/byteorder.h | 0 trunk/arch/parisc/include/asm/compat_signal.h | 2 + trunk/arch/parisc/include/asm/cputime.h | 6 + trunk/arch/parisc/include/asm/device.h | 7 + trunk/arch/parisc/include/asm/div64.h | 1 + .../parisc/include/asm/emergency-restart.h | 6 + .../parisc/include/{uapi => }/asm/errno.h | 0 .../parisc/include/{uapi => }/asm/fcntl.h | 0 trunk/arch/parisc/include/asm/hw_irq.h | 8 + .../parisc/include/{uapi => }/asm/ioctl.h | 0 .../parisc/include/{uapi => }/asm/ioctls.h | 0 .../parisc/include/{uapi => }/asm/ipcbuf.h | 0 trunk/arch/parisc/include/asm/irq_regs.h | 1 + trunk/arch/parisc/include/asm/kdebug.h | 1 + trunk/arch/parisc/include/asm/kvm_para.h | 1 + trunk/arch/parisc/include/asm/local.h | 1 + trunk/arch/parisc/include/asm/local64.h | 1 + .../arch/parisc/include/{uapi => }/asm/mman.h | 0 .../parisc/include/{uapi => }/asm/msgbuf.h | 0 trunk/arch/parisc/include/asm/mutex.h | 9 + trunk/arch/parisc/include/asm/param.h | 1 + trunk/arch/parisc/include/asm/pdc.h | 423 +++- trunk/arch/parisc/include/asm/percpu.h | 7 + trunk/arch/parisc/include/asm/poll.h | 1 + .../include/{uapi => }/asm/posix_types.h | 0 trunk/arch/parisc/include/asm/ptrace.h | 46 +- trunk/arch/parisc/include/asm/real.h | 5 + .../parisc/include/{uapi => }/asm/resource.h | 0 trunk/arch/parisc/include/asm/segment.h | 6 + .../parisc/include/{uapi => }/asm/sembuf.h | 0 .../parisc/include/{uapi => }/asm/setup.h | 0 .../parisc/include/{uapi => }/asm/shmbuf.h | 0 .../include/{uapi => }/asm/sigcontext.h | 0 .../parisc/include/{uapi => }/asm/siginfo.h | 0 trunk/arch/parisc/include/asm/signal.h | 113 +- .../parisc/include/{uapi => }/asm/socket.h | 0 .../parisc/include/{uapi => }/asm/sockios.h | 0 .../arch/parisc/include/{uapi => }/asm/stat.h | 0 .../parisc/include/{uapi => }/asm/statfs.h | 0 .../arch/parisc/include/{uapi => }/asm/swab.h | 0 .../parisc/include/{uapi => }/asm/termbits.h | 0 trunk/arch/parisc/include/asm/termios.h | 41 +- trunk/arch/parisc/include/asm/topology.h | 6 + .../parisc/include/{uapi => }/asm/types.h | 0 trunk/arch/parisc/include/asm/unistd.h | 835 +++++++- trunk/arch/parisc/include/asm/user.h | 5 + trunk/arch/parisc/include/asm/vga.h | 6 + trunk/arch/parisc/include/asm/xor.h | 1 + trunk/arch/parisc/include/uapi/asm/Kbuild | 28 - trunk/arch/parisc/include/uapi/asm/pdc.h | 427 ---- trunk/arch/parisc/include/uapi/asm/ptrace.h | 47 - trunk/arch/parisc/include/uapi/asm/signal.h | 118 -- trunk/arch/parisc/include/uapi/asm/termios.h | 43 - trunk/arch/parisc/include/uapi/asm/unistd.h | 837 -------- .../arch/powerpc/include/asm/kvm_book3s_32.h | 1 - trunk/arch/powerpc/include/asm/processor.h | 4 +- trunk/arch/powerpc/kernel/sysfs.c | 2 +- trunk/arch/powerpc/kvm/book3s_32_mmu_host.c | 4 +- trunk/arch/powerpc/perf/core-book3s.c | 2 +- .../platforms/pseries/processor_idle.c | 62 +- trunk/arch/s390/include/uapi/asm/Kbuild | 2 - trunk/arch/s390/include/uapi/asm/kvm_para.h | 0 trunk/arch/sh/include/asm/Kbuild | 11 + trunk/arch/sh/include/{uapi => }/asm/auxvec.h | 0 .../sh/include/{uapi => }/asm/byteorder.h | 0 .../arch/sh/include/{uapi => }/asm/cachectl.h | 0 .../sh/include/{uapi => }/asm/cpu-features.h | 0 trunk/arch/sh/include/asm/hw_breakpoint.h | 4 +- trunk/arch/sh/include/{uapi => }/asm/ioctls.h | 0 trunk/arch/sh/include/asm/posix_types.h | 8 + .../include/{uapi => }/asm/posix_types_32.h | 0 .../include/{uapi => }/asm/posix_types_64.h | 0 trunk/arch/sh/include/asm/ptrace.h | 34 +- trunk/arch/sh/include/asm/ptrace_32.h | 75 +- trunk/arch/sh/include/asm/ptrace_64.h | 12 +- trunk/arch/sh/include/asm/setup.h | 5 +- .../sh/include/{uapi => }/asm/sigcontext.h | 0 trunk/arch/sh/include/{uapi => }/asm/signal.h | 0 .../arch/sh/include/{uapi => }/asm/sockios.h | 0 trunk/arch/sh/include/{uapi => }/asm/stat.h | 0 trunk/arch/sh/include/{uapi => }/asm/swab.h | 0 trunk/arch/sh/include/asm/types.h | 5 +- trunk/arch/sh/include/asm/unistd.h | 9 +- .../sh/include/{uapi => }/asm/unistd_32.h | 3 +- .../sh/include/{uapi => }/asm/unistd_64.h | 3 +- trunk/arch/sh/include/uapi/asm/Kbuild | 22 - .../arch/sh/include/uapi/asm/hw_breakpoint.h | 4 - trunk/arch/sh/include/uapi/asm/posix_types.h | 7 - trunk/arch/sh/include/uapi/asm/ptrace.h | 34 - trunk/arch/sh/include/uapi/asm/ptrace_32.h | 77 - trunk/arch/sh/include/uapi/asm/ptrace_64.h | 14 - trunk/arch/sh/include/uapi/asm/setup.h | 1 - trunk/arch/sh/include/uapi/asm/types.h | 1 - trunk/arch/sh/include/uapi/asm/unistd.h | 7 - trunk/arch/sh/kernel/syscalls_32.S | 1 - trunk/arch/sh/kernel/syscalls_64.S | 1 - trunk/arch/sparc/include/asm/ptrace.h | 13 +- trunk/arch/sparc/include/asm/smp_64.h | 2 - .../arch/sparc/include/uapi/asm/sigcontext.h | 4 - trunk/arch/sparc/kernel/perf_event.c | 15 +- trunk/arch/sparc/kernel/process_64.c | 120 +- trunk/arch/sparc/kernel/smp_64.c | 11 - trunk/arch/sparc/mm/ultra.S | 64 +- trunk/arch/tile/include/arch/Kbuild | 1 - trunk/arch/tile/include/asm/Kbuild | 3 + trunk/arch/tile/include/uapi/asm/Kbuild | 3 - trunk/arch/x86/Makefile | 2 +- trunk/arch/x86/crypto/aesni-intel_glue.c | 9 +- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 6 + trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 10 +- trunk/arch/x86/kernel/cpu/perf_event.c | 6 - trunk/arch/x86/kernel/reboot.c | 8 + trunk/arch/x86/kernel/setup.c | 17 +- trunk/arch/x86/realmode/rm/wakeup_asm.S | 15 +- .../arch/xtensa/boot/boot-redboot/bootstrap.S | 8 +- trunk/arch/xtensa/include/asm/Kbuild | 28 +- trunk/arch/xtensa/include/asm/atomic.h | 12 +- .../xtensa/include/{uapi => }/asm/auxvec.h | 0 trunk/arch/xtensa/include/asm/bitsperlong.h | 1 + trunk/arch/xtensa/include/asm/bug.h | 18 + .../xtensa/include/{uapi => }/asm/byteorder.h | 0 trunk/arch/xtensa/include/asm/cacheflush.h | 2 +- trunk/arch/xtensa/include/asm/cmpxchg.h | 4 +- trunk/arch/xtensa/include/asm/coprocessor.h | 5 +- trunk/arch/xtensa/include/asm/cputime.h | 6 + trunk/arch/xtensa/include/asm/delay.h | 2 +- trunk/arch/xtensa/include/asm/device.h | 7 + trunk/arch/xtensa/include/asm/div64.h | 16 + .../xtensa/include/asm/emergency-restart.h | 6 + trunk/arch/xtensa/include/asm/errno.h | 16 + trunk/arch/xtensa/include/asm/fcntl.h | 1 + trunk/arch/xtensa/include/asm/futex.h | 1 + trunk/arch/xtensa/include/asm/hardirq.h | 16 + trunk/arch/xtensa/include/asm/ioctl.h | 1 + .../xtensa/include/{uapi => }/asm/ioctls.h | 0 .../xtensa/include/{uapi => }/asm/ipcbuf.h | 0 trunk/arch/xtensa/include/asm/irq_regs.h | 1 + trunk/arch/xtensa/include/asm/irqflags.h | 4 +- trunk/arch/xtensa/include/asm/kdebug.h | 1 + trunk/arch/xtensa/include/asm/kmap_types.h | 6 + trunk/arch/xtensa/include/asm/kvm_para.h | 1 + trunk/arch/xtensa/include/asm/local.h | 16 + trunk/arch/xtensa/include/asm/local64.h | 1 + .../arch/xtensa/include/{uapi => }/asm/mman.h | 0 trunk/arch/xtensa/include/asm/mmu_context.h | 4 +- .../xtensa/include/{uapi => }/asm/msgbuf.h | 0 trunk/arch/xtensa/include/asm/param.h | 20 +- trunk/arch/xtensa/include/asm/percpu.h | 16 + .../arch/xtensa/include/{uapi => }/asm/poll.h | 0 .../include/{uapi => }/asm/posix_types.h | 0 trunk/arch/xtensa/include/asm/ptrace.h | 66 +- trunk/arch/xtensa/include/asm/regs.h | 55 +- trunk/arch/xtensa/include/asm/resource.h | 16 + trunk/arch/xtensa/include/asm/scatterlist.h | 16 + trunk/arch/xtensa/include/asm/sections.h | 16 + .../xtensa/include/{uapi => }/asm/sembuf.h | 0 .../xtensa/include/{uapi => }/asm/setup.h | 0 .../xtensa/include/{uapi => }/asm/shmbuf.h | 0 .../include/{uapi => }/asm/sigcontext.h | 0 trunk/arch/xtensa/include/asm/siginfo.h | 16 + trunk/arch/xtensa/include/asm/signal.h | 134 +- .../xtensa/include/{uapi => }/asm/socket.h | 0 .../xtensa/include/{uapi => }/asm/sockios.h | 0 .../arch/xtensa/include/{uapi => }/asm/stat.h | 0 trunk/arch/xtensa/include/asm/statfs.h | 17 + .../arch/xtensa/include/{uapi => }/asm/swab.h | 0 .../xtensa/include/{uapi => }/asm/termbits.h | 0 trunk/arch/xtensa/include/asm/termios.h | 105 + trunk/arch/xtensa/include/asm/timex.h | 8 +- trunk/arch/xtensa/include/asm/tlbflush.h | 8 +- trunk/arch/xtensa/include/asm/topology.h | 16 + trunk/arch/xtensa/include/asm/types.h | 15 +- trunk/arch/xtensa/include/asm/unistd.h | 702 ++++++- trunk/arch/xtensa/include/asm/xor.h | 16 + trunk/arch/xtensa/include/uapi/asm/Kbuild | 22 - trunk/arch/xtensa/include/uapi/asm/param.h | 30 - trunk/arch/xtensa/include/uapi/asm/ptrace.h | 77 - trunk/arch/xtensa/include/uapi/asm/signal.h | 148 -- trunk/arch/xtensa/include/uapi/asm/types.h | 28 - trunk/arch/xtensa/include/uapi/asm/unistd.h | 762 -------- trunk/arch/xtensa/kernel/align.S | 38 +- trunk/arch/xtensa/kernel/coprocessor.S | 20 +- trunk/arch/xtensa/kernel/entry.S | 254 +-- trunk/arch/xtensa/kernel/head.S | 36 +- trunk/arch/xtensa/kernel/irq.c | 6 +- trunk/arch/xtensa/kernel/process.c | 29 +- trunk/arch/xtensa/kernel/setup.c | 4 +- trunk/arch/xtensa/kernel/syscall.c | 1 + trunk/arch/xtensa/kernel/traps.c | 22 +- trunk/arch/xtensa/kernel/vectors.S | 44 +- trunk/arch/xtensa/lib/memcopy.S | 309 +-- trunk/arch/xtensa/mm/fault.c | 3 +- trunk/arch/xtensa/platforms/iss/console.c | 9 +- .../platforms/iss/include/platform/simcall.h | 9 +- trunk/arch/xtensa/platforms/iss/setup.c | 10 +- trunk/arch/xtensa/platforms/xt2000/setup.c | 10 +- trunk/drivers/Makefile | 4 - trunk/drivers/acpi/Makefile | 5 +- trunk/drivers/char/Makefile | 1 + trunk/drivers/char/agp/intel-gtt.c | 2 +- trunk/drivers/char/ipmi/ipmi_msghandler.c | 2 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 36 +- trunk/drivers/firmware/memmap.c | 4 +- trunk/drivers/gpio/gpio-mvebu.c | 3 - trunk/drivers/gpu/drm/drm_info.c | 2 +- trunk/drivers/gpu/drm/i915/dvo_ch7xxx.c | 6 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 9 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 19 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 47 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 3 +- trunk/drivers/gpu/drm/i915/intel_overlay.c | 72 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 4 +- .../gpu/drm/nouveau/core/subdev/bios/dcb.c | 2 +- .../gpu/drm/nouveau/core/subdev/fb/nv50.c | 1 + .../gpu/drm/nouveau/core/subdev/therm/fan.c | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 2 - trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 6 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 8 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 7 +- trunk/drivers/gpu/drm/radeon/ni.c | 12 +- trunk/drivers/gpu/drm/radeon/r600.c | 6 - trunk/drivers/gpu/drm/radeon/radeon.h | 14 +- trunk/drivers/gpu/drm/radeon/radeon_acpi.c | 6 +- .../gpu/drm/radeon/radeon_atpx_handler.c | 2 +- trunk/drivers/gpu/drm/radeon/radeon_cs.c | 1 - trunk/drivers/gpu/drm/radeon/radeon_device.c | 4 - trunk/drivers/gpu/drm/radeon/radeon_gart.c | 374 +--- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 22 +- .../gpu/drm/radeon/radeon_legacy_encoders.c | 48 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 2 +- trunk/drivers/gpu/drm/radeon/si.c | 7 +- trunk/drivers/hwmon/coretemp.c | 7 +- trunk/drivers/hwmon/pmbus/Kconfig | 2 +- trunk/drivers/media/Kconfig | 18 +- trunk/drivers/net/bonding/bond_main.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 +- .../net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +- trunk/drivers/of/address.c | 24 +- trunk/drivers/of/irq.c | 8 +- trunk/drivers/of/platform.c | 2 +- trunk/drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- trunk/drivers/pinctrl/pinctrl-bcm2835.c | 5 +- trunk/drivers/pinctrl/pinctrl-nomadik.c | 26 +- trunk/drivers/pinctrl/pinctrl-samsung.c | 10 +- trunk/drivers/pinctrl/pinctrl-sirf.c | 35 + trunk/drivers/pinctrl/pinctrl-xway.c | 2 + trunk/drivers/s390/net/qeth_l2_main.c | 11 +- trunk/drivers/s390/net/qeth_l3_main.c | 11 +- trunk/drivers/s390/net/smsgiucv.c | 2 +- trunk/drivers/scsi/arm/fas216.c | 2 +- trunk/drivers/scsi/arm/oak.c | 1 - trunk/drivers/sh/intc/access.c | 45 +- trunk/drivers/sh/intc/chip.c | 4 +- trunk/drivers/spi/spi-s3c64xx.c | 6 +- trunk/drivers/staging/dgrp/dgrp_mon_ops.c | 1 - trunk/drivers/staging/dgrp/dgrp_specproc.c | 7 - trunk/drivers/staging/dgrp/dgrp_tty.c | 10 - trunk/drivers/thermal/Kconfig | 2 - trunk/drivers/tty/serial/8250/8250_hp300.c | 20 +- trunk/drivers/tty/serial/Kconfig | 4 +- trunk/drivers/tty/serial/sccnxp.c | 1 - trunk/drivers/tty/serial/sh-sci.c | 3 +- trunk/drivers/tty/sysrq.c | 1 - trunk/drivers/usb/class/cdc-acm.c | 22 +- trunk/drivers/usb/core/devio.c | 1 - trunk/drivers/usb/core/driver.c | 4 - trunk/drivers/usb/core/hub.c | 36 +- trunk/drivers/usb/dwc3/core.c | 4 - trunk/drivers/usb/dwc3/gadget.c | 2 +- trunk/drivers/usb/gadget/Kconfig | 1 - trunk/drivers/usb/gadget/lpc32xx_udc.c | 4 +- trunk/drivers/usb/host/ehci-fsl.c | 2 +- trunk/drivers/usb/host/ehci-orion.c | 2 +- trunk/drivers/usb/host/ehci-vt8500.c | 10 - trunk/drivers/usb/host/uhci-platform.c | 9 - trunk/drivers/usb/host/xhci.c | 3 +- trunk/drivers/usb/musb/am35x.c | 6 - trunk/drivers/usb/renesas_usbhs/mod.c | 6 +- trunk/drivers/usb/renesas_usbhs/pipe.h | 2 +- trunk/drivers/usb/serial/ark3116.c | 26 +- trunk/drivers/usb/serial/belkin_sa.c | 31 +- trunk/drivers/usb/serial/cp210x.c | 40 +- trunk/drivers/usb/serial/cyberjack.c | 49 +- trunk/drivers/usb/serial/cypress_m8.c | 75 +- trunk/drivers/usb/serial/f81232.c | 43 +- trunk/drivers/usb/serial/garmin_gps.c | 24 +- trunk/drivers/usb/serial/io_edgeport.c | 54 +- trunk/drivers/usb/serial/io_tables.h | 8 - trunk/drivers/usb/serial/io_ti.c | 91 +- trunk/drivers/usb/serial/iuu_phoenix.c | 76 +- trunk/drivers/usb/serial/keyspan_pda.c | 30 +- trunk/drivers/usb/serial/kl5kusb105.c | 68 +- trunk/drivers/usb/serial/kobil_sct.c | 23 +- trunk/drivers/usb/serial/option.c | 84 +- trunk/drivers/usb/serial/oti6858.c | 68 +- trunk/drivers/usb/serial/pl2303.c | 90 +- trunk/drivers/usb/serial/spcp8x5.c | 46 +- trunk/drivers/usb/serial/ssu100.c | 34 +- trunk/drivers/usb/serial/ti_usb_3410_5052.c | 88 +- trunk/drivers/video/backlight/lm3639_bl.c | 4 +- trunk/drivers/xen/xenbus/xenbus_xs.c | 2 +- trunk/fs/coredump.c | 5 +- trunk/fs/ext2/super.c | 4 +- trunk/fs/ext3/namei.c | 40 +- trunk/fs/ext3/namei.h | 19 - trunk/fs/ext3/super.c | 4 +- trunk/fs/lockd/clntxdr.c | 2 +- trunk/fs/lockd/svcproc.c | 3 +- trunk/fs/proc/internal.h | 4 - trunk/fs/proc/task_mmu.c | 53 +- trunk/fs/quota/dquot.c | 2 - trunk/fs/xattr.c | 2 +- trunk/include/Kbuild | 4 + trunk/include/asm-generic/Kbuild | 0 trunk/include/drm/Kbuild | 0 trunk/include/linux/Kbuild | 26 + trunk/include/linux/byteorder/Kbuild | 0 trunk/include/linux/caif/Kbuild | 0 trunk/include/linux/can/Kbuild | 0 trunk/include/linux/coredump.h | 1 - trunk/include/linux/dvb/Kbuild | 8 + trunk/include/{uapi => }/linux/dvb/audio.h | 0 trunk/include/{uapi => }/linux/dvb/ca.h | 0 trunk/include/linux/dvb/dmx.h | 130 +- trunk/include/{uapi => }/linux/dvb/frontend.h | 0 trunk/include/{uapi => }/linux/dvb/net.h | 0 trunk/include/{uapi => }/linux/dvb/osd.h | 0 trunk/include/{uapi => }/linux/dvb/version.h | 0 trunk/include/linux/dvb/video.h | 249 ++- trunk/include/linux/elf-fdpic.h | 51 - trunk/include/linux/fs.h | 126 -- trunk/include/linux/hsi/Kbuild | 1 + trunk/include/{uapi => }/linux/hsi/hsi_char.h | 0 trunk/include/linux/isdn/Kbuild | 0 trunk/include/linux/mmc/Kbuild | 0 trunk/include/linux/netfilter/Kbuild | 1 + trunk/include/linux/netfilter/ipset/Kbuild | 0 trunk/include/linux/netfilter_arp/Kbuild | 0 trunk/include/linux/netfilter_bridge/Kbuild | 0 trunk/include/linux/netfilter_ipv4/Kbuild | 0 trunk/include/linux/netfilter_ipv6/Kbuild | 0 trunk/include/linux/nfsd/Kbuild | 0 trunk/include/linux/of.h | 7 - trunk/include/linux/of_address.h | 4 +- trunk/include/linux/of_irq.h | 4 +- trunk/include/linux/pid_namespace.h | 8 +- trunk/include/linux/ratelimit.h | 27 +- trunk/include/linux/spi/Kbuild | 0 trunk/include/linux/sunrpc/Kbuild | 0 trunk/include/linux/tc_act/Kbuild | 0 trunk/include/linux/tc_ematch/Kbuild | 0 trunk/include/linux/usb.h | 11 + trunk/include/linux/usb/Kbuild | 10 + trunk/include/linux/usb/audio.h | 524 ++++- trunk/include/{uapi => }/linux/usb/cdc.h | 0 trunk/include/{uapi => }/linux/usb/ch11.h | 0 trunk/include/linux/usb/ch9.h | 960 ++++++++- trunk/include/linux/usb/functionfs.h | 167 +- .../include/{uapi => }/linux/usb/g_printer.h | 0 trunk/include/{uapi => }/linux/usb/gadgetfs.h | 0 trunk/include/{uapi => }/linux/usb/midi.h | 0 trunk/include/{uapi => }/linux/usb/tmc.h | 0 trunk/include/{uapi => }/linux/usb/video.h | 0 trunk/include/linux/wimax/Kbuild | 0 trunk/include/mtd/Kbuild | 0 trunk/include/uapi/asm-generic/kvm_para.h | 4 - trunk/include/uapi/linux/dvb/Kbuild | 8 - trunk/include/uapi/linux/dvb/dmx.h | 155 -- trunk/include/uapi/linux/dvb/video.h | 274 --- trunk/include/uapi/linux/elf-fdpic.h | 42 +- trunk/include/uapi/linux/fs.h | 132 ++ trunk/include/uapi/linux/hsi/Kbuild | 1 - trunk/include/uapi/linux/irqnr.h | 4 - trunk/include/uapi/linux/usb/Kbuild | 10 - trunk/include/uapi/linux/usb/audio.h | 545 ------ trunk/include/uapi/linux/usb/ch9.h | 993 ---------- trunk/include/uapi/linux/usb/functionfs.h | 169 -- trunk/include/xen/Kbuild | 0 trunk/kernel/module-internal.h | 3 +- trunk/kernel/module.c | 26 +- trunk/kernel/module_signing.c | 24 +- trunk/kernel/pid_namespace.c | 21 +- trunk/kernel/printk.c | 1 + trunk/kernel/sys.c | 12 +- trunk/lib/dma-debug.c | 4 +- trunk/mm/compaction.c | 2 +- trunk/mm/fremap.c | 2 +- trunk/mm/huge_memory.c | 1 - trunk/mm/mempolicy.c | 5 +- trunk/mm/slob.c | 6 +- trunk/net/8021q/vlan_core.c | 9 +- trunk/net/ipv6/addrconf.c | 15 +- trunk/net/irda/ircomm/ircomm_tty.c | 2 - trunk/net/sctp/sm_sideeffect.c | 3 +- trunk/net/sunrpc/cache.c | 4 +- trunk/scripts/Makefile.asm-generic | 2 +- trunk/scripts/Makefile.fwinst | 4 +- trunk/scripts/Makefile.modinst | 2 +- trunk/scripts/Makefile.modpost | 77 +- trunk/scripts/dtc/dtc.h | 44 +- trunk/scripts/sign-file | 498 +---- trunk/scripts/x509keyid | 268 +++ trunk/security/apparmor/Makefile | 2 +- trunk/security/selinux/hooks.c | 18 +- trunk/sound/pci/ac97/ac97_codec.c | 2 - trunk/sound/pci/emu10k1/emu10k1_main.c | 9 - trunk/sound/pci/hda/hda_intel.c | 42 +- trunk/sound/pci/hda/patch_realtek.c | 4 +- trunk/sound/soc/Makefile | 5 +- trunk/sound/soc/codecs/da9055.c | 22 +- trunk/sound/soc/codecs/twl6040.c | 8 +- trunk/sound/soc/codecs/wm2200.c | 3 +- trunk/sound/soc/omap/ams-delta.c | 63 +- trunk/sound/soc/omap/omap-abe-twl6040.c | 2 +- trunk/sound/soc/omap/omap-mcpdm.c | 9 +- trunk/sound/soc/pxa/mmp-pcm.c | 2 +- trunk/sound/soc/samsung/bells.c | 4 +- trunk/sound/soc/sh/fsi.c | 15 +- trunk/sound/soc/soc-jack.c | 7 +- trunk/tools/lib/traceevent/event-parse.c | 9 +- trunk/tools/lib/traceevent/parse-filter.c | 15 - trunk/tools/perf/Makefile | 24 +- trunk/tools/perf/perf.h | 2 +- trunk/tools/perf/ui/browsers/hists.c | 6 +- trunk/tools/perf/util/parse-events.c | 3 - trunk/tools/perf/util/setup.py | 2 - trunk/tools/perf/util/sort.c | 6 - 624 files changed, 8031 insertions(+), 12114 deletions(-) delete mode 100644 trunk/arch/arm/configs/clps711x_defconfig create mode 100644 trunk/arch/arm/configs/edb7211_defconfig create mode 100644 trunk/arch/arm/configs/fortunet_defconfig rename trunk/arch/arm/mach-clps711x/{edb7211.c => edb7211-arch.c} (56%) create mode 100644 trunk/arch/arm/mach-clps711x/edb7211-mm.c create mode 100644 trunk/arch/arm/mach-prima2/include/mach/gpio.h delete mode 100644 trunk/arch/arm/mach-shmobile/clock-sh7367.c delete mode 100644 trunk/arch/arm/mach-shmobile/include/mach/sh7367.h delete mode 100644 trunk/arch/arm/mach-shmobile/intc-sh7367.c delete mode 100644 trunk/arch/arm/mach-shmobile/pfc-sh7367.c delete mode 100644 trunk/arch/arm/mach-shmobile/setup-sh7367.c delete mode 100644 trunk/arch/arm64/include/asm/linkage.h rename trunk/arch/hexagon/include/{uapi => }/asm/bitsperlong.h (92%) rename trunk/arch/hexagon/include/{uapi => }/asm/byteorder.h (92%) rename trunk/arch/hexagon/include/{uapi => }/asm/kvm_para.h (100%) rename trunk/arch/hexagon/include/{uapi => }/asm/param.h (91%) rename trunk/arch/hexagon/include/{uapi => }/asm/ptrace.h (94%) rename trunk/arch/hexagon/include/{uapi => }/asm/registers.h (85%) rename trunk/arch/hexagon/include/{uapi => }/asm/setup.h (92%) rename trunk/arch/hexagon/include/{uapi => }/asm/sigcontext.h (93%) rename trunk/arch/hexagon/include/{uapi => }/asm/signal.h (92%) rename trunk/arch/hexagon/include/{uapi => }/asm/swab.h (91%) rename trunk/arch/hexagon/include/{uapi => }/asm/unistd.h (93%) rename trunk/arch/hexagon/include/{uapi => }/asm/user.h (63%) create mode 100644 trunk/arch/ia64/include/uapi/asm/kvm_para.h create mode 100644 trunk/arch/parisc/include/asm/auxvec.h rename trunk/arch/parisc/include/{uapi => }/asm/bitsperlong.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/byteorder.h (100%) create mode 100644 trunk/arch/parisc/include/asm/compat_signal.h create mode 100644 trunk/arch/parisc/include/asm/cputime.h create mode 100644 trunk/arch/parisc/include/asm/device.h create mode 100644 trunk/arch/parisc/include/asm/div64.h create mode 100644 trunk/arch/parisc/include/asm/emergency-restart.h rename trunk/arch/parisc/include/{uapi => }/asm/errno.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/fcntl.h (100%) create mode 100644 trunk/arch/parisc/include/asm/hw_irq.h rename trunk/arch/parisc/include/{uapi => }/asm/ioctl.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/ioctls.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/ipcbuf.h (100%) create mode 100644 trunk/arch/parisc/include/asm/irq_regs.h create mode 100644 trunk/arch/parisc/include/asm/kdebug.h create mode 100644 trunk/arch/parisc/include/asm/kvm_para.h create mode 100644 trunk/arch/parisc/include/asm/local.h create mode 100644 trunk/arch/parisc/include/asm/local64.h rename trunk/arch/parisc/include/{uapi => }/asm/mman.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/msgbuf.h (100%) create mode 100644 trunk/arch/parisc/include/asm/mutex.h create mode 100644 trunk/arch/parisc/include/asm/param.h create mode 100644 trunk/arch/parisc/include/asm/percpu.h create mode 100644 trunk/arch/parisc/include/asm/poll.h rename trunk/arch/parisc/include/{uapi => }/asm/posix_types.h (100%) create mode 100644 trunk/arch/parisc/include/asm/real.h rename trunk/arch/parisc/include/{uapi => }/asm/resource.h (100%) create mode 100644 trunk/arch/parisc/include/asm/segment.h rename trunk/arch/parisc/include/{uapi => }/asm/sembuf.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/setup.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/shmbuf.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/sigcontext.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/siginfo.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/socket.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/sockios.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/stat.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/statfs.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/swab.h (100%) rename trunk/arch/parisc/include/{uapi => }/asm/termbits.h (100%) create mode 100644 trunk/arch/parisc/include/asm/topology.h rename trunk/arch/parisc/include/{uapi => }/asm/types.h (100%) create mode 100644 trunk/arch/parisc/include/asm/user.h create mode 100644 trunk/arch/parisc/include/asm/vga.h create mode 100644 trunk/arch/parisc/include/asm/xor.h delete mode 100644 trunk/arch/parisc/include/uapi/asm/pdc.h delete mode 100644 trunk/arch/parisc/include/uapi/asm/ptrace.h delete mode 100644 trunk/arch/parisc/include/uapi/asm/signal.h delete mode 100644 trunk/arch/parisc/include/uapi/asm/termios.h delete mode 100644 trunk/arch/parisc/include/uapi/asm/unistd.h create mode 100644 trunk/arch/s390/include/uapi/asm/kvm_para.h rename trunk/arch/sh/include/{uapi => }/asm/auxvec.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/byteorder.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/cachectl.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/cpu-features.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/ioctls.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/posix_types_32.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/posix_types_64.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/sigcontext.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/signal.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/sockios.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/stat.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/swab.h (100%) rename trunk/arch/sh/include/{uapi => }/asm/unistd_32.h (99%) rename trunk/arch/sh/include/{uapi => }/asm/unistd_64.h (99%) delete mode 100644 trunk/arch/sh/include/uapi/asm/hw_breakpoint.h delete mode 100644 trunk/arch/sh/include/uapi/asm/posix_types.h delete mode 100644 trunk/arch/sh/include/uapi/asm/ptrace.h delete mode 100644 trunk/arch/sh/include/uapi/asm/ptrace_32.h delete mode 100644 trunk/arch/sh/include/uapi/asm/ptrace_64.h delete mode 100644 trunk/arch/sh/include/uapi/asm/setup.h delete mode 100644 trunk/arch/sh/include/uapi/asm/types.h delete mode 100644 trunk/arch/sh/include/uapi/asm/unistd.h rename trunk/arch/xtensa/include/{uapi => }/asm/auxvec.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/bitsperlong.h create mode 100644 trunk/arch/xtensa/include/asm/bug.h rename trunk/arch/xtensa/include/{uapi => }/asm/byteorder.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/cputime.h create mode 100644 trunk/arch/xtensa/include/asm/device.h create mode 100644 trunk/arch/xtensa/include/asm/div64.h create mode 100644 trunk/arch/xtensa/include/asm/emergency-restart.h create mode 100644 trunk/arch/xtensa/include/asm/errno.h create mode 100644 trunk/arch/xtensa/include/asm/fcntl.h create mode 100644 trunk/arch/xtensa/include/asm/futex.h create mode 100644 trunk/arch/xtensa/include/asm/hardirq.h create mode 100644 trunk/arch/xtensa/include/asm/ioctl.h rename trunk/arch/xtensa/include/{uapi => }/asm/ioctls.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/ipcbuf.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/irq_regs.h create mode 100644 trunk/arch/xtensa/include/asm/kdebug.h create mode 100644 trunk/arch/xtensa/include/asm/kmap_types.h create mode 100644 trunk/arch/xtensa/include/asm/kvm_para.h create mode 100644 trunk/arch/xtensa/include/asm/local.h create mode 100644 trunk/arch/xtensa/include/asm/local64.h rename trunk/arch/xtensa/include/{uapi => }/asm/mman.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/msgbuf.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/percpu.h rename trunk/arch/xtensa/include/{uapi => }/asm/poll.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/posix_types.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/resource.h create mode 100644 trunk/arch/xtensa/include/asm/scatterlist.h create mode 100644 trunk/arch/xtensa/include/asm/sections.h rename trunk/arch/xtensa/include/{uapi => }/asm/sembuf.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/setup.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/shmbuf.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/sigcontext.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/siginfo.h rename trunk/arch/xtensa/include/{uapi => }/asm/socket.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/sockios.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/stat.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/statfs.h rename trunk/arch/xtensa/include/{uapi => }/asm/swab.h (100%) rename trunk/arch/xtensa/include/{uapi => }/asm/termbits.h (100%) create mode 100644 trunk/arch/xtensa/include/asm/termios.h create mode 100644 trunk/arch/xtensa/include/asm/topology.h create mode 100644 trunk/arch/xtensa/include/asm/xor.h delete mode 100644 trunk/arch/xtensa/include/uapi/asm/param.h delete mode 100644 trunk/arch/xtensa/include/uapi/asm/ptrace.h delete mode 100644 trunk/arch/xtensa/include/uapi/asm/signal.h delete mode 100644 trunk/arch/xtensa/include/uapi/asm/types.h delete mode 100644 trunk/arch/xtensa/include/uapi/asm/unistd.h create mode 100644 trunk/include/asm-generic/Kbuild create mode 100644 trunk/include/drm/Kbuild create mode 100644 trunk/include/linux/byteorder/Kbuild create mode 100644 trunk/include/linux/caif/Kbuild create mode 100644 trunk/include/linux/can/Kbuild rename trunk/include/{uapi => }/linux/dvb/audio.h (100%) rename trunk/include/{uapi => }/linux/dvb/ca.h (100%) rename trunk/include/{uapi => }/linux/dvb/frontend.h (100%) rename trunk/include/{uapi => }/linux/dvb/net.h (100%) rename trunk/include/{uapi => }/linux/dvb/osd.h (100%) rename trunk/include/{uapi => }/linux/dvb/version.h (100%) delete mode 100644 trunk/include/linux/elf-fdpic.h rename trunk/include/{uapi => }/linux/hsi/hsi_char.h (100%) create mode 100644 trunk/include/linux/isdn/Kbuild create mode 100644 trunk/include/linux/mmc/Kbuild create mode 100644 trunk/include/linux/netfilter/Kbuild create mode 100644 trunk/include/linux/netfilter/ipset/Kbuild create mode 100644 trunk/include/linux/netfilter_arp/Kbuild create mode 100644 trunk/include/linux/netfilter_bridge/Kbuild create mode 100644 trunk/include/linux/netfilter_ipv4/Kbuild create mode 100644 trunk/include/linux/netfilter_ipv6/Kbuild create mode 100644 trunk/include/linux/nfsd/Kbuild create mode 100644 trunk/include/linux/spi/Kbuild create mode 100644 trunk/include/linux/sunrpc/Kbuild create mode 100644 trunk/include/linux/tc_act/Kbuild create mode 100644 trunk/include/linux/tc_ematch/Kbuild rename trunk/include/{uapi => }/linux/usb/cdc.h (100%) rename trunk/include/{uapi => }/linux/usb/ch11.h (100%) rename trunk/include/{uapi => }/linux/usb/g_printer.h (100%) rename trunk/include/{uapi => }/linux/usb/gadgetfs.h (100%) rename trunk/include/{uapi => }/linux/usb/midi.h (100%) rename trunk/include/{uapi => }/linux/usb/tmc.h (100%) rename trunk/include/{uapi => }/linux/usb/video.h (100%) create mode 100644 trunk/include/linux/wimax/Kbuild create mode 100644 trunk/include/mtd/Kbuild delete mode 100644 trunk/include/uapi/linux/dvb/dmx.h delete mode 100644 trunk/include/uapi/linux/dvb/video.h delete mode 100644 trunk/include/uapi/linux/usb/audio.h delete mode 100644 trunk/include/uapi/linux/usb/ch9.h delete mode 100644 trunk/include/uapi/linux/usb/functionfs.h create mode 100644 trunk/include/xen/Kbuild mode change 100755 => 100644 trunk/scripts/sign-file create mode 100755 trunk/scripts/x509keyid diff --git a/[refs] b/[refs] index 3663c8890da5..5c61bea23ff5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bddddf24b644fd884f20639a91871bcbf567974 +refs/heads/master: ed9c0754cef1d9f81f70b3147189a5a1b4a307a8 diff --git a/trunk/.gitignore b/trunk/.gitignore index 92bd0e45dfa1..0f2f40f71915 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -14,6 +14,10 @@ *.o.* *.a *.s +*.ko.unsigned +*.ko.stripped +*.ko.stripped.dig +*.ko.stripped.sig *.ko *.so *.so.dbg @@ -91,4 +95,6 @@ GTAGS extra_certificates signing_key.priv signing_key.x509 +signing_key.x509.keyid +signing_key.x509.signer x509.genkey diff --git a/trunk/Documentation/DocBook/media/Makefile b/trunk/Documentation/DocBook/media/Makefile index f9fd615427fb..9b7e4c557928 100644 --- a/trunk/Documentation/DocBook/media/Makefile +++ b/trunk/Documentation/DocBook/media/Makefile @@ -56,15 +56,15 @@ FUNCS = \ write \ IOCTLS = \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/audio.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/ca.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/dmx.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/frontend.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/audio.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/ca.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/dmx.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/frontend.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/net.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/video.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \ VIDIOC_SUBDEV_G_FRAME_INTERVAL \ VIDIOC_SUBDEV_S_FRAME_INTERVAL \ VIDIOC_SUBDEV_ENUM_MBUS_CODE \ @@ -74,32 +74,32 @@ IOCTLS = \ VIDIOC_SUBDEV_S_SELECTION \ TYPES = \ - $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/uapi/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/uapi/linux/dvb/frontend.h) + $(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/linux/dvb/frontend.h) ENUMS = \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/audio.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/ca.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/dmx.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/frontend.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/net.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/video.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) \ - $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/audio.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/ca.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/dmx.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/frontend.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/net.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/video.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \ + $(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) STRUCTS = \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/uapi/linux/dvb/audio.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/ca.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/dmx.h) \ - $(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/frontend.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/net.h) \ - $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/video.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \ - $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/linux/dvb/audio.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/ca.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/dmx.h) \ + $(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/frontend.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/linux/dvb/net.h) \ + $(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/video.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) \ + $(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) ERRORS = \ E2BIG \ @@ -205,7 +205,7 @@ $(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES) @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/) @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/) -$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -216,7 +216,7 @@ $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(ME @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/uapi/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -227,7 +227,7 @@ $(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/uapi/linux/dvb/audio.h $(MEDIA_ @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/uapi/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -238,7 +238,7 @@ $(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/uapi/linux/dvb/ca.h $(MEDIA_OBJ_DI @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/uapi/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -249,7 +249,7 @@ $(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/uapi/linux/dvb/dmx.h $(MEDIA_OBJ_ @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/uapi/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -260,7 +260,7 @@ $(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/uapi/linux/dvb/frontend.h $( @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/uapi/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ @@ -271,7 +271,7 @@ $(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/uapi/linux/dvb/net.h $(MEDIA_OBJ_ @( \ echo "") >> $@ -$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/uapi/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml +$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) @( \ echo "") > $@ diff --git a/trunk/Documentation/DocBook/networking.tmpl b/trunk/Documentation/DocBook/networking.tmpl index 29df25016c7c..59ad69a9d777 100644 --- a/trunk/Documentation/DocBook/networking.tmpl +++ b/trunk/Documentation/DocBook/networking.tmpl @@ -56,7 +56,7 @@ !Enet/core/filter.c Generic Network Statistics -!Iinclude/uapi/linux/gen_stats.h +!Iinclude/linux/gen_stats.h !Enet/core/gen_stats.c !Enet/core/gen_estimator.c @@ -80,7 +80,7 @@ !Enet/wimax/op-rfkill.c !Enet/wimax/stack.c !Iinclude/net/wimax.h -!Iinclude/uapi/linux/wimax.h +!Iinclude/linux/wimax.h diff --git a/trunk/Documentation/IPMI.txt b/trunk/Documentation/IPMI.txt index 16eb4c9e9233..b2bea15137d2 100644 --- a/trunk/Documentation/IPMI.txt +++ b/trunk/Documentation/IPMI.txt @@ -42,7 +42,13 @@ The driver interface depends on your hardware. If your system properly provides the SMBIOS info for IPMI, the driver will detect it and just work. If you have a board with a standard interface (These will generally be either "KCS", "SMIC", or "BT", consult your hardware -manual), choose the 'IPMI SI handler' option. +manual), choose the 'IPMI SI handler' option. A driver also exists +for direct I2C access to the IPMI management controller. Some boards +support this, but it is unknown if it will work on every board. For +this, choose 'IPMI SMBus handler', but be ready to try to do some +figuring to see if it will work on your system if the SMBIOS/APCI +information is wrong or not present. It is fairly safe to have both +these enabled and let the drivers auto-detect what is present. You should generally enable ACPI on your system, as systems with IPMI can have ACPI tables describing them. @@ -52,7 +58,8 @@ their job correctly, the IPMI controller should be automatically detected (via ACPI or SMBIOS tables) and should just work. Sadly, many boards do not have this information. The driver attempts standard defaults, but they may not work. If you fall into this -situation, you need to read the section below named 'The SI Driver'. +situation, you need to read the section below named 'The SI Driver' or +"The SMBus Driver" on how to hand-configure your system. IPMI defines a standard watchdog timer. You can enable this with the 'IPMI Watchdog Timer' config option. If you compile the driver into @@ -97,7 +104,12 @@ driver, each open file for this device ties in to the message handler as an IPMI user. ipmi_si - A driver for various system interfaces. This supports KCS, -SMIC, and BT interfaces. +SMIC, and BT interfaces. Unless you have an SMBus interface or your +own custom interface, you probably need to use this. + +ipmi_smb - A driver for accessing BMCs on the SMBus. It uses the +I2C kernel driver's SMBus interfaces to send and receive IPMI messages +over the SMBus. ipmi_watchdog - IPMI requires systems to have a very capable watchdog timer. This driver implements the standard Linux watchdog timer @@ -470,6 +482,53 @@ for specifying an interface. Note that when removing an interface, only the first three parameters (si type, address type, and address) are used for the comparison. Any options are ignored for removing. +The SMBus Driver +---------------- + +The SMBus driver allows up to 4 SMBus devices to be configured in the +system. By default, the driver will register any SMBus interfaces it finds +in the I2C address range of 0x20 to 0x4f on any adapter. You can change this +at module load time (for a module) with: + + modprobe ipmi_smb.o + addr=,[,,[,...]] + dbg=,... + [defaultprobe=1] [dbg_probe=1] + +The addresses are specified in pairs, the first is the adapter ID and the +second is the I2C address on that adapter. + +The debug flags are bit flags for each BMC found, they are: +IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8 + +Setting smb_defaultprobe to zero disabled the default probing of SMBus +interfaces at address range 0x20 to 0x4f. This means that only the +BMCs specified on the smb_addr line will be detected. + +Setting smb_dbg_probe to 1 will enable debugging of the probing and +detection process for BMCs on the SMBusses. + +Discovering the IPMI compliant BMC on the SMBus can cause devices +on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI +message as a block write to the I2C bus and waits for a response. +This action can be detrimental to some I2C devices. It is highly recommended +that the known I2c address be given to the SMBus driver in the smb_addr +parameter. The default address range will not be used when a smb_addr +parameter is provided. + +When compiled into the kernel, the addresses can be specified on the +kernel command line as: + + ipmb_smb.addr=,[,,[,...]] + ipmi_smb.dbg=,... + ipmi_smb.defaultprobe=0 ipmi_smb.dbg_probe=1 + +These are the same options as on the module command line. + +Note that you might need some I2C changes if CONFIG_IPMI_PANIC_EVENT +is enabled along with this, so the I2C driver knows to run to +completion during sending a panic event. + Other Pieces ------------ diff --git a/trunk/Documentation/hwmon/coretemp b/trunk/Documentation/hwmon/coretemp index f17256f069ba..c86b50c03ea8 100644 --- a/trunk/Documentation/hwmon/coretemp +++ b/trunk/Documentation/hwmon/coretemp @@ -105,7 +105,6 @@ Process Processor TjMax(C) 330/230 125 E680/660/640/620 90 E680T/660T/640T/620T 110 - CE4170/4150/4110 110 45nm Core2 Processors Solo ULV SU3500/3300 100 diff --git a/trunk/Documentation/hwmon/submitting-patches b/trunk/Documentation/hwmon/submitting-patches index 843751c41fea..790f774a3032 100644 --- a/trunk/Documentation/hwmon/submitting-patches +++ b/trunk/Documentation/hwmon/submitting-patches @@ -60,7 +60,8 @@ increase the chances of your change being accepted. * Add the driver to Kconfig and Makefile in alphabetical order. -* Make sure that all dependencies are listed in Kconfig. +* Make sure that all dependencies are listed in Kconfig. For new drivers, it + is most likely prudent to add a dependency on EXPERIMENTAL. * Avoid forward declarations if you can. Rearrange the code if necessary. diff --git a/trunk/Documentation/sysrq.txt b/trunk/Documentation/sysrq.txt index 2a4cdda4828e..642f84495b29 100644 --- a/trunk/Documentation/sysrq.txt +++ b/trunk/Documentation/sysrq.txt @@ -116,7 +116,6 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'w' - Dumps tasks that are in uninterruptable (blocked) state. 'x' - Used by xmon interface on ppc/powerpc platforms. - Show global PMU Registers on sparc64. 'y' - Show global CPU Registers [SPARC-64 specific] diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 027ec2bfa135..e73060fe0788 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -235,7 +235,6 @@ F: drivers/platform/x86/acer-wmi.c ACPI M: Len Brown -M: Rafael J. Wysocki L: linux-acpi@vger.kernel.org W: http://www.lesswatts.org/projects/acpi/ Q: http://patchwork.kernel.org/project/linux-acpi/list/ @@ -4373,7 +4372,7 @@ F: Documentation/scsi/53c700.txt F: drivers/scsi/53c700* LED SUBSYSTEM -M: Bryan Wu +M: Bryan Wu M: Richard Purdie L: linux-leds@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git @@ -5020,20 +5019,6 @@ F: net/ipv6/ F: include/net/ip* F: arch/x86/net/* -NETWORKING [IPSEC] -M: Steffen Klassert -M: Herbert Xu -M: "David S. Miller" -L: netdev@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git -S: Maintained -F: net/xfrm/ -F: net/key/ -F: net/ipv4/xfrm* -F: net/ipv6/xfrm* -F: include/uapi/linux/xfrm.h -F: include/net/xfrm.h - NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) M: Paul Moore L: netdev@vger.kernel.org @@ -7746,13 +7731,6 @@ W: http://www.ideasonboard.org/uvc/ S: Maintained F: drivers/media/usb/uvc/ -USB WEBCAM GADGET -M: Laurent Pinchart -L: linux-usb@vger.kernel.org -S: Maintained -F: drivers/usb/gadget/*uvc*.c -F: drivers/usb/gadget/webcam.c - USB WIRELESS RNDIS DRIVER (rndis_wlan) M: Jussi Kivilinna L: linux-wireless@vger.kernel.org diff --git a/trunk/Makefile b/trunk/Makefile index 14c93b39b929..5be2ee8c90e4 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc1 NAME = Terrified Chipmunk # *DOCUMENTATION* @@ -437,9 +437,7 @@ endif PHONY += asm-generic asm-generic: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ - src=asm obj=arch/$(SRCARCH)/include/generated/asm - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ - src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm + obj=arch/$(SRCARCH)/include/generated/asm # To make sure we do not include .config for any of the *config targets # catch them early, and hand them over to scripts/kconfig/Makefile @@ -719,17 +717,6 @@ endif # INSTALL_MOD_STRIP export mod_strip_cmd -ifeq ($(CONFIG_MODULE_SIG),y) -MODSECKEY = ./signing_key.priv -MODPUBKEY = ./signing_key.x509 -export MODPUBKEY -mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY) -else -mod_sign_cmd = true -endif -export mod_sign_cmd - - ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index c989c61060ae..73067efd4845 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -364,10 +364,10 @@ config ARCH_CNS3XXX config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" + select ARCH_USES_GETTIMEOFFSET select CLKDEV_LOOKUP select COMMON_CLK select CPU_ARM720T - select GENERIC_CLOCKEVENTS select NEED_MACH_MEMORY_H help Support for Cirrus Logic 711x/721x/731x based boards. diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile index f37cf9fa5fa0..c1ce813fcc4a 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -25,8 +25,6 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-trats.dtb \ exynos5250-smdk5250.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb -dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ - integratorcp.dtb dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-dns325.dtb \ diff --git a/trunk/arch/arm/boot/dts/dove.dtsi b/trunk/arch/arm/boot/dts/dove.dtsi index 5a00022383e7..96fb824b5e6e 100644 --- a/trunk/arch/arm/boot/dts/dove.dtsi +++ b/trunk/arch/arm/boot/dts/dove.dtsi @@ -4,32 +4,21 @@ compatible = "marvell,dove"; model = "Marvell Armada 88AP510 SoC"; - soc@f1000000 { + interrupt-parent = <&intc>; + + intc: interrupt-controller { + compatible = "marvell,orion-intc"; + interrupt-controller; + #interrupt-cells = <1>; + reg = <0xf1020204 0x04>, + <0xf1020214 0x04>; + }; + + mbus@f1000000 { compatible = "simple-bus"; + ranges = <0 0xf1000000 0x4000000>; #address-cells = <1>; #size-cells = <1>; - interrupt-parent = <&intc>; - - ranges = <0xc8000000 0xc8000000 0x0100000 /* CESA SRAM 1M */ - 0xe0000000 0xe0000000 0x8000000 /* PCIe0 Mem 128M */ - 0xe8000000 0xe8000000 0x8000000 /* PCIe1 Mem 128M */ - 0xf0000000 0xf0000000 0x0100000 /* ScratchPad 1M */ - 0x00000000 0xf1000000 0x1000000 /* SB/NB regs 16M */ - 0xf2000000 0xf2000000 0x0100000 /* PCIe0 I/O 1M */ - 0xf2100000 0xf2100000 0x0100000 /* PCIe0 I/O 1M */ - 0xf8000000 0xf8000000 0x8000000>; /* BootROM 128M */ - - l2: l2-cache { - compatible = "marvell,tauros2-cache"; - marvell,tauros2-cache-features = <0>; - }; - - intc: interrupt-controller { - compatible = "marvell,orion-intc"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0x20204 0x04>, <0x20214 0x04>; - }; uart0: serial@12000 { compatible = "ns16550a"; @@ -67,6 +56,11 @@ status = "disabled"; }; + wdt: wdt@20300 { + compatible = "marvell,orion-wdt"; + reg = <0x20300 0x28>; + }; + gpio0: gpio@d0400 { compatible = "marvell,orion-gpio"; #gpio-cells = <2>; @@ -145,14 +139,5 @@ nr-ports = <1>; status = "disabled"; }; - - crypto: crypto@30000 { - compatible = "marvell,orion-crypto"; - reg = <0x30000 0x10000>, - <0xc8000000 0x800>; - reg-names = "regs", "sram"; - interrupts = <31>; - status = "okay"; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/imx6q-arm2.dts b/trunk/arch/arm/boot/dts/imx6q-arm2.dts index 5bfa02a3f85c..15df4c105e89 100644 --- a/trunk/arch/arm/boot/dts/imx6q-arm2.dts +++ b/trunk/arch/arm/boot/dts/imx6q-arm2.dts @@ -37,13 +37,6 @@ pinctrl_hog: hoggrp { fsl,pins = < 176 0x80000000 /* MX6Q_PAD_EIM_D25__GPIO_3_25 */ - >; - }; - }; - - arm2 { - pinctrl_usdhc3_arm2: usdhc3grp-arm2 { - fsl,pins = < 1363 0x80000000 /* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */ 1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */ >; @@ -65,8 +58,7 @@ wp-gpios = <&gpio6 14 0>; vmmc-supply = <®_3p3v>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc3_1 - &pinctrl_usdhc3_arm2>; + pinctrl-0 = <&pinctrl_usdhc3_1>; status = "okay"; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 8fea375c734d..8ac51c08269d 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -48,19 +48,17 @@ #size-cells = <0>; button@1 { label = "Function Button"; - linux,code = <357>; + linux,code = <132>; gpios = <&gpio1 9 1>; }; button@2 { label = "Power-on Switch"; - linux,code = <0>; - linux,input-type = <5>; + linux,code = <116>; gpios = <&gpio1 10 1>; }; button@3 { label = "Power-auto Switch"; - linux,code = <1>; - linux,input-type = <5>; + linux,code = <142>; gpios = <&gpio1 11 1>; }; }; @@ -69,28 +67,28 @@ compatible = "gpio-leds"; led@1 { - label = "lsxl:blue:func"; + label = "lschlv2:blue:func"; gpios = <&gpio1 4 1>; }; led@2 { - label = "lsxl:red:alarm"; + label = "lschlv2:red:alarm"; gpios = <&gpio1 5 1>; }; led@3 { - label = "lsxl:amber:info"; + label = "lschlv2:amber:info"; gpios = <&gpio1 6 1>; }; led@4 { - label = "lsxl:blue:power"; + label = "lschlv2:blue:power"; gpios = <&gpio1 7 1>; linux,default-trigger = "default-on"; }; led@5 { - label = "lsxl:red:func"; + label = "lschlv2:red:func"; gpios = <&gpio1 16 1>; }; }; diff --git a/trunk/arch/arm/boot/dts/wm8505.dtsi b/trunk/arch/arm/boot/dts/wm8505.dtsi index 330f833ac3b0..b459691655ab 100644 --- a/trunk/arch/arm/boot/dts/wm8505.dtsi +++ b/trunk/arch/arm/boot/dts/wm8505.dtsi @@ -71,13 +71,13 @@ ehci@d8007100 { compatible = "via,vt8500-ehci"; reg = <0xd8007100 0x200>; - interrupts = <1>; + interrupts = <43>; }; uhci@d8007300 { compatible = "platform-uhci"; reg = <0xd8007300 0x200>; - interrupts = <0>; + interrupts = <43>; }; fb@d8050800 { diff --git a/trunk/arch/arm/configs/clps711x_defconfig b/trunk/arch/arm/configs/clps711x_defconfig deleted file mode 100644 index 86209d175b9c..000000000000 --- a/trunk/arch/arm/configs/clps711x_defconfig +++ /dev/null @@ -1,78 +0,0 @@ -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y -CONFIG_PARTITION_ADVANCED=y -# CONFIG_MSDOS_PARTITION is not set -CONFIG_ARCH_CLPS711X=y -CONFIG_ARCH_AUTCPU12=y -CONFIG_ARCH_CDB89712=y -CONFIG_ARCH_CLEP7312=y -CONFIG_ARCH_EDB7211=y -CONFIG_ARCH_P720T=y -CONFIG_ARCH_FORTUNET=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IPV6 is not set -CONFIG_IRDA=y -CONFIG_IRTTY_SIR=y -CONFIG_EP7211_DONGLE=y -CONFIG_MTD=y -CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_CFI_AMDSTD=y -CONFIG_MTD_CFI_STAA=y -CONFIG_MTD_CDB89712=y -CONFIG_MTD_AUTCPU12=y -CONFIG_MTD_PLATRAM=y -CONFIG_BLK_DEV_RAM=y -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_NET_VENDOR_AMD is not set -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -CONFIG_CS89x0=y -# CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_FUJITSU is not set -# CONFIG_NET_VENDOR_HP is not set -# CONFIG_NET_VENDOR_INTEL is not set -# CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_RACAL is not set -# CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SMSC is not set -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT is not set -# CONFIG_SERIO is not set -# CONFIG_VT is not set -CONFIG_SERIAL_CLPS711X_CONSOLE=y -# CONFIG_HW_RANDOM is not set -# CONFIG_HWMON is not set -CONFIG_FB=y -CONFIG_FB_CLPS711X=y -# CONFIG_USB_SUPPORT is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -# CONFIG_IOMMU_SUPPORT is not set -CONFIG_EXT2_FS=y -CONFIG_MINIX_FS=y -# CONFIG_NETWORK_FILESYSTEMS is not set -# CONFIG_FTRACE is not set -CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -# CONFIG_CRC32 is not set diff --git a/trunk/arch/arm/configs/edb7211_defconfig b/trunk/arch/arm/configs/edb7211_defconfig new file mode 100644 index 000000000000..d52ded350a12 --- /dev/null +++ b/trunk/arch/arm/configs/edb7211_defconfig @@ -0,0 +1,27 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_EXPERT=y +# CONFIG_HOTPLUG is not set +CONFIG_ARCH_CLPS711X=y +CONFIG_ARCH_EDB7211=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_IPV6 is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_NETDEVICES=y +# CONFIG_INPUT is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_VT is not set +CONFIG_SERIAL_CLPS711X=y +CONFIG_SERIAL_CLPS711X_CONSOLE=y +CONFIG_EXT2_FS=y +CONFIG_MINIX_FS=y +CONFIG_PARTITION_ADVANCED=y +# CONFIG_MSDOS_PARTITION is not set +CONFIG_DEBUG_USER=y diff --git a/trunk/arch/arm/configs/fortunet_defconfig b/trunk/arch/arm/configs/fortunet_defconfig new file mode 100644 index 000000000000..840fced7529f --- /dev/null +++ b/trunk/arch/arm/configs/fortunet_defconfig @@ -0,0 +1,28 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_BLK_DEV_INITRD=y +CONFIG_EXPERT=y +# CONFIG_HOTPLUG is not set +CONFIG_ARCH_CLPS711X=y +CONFIG_ARCH_FORTUNET=y +# CONFIG_ARM_THUMB is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_FPE_FASTFPE=y +CONFIG_BINFMT_AOUT=y +CONFIG_NET=y +CONFIG_UNIX=y +CONFIG_MTD=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_BLK_DEV_RAM=y +# CONFIG_INPUT is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +CONFIG_SERIAL_CLPS711X=y +CONFIG_SERIAL_CLPS711X_CONSOLE=y +CONFIG_EXT2_FS=y +CONFIG_DEBUG_USER=y diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index 34711757ba59..417bac1846bd 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -88,9 +88,9 @@ ENTRY(ret_from_fork) bl schedule_tail cmp r5, #0 movne r0, r4 - adrne lr, BSYM(1f) + movne lr, pc movne pc, r5 -1: get_thread_info tsk + get_thread_info tsk b ret_slow_syscall ENDPROC(ret_from_fork) diff --git a/trunk/arch/arm/mach-clps711x/Makefile b/trunk/arch/arm/mach-clps711x/Makefile index 9cf2d1c6a548..6da6940b3656 100644 --- a/trunk/arch/arm/mach-clps711x/Makefile +++ b/trunk/arch/arm/mach-clps711x/Makefile @@ -12,6 +12,6 @@ obj- := obj-$(CONFIG_ARCH_AUTCPU12) += autcpu12.o obj-$(CONFIG_ARCH_CDB89712) += cdb89712.o obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o -obj-$(CONFIG_ARCH_EDB7211) += edb7211.o +obj-$(CONFIG_ARCH_EDB7211) += edb7211-arch.o edb7211-mm.o obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o obj-$(CONFIG_ARCH_P720T) += p720t.o diff --git a/trunk/arch/arm/mach-clps711x/autcpu12.c b/trunk/arch/arm/mach-clps711x/autcpu12.c index 214547b5c51f..32871918bb6e 100644 --- a/trunk/arch/arm/mach-clps711x/autcpu12.c +++ b/trunk/arch/arm/mach-clps711x/autcpu12.c @@ -39,10 +39,19 @@ #include "common.h" +/* + * The on-chip registers are given a size of 1MB so that a section can + * be used to map them; this saves a page table. This is the place to + * add mappings for ROM, expansion memory, PCMCIA, etc. (if static + * mappings are chosen for those areas). + * +*/ + static struct map_desc autcpu12_io_desc[] __initdata = { - /* Memory-mapped extra io and CS8900A Ethernet chip */ - { - .virtual = IO_ADDRESS(AUTCPU12_PHYS_CS8900A), + /* memory-mapped extra io and CS8900A Ethernet chip */ + /* ethernet chip */ + { + .virtual = AUTCPU12_VIRT_CS8900A, .pfn = __phys_to_pfn(AUTCPU12_PHYS_CS8900A), .length = SZ_1M, .type = MT_DEVICE diff --git a/trunk/arch/arm/mach-clps711x/cdb89712.c b/trunk/arch/arm/mach-clps711x/cdb89712.c index d90d25c67ac2..c314f49d6ef6 100644 --- a/trunk/arch/arm/mach-clps711x/cdb89712.c +++ b/trunk/arch/arm/mach-clps711x/cdb89712.c @@ -40,8 +40,8 @@ */ static struct map_desc cdb89712_io_desc[] __initdata = { { - .virtual = IO_ADDRESS(ETHER_PHYS_BASE), - .pfn = __phys_to_pfn(ETHER_PHYS_BASE), + .virtual = ETHER_BASE, + .pfn =__phys_to_pfn(ETHER_START), .length = ETHER_SIZE, .type = MT_DEVICE } diff --git a/trunk/arch/arm/mach-clps711x/common.c b/trunk/arch/arm/mach-clps711x/common.c index 286d6e6d5f5a..509243d89a32 100644 --- a/trunk/arch/arm/mach-clps711x/common.c +++ b/trunk/arch/arm/mach-clps711x/common.c @@ -21,14 +21,13 @@ */ #include #include -#include #include #include #include #include -#include #include +#include #include #include #include @@ -37,6 +36,7 @@ static struct clk *clk_pll, *clk_bus, *clk_uart, *clk_timerl, *clk_timerh, *clk_tint, *clk_spi; +static unsigned long latch; /* * This maps the generic CLPS711x registers @@ -45,7 +45,7 @@ static struct map_desc clps711x_io_desc[] __initdata = { { .virtual = (unsigned long)CLPS711X_VIRT_BASE, .pfn = __phys_to_pfn(CLPS711X_PHYS_BASE), - .length = SZ_64K, + .length = SZ_1M, .type = MT_DEVICE } }; @@ -65,10 +65,6 @@ static void int1_mask(struct irq_data *d) } static void int1_ack(struct irq_data *d) -{ -} - -static void int1_eoi(struct irq_data *d) { switch (d->irq) { case IRQ_CSINT: clps_writel(0, COEOI); break; @@ -90,9 +86,7 @@ static void int1_unmask(struct irq_data *d) } static struct irq_chip int1_chip = { - .name = "Interrupt Vector 1 ", .irq_ack = int1_ack, - .irq_eoi = int1_eoi, .irq_mask = int1_mask, .irq_unmask = int1_unmask, }; @@ -107,10 +101,6 @@ static void int2_mask(struct irq_data *d) } static void int2_ack(struct irq_data *d) -{ -} - -static void int2_eoi(struct irq_data *d) { switch (d->irq) { case IRQ_KBDINT: clps_writel(0, KBDEOI); break; @@ -127,93 +117,73 @@ static void int2_unmask(struct irq_data *d) } static struct irq_chip int2_chip = { - .name = "Interrupt Vector 2 ", .irq_ack = int2_ack, - .irq_eoi = int2_eoi, .irq_mask = int2_mask, .irq_unmask = int2_unmask, }; -struct clps711x_irqdesc { - int nr; - struct irq_chip *chip; - irq_flow_handler_t handle; -}; - -static struct clps711x_irqdesc clps711x_irqdescs[] __initdata = { - { IRQ_CSINT, &int1_chip, handle_fasteoi_irq, }, - { IRQ_EINT1, &int1_chip, handle_level_irq, }, - { IRQ_EINT2, &int1_chip, handle_level_irq, }, - { IRQ_EINT3, &int1_chip, handle_level_irq, }, - { IRQ_TC1OI, &int1_chip, handle_fasteoi_irq, }, - { IRQ_TC2OI, &int1_chip, handle_fasteoi_irq, }, - { IRQ_RTCMI, &int1_chip, handle_fasteoi_irq, }, - { IRQ_TINT, &int1_chip, handle_fasteoi_irq, }, - { IRQ_UTXINT1, &int1_chip, handle_level_irq, }, - { IRQ_URXINT1, &int1_chip, handle_level_irq, }, - { IRQ_UMSINT, &int1_chip, handle_fasteoi_irq, }, - { IRQ_SSEOTI, &int1_chip, handle_level_irq, }, - { IRQ_KBDINT, &int2_chip, handle_fasteoi_irq, }, - { IRQ_SS2RX, &int2_chip, handle_level_irq, }, - { IRQ_SS2TX, &int2_chip, handle_level_irq, }, - { IRQ_UTXINT2, &int2_chip, handle_level_irq, }, - { IRQ_URXINT2, &int2_chip, handle_level_irq, }, -}; - void __init clps711x_init_irq(void) { unsigned int i; - /* Disable interrupts */ + for (i = 0; i < NR_IRQS; i++) { + if (INT1_IRQS & (1 << i)) { + irq_set_chip_and_handler(i, &int1_chip, + handle_level_irq); + set_irq_flags(i, IRQF_VALID | IRQF_PROBE); + } + if (INT2_IRQS & (1 << i)) { + irq_set_chip_and_handler(i, &int2_chip, + handle_level_irq); + set_irq_flags(i, IRQF_VALID | IRQF_PROBE); + } + } + + /* + * Disable interrupts + */ clps_writel(0, INTMR1); clps_writel(0, INTMR2); - clps_writel(0, INTMR3); - /* Clear down any pending interrupts */ - clps_writel(0, BLEOI); - clps_writel(0, MCEOI); + /* + * Clear down any pending interrupts + */ clps_writel(0, COEOI); clps_writel(0, TC1EOI); clps_writel(0, TC2EOI); clps_writel(0, RTCEOI); clps_writel(0, TEOI); clps_writel(0, UMSEOI); + clps_writel(0, SYNCIO); clps_writel(0, KBDEOI); - clps_writel(0, SRXEOF); - clps_writel(0xffffffff, DAISR); - - for (i = 0; i < ARRAY_SIZE(clps711x_irqdescs); i++) { - irq_set_chip_and_handler(clps711x_irqdescs[i].nr, - clps711x_irqdescs[i].chip, - clps711x_irqdescs[i].handle); - set_irq_flags(clps711x_irqdescs[i].nr, - IRQF_VALID | IRQF_PROBE); - } } -static void clps711x_clockevent_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +/* + * gettimeoffset() returns time since last timer tick, in usecs. + * + * 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy. + * 'tick' is usecs per jiffy. + */ +static unsigned long clps711x_gettimeoffset(void) { + unsigned long hwticks; + hwticks = latch - (clps_readl(TC2D) & 0xffff); + return (hwticks * (tick_nsec / 1000)) / latch; } -static struct clock_event_device clockevent_clps711x = { - .name = "CLPS711x Clockevents", - .rating = 300, - .features = CLOCK_EVT_FEAT_PERIODIC, - .set_mode = clps711x_clockevent_set_mode, -}; - -static irqreturn_t clps711x_timer_interrupt(int irq, void *dev_id) +/* + * IRQ handler for the timer + */ +static irqreturn_t p720t_timer_interrupt(int irq, void *dev_id) { - clockevent_clps711x.event_handler(&clockevent_clps711x); - + timer_tick(); return IRQ_HANDLED; } static struct irqaction clps711x_timer_irq = { .name = "CLPS711x Timer Tick", .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, - .handler = clps711x_timer_interrupt, + .handler = p720t_timer_interrupt, }; static void add_fixed_clk(struct clk *clk, const char *name, int rate) @@ -274,19 +244,20 @@ static void __init clps711x_timer_init(void) pr_info("CPU frequency set at %i Hz.\n", cpu); - clps_writew(DIV_ROUND_CLOSEST(timh, HZ), TC2D); + latch = (timh + HZ / 2) / HZ; tmp = clps_readl(SYSCON1); tmp |= SYSCON1_TC2S | SYSCON1_TC2M; clps_writel(tmp, SYSCON1); - clockevents_config_and_register(&clockevent_clps711x, timh, 1, 0xffff); + clps_writel(latch - 1, TC2D); setup_irq(IRQ_TC2OI, &clps711x_timer_irq); } struct sys_timer clps711x_timer = { .init = clps711x_timer_init, + .offset = clps711x_gettimeoffset, }; void clps711x_restart(char mode, const char *cmd) diff --git a/trunk/arch/arm/mach-clps711x/edb7211.c b/trunk/arch/arm/mach-clps711x/edb7211-arch.c similarity index 56% rename from trunk/arch/arm/mach-clps711x/edb7211.c rename to trunk/arch/arm/mach-clps711x/edb7211-arch.c index 88f46908de24..5fad0b4f40ad 100644 --- a/trunk/arch/arm/mach-clps711x/edb7211.c +++ b/trunk/arch/arm/mach-clps711x/edb7211-arch.c @@ -1,61 +1,39 @@ /* + * linux/arch/arm/mach-clps711x/arch-edb7211.c + * * Copyright (C) 2000, 2001 Blue Mug, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include #include #include +#include #include -#include -#include #include - -#include +#include #include "common.h" -#define VIDEORAM_SIZE SZ_128K - -static struct map_desc edb7211_io_desc[] __initdata = { - { /* Memory-mapped extra keyboard row */ - .virtual = IO_ADDRESS(EP7211_PHYS_EXTKBD), - .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD), - .length = SZ_1M, - .type = MT_DEVICE, - }, { /* CS8900A Ethernet chip */ - .virtual = IO_ADDRESS(EP7211_PHYS_CS8900A), - .pfn = __phys_to_pfn(EP7211_PHYS_CS8900A), - .length = SZ_1M, - .type = MT_DEVICE, - }, { /* Flash bank 0 */ - .virtual = IO_ADDRESS(EP7211_PHYS_FLASH1), - .pfn = __phys_to_pfn(EP7211_PHYS_FLASH1), - .length = SZ_8M, - .type = MT_DEVICE, - }, { /* Flash bank 1 */ - .virtual = IO_ADDRESS(EP7211_PHYS_FLASH2), - .pfn = __phys_to_pfn(EP7211_PHYS_FLASH2), - .length = SZ_8M, - .type = MT_DEVICE, - }, -}; - -void __init edb7211_map_io(void) -{ - clps711x_map_io(); - iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc)); -} +extern void edb7211_map_io(void); /* Reserve screen memory region at the start of main system memory. */ static void __init edb7211_reserve(void) { - memblock_reserve(PHYS_OFFSET, VIDEORAM_SIZE); + memblock_reserve(PHYS_OFFSET, 0x00020000); } static void __init @@ -70,15 +48,15 @@ fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi) * not using that information yet. */ mi->bank[0].start = 0xc0000000; - mi->bank[0].size = SZ_8M; + mi->bank[0].size = 8*1024*1024; mi->bank[1].start = 0xc1000000; - mi->bank[1].size = SZ_8M; + mi->bank[1].size = 8*1024*1024; mi->nr_banks = 2; } MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") /* Maintainer: Jon McClintock */ - .atag_offset = VIDEORAM_SIZE + 0x100, + .atag_offset = 0x20100, /* 0xc0000000 - 0xc001ffff can be video RAM */ .fixup = fixup_edb7211, .map_io = edb7211_map_io, .reserve = edb7211_reserve, diff --git a/trunk/arch/arm/mach-clps711x/edb7211-mm.c b/trunk/arch/arm/mach-clps711x/edb7211-mm.c new file mode 100644 index 000000000000..4372f06c9929 --- /dev/null +++ b/trunk/arch/arm/mach-clps711x/edb7211-mm.c @@ -0,0 +1,82 @@ +/* + * linux/arch/arm/mach-clps711x/mm.c + * + * Extra MM routines for the EDB7211 board + * + * Copyright (C) 2000, 2001 Blue Mug, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include + +#include +#include +#include + +#include + +extern void clps711x_map_io(void); + +/* + * The on-chip registers are given a size of 1MB so that a section can + * be used to map them; this saves a page table. This is the place to + * add mappings for ROM, expansion memory, PCMCIA, etc. (if static + * mappings are chosen for those areas). + * + * Here is a physical memory map (to be fleshed out later): + * + * Physical Address Size Description + * ----------------- ----- --------------------------------- + * c0000000-c001ffff 128KB reserved for video RAM [1] + * c0020000-c0023fff 16KB parameters (see Documentation/arm/Setup) + * c0024000-c0027fff 16KB swapper_pg_dir (task 0 page directory) + * c0028000-... kernel image (TEXTADDR) + * + * [1] Unused pages should be given back to the VM; they are not yet. + * The parameter block should also be released (not sure if this + * happens). + */ +static struct map_desc edb7211_io_desc[] __initdata = { + { /* memory-mapped extra keyboard row */ + .virtual = EP7211_VIRT_EXTKBD, + .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD), + .length = SZ_1M, + .type = MT_DEVICE, + }, { /* and CS8900A Ethernet chip */ + .virtual = EP7211_VIRT_CS8900A, + .pfn = __phys_to_pfn(EP7211_PHYS_CS8900A), + .length = SZ_1M, + .type = MT_DEVICE, + }, { /* flash banks */ + .virtual = EP7211_VIRT_FLASH1, + .pfn = __phys_to_pfn(EP7211_PHYS_FLASH1), + .length = SZ_8M, + .type = MT_DEVICE, + }, { + .virtual = EP7211_VIRT_FLASH2, + .pfn = __phys_to_pfn(EP7211_PHYS_FLASH2), + .length = SZ_8M, + .type = MT_DEVICE, + } +}; + +void __init edb7211_map_io(void) +{ + clps711x_map_io(); + iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc)); +} + diff --git a/trunk/arch/arm/mach-clps711x/include/mach/autcpu12.h b/trunk/arch/arm/mach-clps711x/include/mach/autcpu12.h index f95ce6f29119..1588a365f610 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/autcpu12.h +++ b/trunk/arch/arm/mach-clps711x/include/mach/autcpu12.h @@ -20,8 +20,12 @@ #ifndef __ASM_ARCH_AUTCPU12_H #define __ASM_ARCH_AUTCPU12_H -/* The CS8900A ethernet chip has its I/O registers wired to chip select 2 */ -#define AUTCPU12_PHYS_CS8900A CS2_PHYS_BASE +/* + * The CS8900A ethernet chip has its I/O registers wired to chip select 2 + * (nCS2). This is the mapping for it. + */ +#define AUTCPU12_PHYS_CS8900A CS2_PHYS_BASE /* physical */ +#define AUTCPU12_VIRT_CS8900A (0xfe000000) /* virtual */ /* * The flash bank is wired to chip select 0 @@ -30,9 +34,11 @@ /* offset for device specific information structure */ #define AUTCPU12_LCDINFO_OFFS (0x00010000) - -/* Videomemory in the internal SRAM (CS 6) */ +/* +* Videomemory is the internal SRAM (CS 6) +*/ #define AUTCPU12_PHYS_VIDEO CS6_PHYS_BASE +#define AUTCPU12_VIRT_VIDEO (0xfd000000) /* * All special IO's are tied to CS1 diff --git a/trunk/arch/arm/mach-clps711x/include/mach/clps711x.h b/trunk/arch/arm/mach-clps711x/include/mach/clps711x.h index aee352c00a1f..c82e21ca49c7 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/clps711x.h +++ b/trunk/arch/arm/mach-clps711x/include/mach/clps711x.h @@ -257,9 +257,6 @@ #define MEMCFG_BUS_WIDTH_16 (0) #define MEMCFG_BUS_WIDTH_8 (3) -#define MEMCFG_SQAEN (1 << 6) -#define MEMCFG_CLKENB (1 << 7) - #define MEMCFG_WAITSTATE_8_3 (0 << 2) #define MEMCFG_WAITSTATE_7_3 (1 << 2) #define MEMCFG_WAITSTATE_6_3 (2 << 2) diff --git a/trunk/arch/arm/mach-clps711x/include/mach/hardware.h b/trunk/arch/arm/mach-clps711x/include/mach/hardware.h index 0a3df25ffea7..8497775d6ee5 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/hardware.h +++ b/trunk/arch/arm/mach-clps711x/include/mach/hardware.h @@ -24,10 +24,7 @@ #include -#define IO_ADDRESS(x) (0xdc000000 + (((x) & 0x03ffffff) | \ - (((x) >> 2) & 0x3c000000))) - -#define CLPS711X_VIRT_BASE IOMEM(IO_ADDRESS(CLPS711X_PHYS_BASE)) +#define CLPS711X_VIRT_BASE IOMEM(0xff000000) #ifndef __ASSEMBLY__ #define clps_readb(off) readb(CLPS711X_VIRT_BASE + (off)) @@ -64,25 +61,58 @@ #define CS7_PHYS_BASE (0x00000000) #endif +#define SYSPLD_VIRT_BASE 0xfe000000 +#define SYSPLD_BASE SYSPLD_VIRT_BASE + #if defined (CONFIG_ARCH_CDB89712) -#define ETHER_PHYS_BASE CS2_PHYS_BASE -#define ETHER_SIZE 0x1000 +#define ETHER_START 0x20000000 +#define ETHER_SIZE 0x1000 +#define ETHER_BASE 0xfe000000 #endif #if defined (CONFIG_ARCH_EDB7211) -/* The extra 8 lines of the keyboard matrix are wired to chip select 3 */ -#define EP7211_PHYS_EXTKBD CS3_PHYS_BASE +/* + * The extra 8 lines of the keyboard matrix are wired to chip select 3 (nCS3) + * and repeat across it. This is the mapping for it. + * + * In jumpered boot mode, nCS3 is mapped to 0x4000000, not 0x3000000. This + * was cause for much consternation and headscratching. This should probably + * be made a compile/run time kernel option. + */ +#define EP7211_PHYS_EXTKBD CS3_PHYS_BASE /* physical */ + +#define EP7211_VIRT_EXTKBD (0xfd000000) /* virtual */ + + +/* + * The CS8900A ethernet chip has its I/O registers wired to chip select 2 + * (nCS2). This is the mapping for it. + * + * In jumpered boot mode, nCS2 is mapped to 0x5000000, not 0x2000000. This + * was cause for much consternation and headscratching. This should probably + * be made a compile/run time kernel option. + */ +#define EP7211_PHYS_CS8900A CS2_PHYS_BASE /* physical */ + +#define EP7211_VIRT_CS8900A (0xfc000000) /* virtual */ -/* The CS8900A ethernet chip has its I/O registers wired to chip select 2 */ -#define EP7211_PHYS_CS8900A CS2_PHYS_BASE -/* The two flash banks are wired to chip selects 0 and 1 */ -#define EP7211_PHYS_FLASH1 CS0_PHYS_BASE -#define EP7211_PHYS_FLASH2 CS1_PHYS_BASE +/* + * The two flash banks are wired to chip selects 0 and 1. This is the mapping + * for them. + * + * nCS0 and nCS1 are at 0x70000000 and 0x60000000, respectively, when running + * in jumpered boot mode. + */ +#define EP7211_PHYS_FLASH1 CS0_PHYS_BASE /* physical */ +#define EP7211_PHYS_FLASH2 CS1_PHYS_BASE /* physical */ + +#define EP7211_VIRT_FLASH1 (0xfa000000) /* virtual */ +#define EP7211_VIRT_FLASH2 (0xfb000000) /* virtual */ #endif /* CONFIG_ARCH_EDB7211 */ diff --git a/trunk/arch/arm/mach-clps711x/include/mach/irqs.h b/trunk/arch/arm/mach-clps711x/include/mach/irqs.h index 1ea56db2fd5f..14d215f8ca81 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/irqs.h +++ b/trunk/arch/arm/mach-clps711x/include/mach/irqs.h @@ -34,6 +34,8 @@ #define IRQ_UMSINT 14 #define IRQ_SSEOTI 15 +#define INT1_IRQS (0x0000fff0) + /* * Interrupts from INTSR2 */ @@ -43,4 +45,6 @@ #define IRQ_UTXINT2 (16+12) /* bit 12 */ #define IRQ_URXINT2 (16+13) /* bit 13 */ +#define INT2_IRQS (0x30070000) + #define NR_IRQS 30 diff --git a/trunk/arch/arm/mach-clps711x/include/mach/syspld.h b/trunk/arch/arm/mach-clps711x/include/mach/syspld.h index 9a433155bf58..f7f4c1201898 100644 --- a/trunk/arch/arm/mach-clps711x/include/mach/syspld.h +++ b/trunk/arch/arm/mach-clps711x/include/mach/syspld.h @@ -23,9 +23,14 @@ #define __ASM_ARCH_SYSPLD_H #define SYSPLD_PHYS_BASE (0x10000000) -#define SYSPLD_VIRT_BASE IO_ADDRESS(SYSPLD_PHYS_BASE) -#define SYSPLD_REG(type, off) (*(volatile type *)(SYSPLD_VIRT_BASE + (off))) +#ifndef __ASSEMBLY__ +#include + +#define SYSPLD_REG(type,off) (*(volatile type *)(SYSPLD_BASE + off)) +#else +#define SYSPLD_REG(type,off) (off) +#endif #define PLD_INT SYSPLD_REG(u32, 0x000000) #define PLD_INT_PENIRQ (1 << 5) diff --git a/trunk/arch/arm/mach-clps711x/p720t.c b/trunk/arch/arm/mach-clps711x/p720t.c index dd8995027dd4..b752b586fc2f 100644 --- a/trunk/arch/arm/mach-clps711x/p720t.c +++ b/trunk/arch/arm/mach-clps711x/p720t.c @@ -36,19 +36,27 @@ #include #include +#include + #include "common.h" /* - * Map the P720T system PLD. It occupies two address spaces: - * 0x10000000 and 0x10400000. We map both regions as one. + * Map the P720T system PLD. It occupies two address spaces: + * SYSPLD_PHYS_BASE and SYSPLD_PHYS_BASE + 0x00400000 + * We map both here. */ static struct map_desc p720t_io_desc[] __initdata = { { .virtual = SYSPLD_VIRT_BASE, .pfn = __phys_to_pfn(SYSPLD_PHYS_BASE), - .length = SZ_8M, - .type = MT_DEVICE, - }, + .length = SZ_1M, + .type = MT_DEVICE + }, { + .virtual = 0xfe400000, + .pfn = __phys_to_pfn(0x10400000), + .length = SZ_1M, + .type = MT_DEVICE + } }; static void __init diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c index f723fe13d0f0..b37bef1d5ffa 100644 --- a/trunk/arch/arm/mach-dove/common.c +++ b/trunk/arch/arm/mach-dove/common.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include "common.h" @@ -110,8 +109,8 @@ static void __init dove_clk_init(void) orion_clkdev_add(NULL, "orion-ehci.0", usb0); orion_clkdev_add(NULL, "orion-ehci.1", usb1); - orion_clkdev_add(NULL, "mv643xx_eth_port.0", ge); - orion_clkdev_add(NULL, "sata_mv.0", sata); + orion_clkdev_add(NULL, "mv643xx_eth.0", ge); + orion_clkdev_add("0", "sata_mv.0", sata); orion_clkdev_add("0", "pcie", pex0); orion_clkdev_add("1", "pcie", pex1); orion_clkdev_add(NULL, "sdhci-dove.0", sdio0); @@ -400,7 +399,7 @@ static void __init dove_dt_init(void) (dove_tclk + 499999) / 1000000); #ifdef CONFIG_CACHE_TAUROS2 - tauros2_init(0); + tauros2_init(); #endif dove_setup_cpu_mbus(); @@ -416,6 +415,7 @@ static void __init dove_dt_init(void) dove_ehci0_init(); dove_ehci1_init(); dove_pcie_init(1, 1); + dove_crypto_init(); of_platform_populate(NULL, of_default_bus_match_table, dove_auxdata_lookup, NULL); diff --git a/trunk/arch/arm/mach-dove/pcie.c b/trunk/arch/arm/mach-dove/pcie.c index 0ef4435b1657..bb15b26041cb 100644 --- a/trunk/arch/arm/mach-dove/pcie.c +++ b/trunk/arch/arm/mach-dove/pcie.c @@ -10,7 +10,6 @@ #include #include -#include #include