From 5d1e7cb6a3e4d3b8219cff44a52a9e447c24d62c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 2 May 2012 16:54:43 -0700 Subject: [PATCH] --- yaml --- r: 305875 b: refs/heads/master c: 62a9aebc5b8e28073a8609b9af6e8321cc622344 h: refs/heads/master i: 305873: 22e496269dfe8b0a0e4048bf8d001d520e4f828e 305871: fdfde209ab0324f2b12030f76db91abde49f4284 v: v3 --- [refs] | 2 +- .../ABI/testing/debugfs-pfo-nx-crypto | 45 - .../ABI/testing/sysfs-devices-power | 35 +- trunk/Documentation/ABI/testing/sysfs-power | 59 - .../bindings/sound/imx-audio-sgtl5000.txt | 49 - .../bindings/sound/mxs-audio-sgtl5000.txt | 17 - .../devicetree/bindings/sound/mxs-saif.txt | 36 - .../bindings/sound/nvidia,tegra30-ahub.txt | 32 - .../bindings/sound/nvidia,tegra30-i2s.txt | 15 - .../bindings/sound/tegra-audio-trimslice.txt | 14 - .../bindings/sound/tegra-audio-wm8753.txt | 54 - trunk/Documentation/hwmon/ina2xx | 29 - trunk/Documentation/hwmon/it87 | 28 +- trunk/Documentation/kernel-parameters.txt | 2 - .../power/suspend-and-cpuhotplug.txt | 2 +- .../sound/alsa/ALSA-Configuration.txt | 2 +- trunk/MAINTAINERS | 8 +- trunk/Makefile | 20 - trunk/arch/alpha/include/asm/processor.h | 3 + trunk/arch/arm/include/asm/processor.h | 3 + trunk/arch/arm/mach-imx/Kconfig | 2 - trunk/arch/arm/mach-imx/mach-mx31_3ds.c | 22 +- trunk/arch/arm/mach-imx/mach-mx31moboard.c | 20 +- trunk/arch/arm/mach-shmobile/Kconfig | 2 - trunk/arch/arm/mach-shmobile/board-ap4evb.c | 35 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 35 +- trunk/arch/arm/mach-tegra/board-dt-tegra20.c | 6 +- trunk/arch/arm/mach-tegra/board-harmony.c | 1 + trunk/arch/arm/mach-tegra/board-seaboard.c | 1 + trunk/arch/arm/mach-tegra/board-trimslice.c | 1 + trunk/arch/arm/mach-tegra/devices.c | 11 +- trunk/arch/arm/mach-tegra/devices.h | 1 + trunk/arch/arm/mach-tegra/tegra2_clocks.c | 4 +- trunk/arch/avr32/include/asm/processor.h | 3 + trunk/arch/blackfin/include/asm/processor.h | 2 + trunk/arch/c6x/include/asm/processor.h | 3 + trunk/arch/cris/include/asm/processor.h | 4 + trunk/arch/frv/include/asm/processor.h | 2 + trunk/arch/frv/kernel/process.c | 11 + trunk/arch/h8300/include/asm/processor.h | 2 + trunk/arch/hexagon/Kconfig | 21 +- trunk/arch/hexagon/Makefile | 5 + trunk/arch/hexagon/include/asm/processor.h | 7 + .../arch/hexagon/include/asm/spinlock_types.h | 2 + trunk/arch/hexagon/kernel/dma.c | 2 +- trunk/arch/hexagon/kernel/time.c | 6 +- trunk/arch/hexagon/mm/vm_fault.c | 22 +- trunk/arch/ia64/include/asm/Kbuild | 1 - trunk/arch/ia64/include/asm/processor.h | 8 +- trunk/arch/ia64/kernel/fsys.S | 191 +- trunk/arch/m32r/include/asm/processor.h | 2 + trunk/arch/m68k/include/asm/processor.h | 3 + trunk/arch/microblaze/include/asm/processor.h | 1 + trunk/arch/mips/Kconfig | 1 - trunk/arch/mips/include/asm/processor.h | 3 + trunk/arch/mn10300/include/asm/processor.h | 3 + trunk/arch/mn10300/kernel/process.c | 10 +- trunk/arch/openrisc/include/asm/processor.h | 4 + trunk/arch/parisc/include/asm/kbdleds.h | 19 - trunk/arch/parisc/include/asm/processor.h | 3 + trunk/arch/powerpc/Kconfig | 4 +- trunk/arch/powerpc/Makefile | 49 +- trunk/arch/powerpc/boot/dts/bluestone.dts | 25 - .../configs/86xx/mpc8610_hpcd_defconfig | 1 - trunk/arch/powerpc/configs/g5_defconfig | 1 + trunk/arch/powerpc/configs/maple_defconfig | 1 + trunk/arch/powerpc/configs/mpc85xx_defconfig | 1 - .../powerpc/configs/mpc85xx_smp_defconfig | 1 - trunk/arch/powerpc/configs/pasemi_defconfig | 1 + trunk/arch/powerpc/configs/ps3_defconfig | 6 + trunk/arch/powerpc/include/asm/asm-compat.h | 11 +- trunk/arch/powerpc/include/asm/cputhreads.h | 2 +- trunk/arch/powerpc/include/asm/hvcall.h | 25 +- trunk/arch/powerpc/include/asm/lppaca.h | 196 +- trunk/arch/powerpc/include/asm/lv1call.h | 4 +- .../powerpc/include/asm/pSeries_reconfig.h | 12 - trunk/arch/powerpc/include/asm/ppc_asm.h | 10 +- trunk/arch/powerpc/include/asm/processor.h | 3 + trunk/arch/powerpc/include/asm/ptrace.h | 6 + trunk/arch/powerpc/include/asm/switch_to.h | 6 +- trunk/arch/powerpc/include/asm/thread_info.h | 1 + trunk/arch/powerpc/include/asm/vio.h | 46 - trunk/arch/powerpc/kernel/asm-offsets.c | 4 + trunk/arch/powerpc/kernel/entry_64.S | 30 +- trunk/arch/powerpc/kernel/exceptions-64s.S | 4 + trunk/arch/powerpc/kernel/head_44x.S | 8 + trunk/arch/powerpc/kernel/head_fsl_booke.S | 8 + trunk/arch/powerpc/kernel/irq.c | 2 +- trunk/arch/powerpc/kernel/misc_32.S | 203 +- trunk/arch/powerpc/kernel/paca.c | 3 + trunk/arch/powerpc/kernel/process.c | 21 +- trunk/arch/powerpc/kernel/prom_init.c | 17 +- trunk/arch/powerpc/kernel/ptrace.c | 42 + trunk/arch/powerpc/kernel/ptrace32.c | 32 + trunk/arch/powerpc/kernel/vector.S | 10 - trunk/arch/powerpc/kernel/vio.c | 273 +- trunk/arch/powerpc/lib/copyuser_64.S | 6 +- trunk/arch/powerpc/lib/mem_64.S | 6 +- trunk/arch/powerpc/lib/memcpy_64.S | 6 +- trunk/arch/powerpc/platforms/44x/Kconfig | 2 - trunk/arch/powerpc/platforms/Kconfig.cputype | 39 +- .../arch/powerpc/platforms/powermac/low_i2c.c | 1 - trunk/arch/powerpc/platforms/ps3/Kconfig | 22 +- trunk/arch/powerpc/platforms/ps3/mm.c | 77 +- trunk/arch/powerpc/platforms/ps3/platform.h | 16 - trunk/arch/powerpc/platforms/ps3/repository.c | 198 -- trunk/arch/powerpc/platforms/pseries/eeh.c | 2 +- .../platforms/pseries/plpar_wrappers.h | 4 +- .../arch/powerpc/platforms/pseries/reconfig.c | 7 - trunk/arch/powerpc/sysdev/ppc4xx_msi.c | 42 +- trunk/arch/s390/include/asm/processor.h | 3 + trunk/arch/score/include/asm/processor.h | 1 + trunk/arch/sh/Kconfig | 45 +- trunk/arch/sh/Makefile | 4 - trunk/arch/sh/boards/Kconfig | 9 +- trunk/arch/sh/boards/board-edosk7705.c | 4 +- trunk/arch/sh/boards/board-edosk7760.c | 16 +- trunk/arch/sh/boards/board-espt.c | 3 +- trunk/arch/sh/boards/board-magicpanelr2.c | 27 +- trunk/arch/sh/boards/board-polaris.c | 1 + trunk/arch/sh/boards/board-secureedge5410.c | 1 + trunk/arch/sh/boards/board-sh7757lcr.c | 27 +- trunk/arch/sh/boards/board-sh7785lcr.c | 15 +- trunk/arch/sh/boards/board-urquell.c | 3 +- trunk/arch/sh/boards/mach-ap325rxa/setup.c | 15 +- trunk/arch/sh/boards/mach-cayman/setup.c | 1 + trunk/arch/sh/boards/mach-ecovec24/setup.c | 70 +- trunk/arch/sh/boards/mach-hp6xx/setup.c | 5 +- trunk/arch/sh/boards/mach-kfr2r09/setup.c | 15 +- trunk/arch/sh/boards/mach-lboxre2/setup.c | 1 + trunk/arch/sh/boards/mach-microdev/setup.c | 1 + trunk/arch/sh/boards/mach-migor/setup.c | 13 +- trunk/arch/sh/boards/mach-rsk/Kconfig | 10 - trunk/arch/sh/boards/mach-rsk/Makefile | 2 - .../arch/sh/boards/mach-rsk/devices-rsk7264.c | 58 - .../arch/sh/boards/mach-rsk/devices-rsk7269.c | 60 - trunk/arch/sh/boards/mach-sdk7780/setup.c | 1 + trunk/arch/sh/boards/mach-se/7206/setup.c | 1 + trunk/arch/sh/boards/mach-se/770x/setup.c | 11 + trunk/arch/sh/boards/mach-se/7721/setup.c | 1 + trunk/arch/sh/boards/mach-se/7722/setup.c | 3 +- trunk/arch/sh/boards/mach-se/7724/setup.c | 47 +- trunk/arch/sh/boards/mach-se/7751/setup.c | 1 + trunk/arch/sh/boards/mach-se/7780/setup.c | 1 + trunk/arch/sh/boards/mach-se/board-se7619.c | 1 + trunk/arch/sh/boards/mach-sh03/setup.c | 1 + trunk/arch/sh/boards/mach-sh7763rdp/setup.c | 6 +- trunk/arch/sh/configs/rsk7264_defconfig | 80 - trunk/arch/sh/configs/rsk7269_defconfig | 65 - trunk/arch/sh/drivers/dma/Kconfig | 17 + trunk/arch/sh/drivers/dma/dma-sh.c | 290 +- trunk/arch/sh/drivers/dma/dma-sysfs.c | 2 +- trunk/arch/sh/drivers/pci/fixups-landisk.c | 3 +- trunk/arch/sh/drivers/pci/fixups-r7780rp.c | 7 +- trunk/arch/sh/drivers/pci/fixups-sdk7780.c | 18 +- trunk/arch/sh/drivers/pci/fixups-se7751.c | 5 +- trunk/arch/sh/drivers/pci/fixups-sh03.c | 19 +- trunk/arch/sh/drivers/pci/fixups-snapgear.c | 11 +- trunk/arch/sh/drivers/pci/pcie-sh7786.c | 3 +- trunk/arch/sh/include/asm/dma-sh.h | 87 + trunk/arch/sh/include/asm/dma.h | 9 + trunk/arch/sh/include/asm/fixmap.h | 2 +- trunk/arch/sh/include/asm/i2c-sh7760.h | 2 + trunk/arch/sh/include/asm/io.h | 5 - trunk/arch/sh/include/asm/io_noioport.h | 41 - trunk/arch/sh/include/asm/irq.h | 13 +- trunk/arch/sh/include/asm/kdebug.h | 2 - trunk/arch/sh/include/asm/kgdb.h | 30 +- trunk/arch/sh/include/asm/machvec.h | 1 + trunk/arch/sh/include/asm/pgtable_64.h | 3 + trunk/arch/sh/include/asm/processor.h | 5 +- trunk/arch/sh/include/asm/processor_32.h | 3 + trunk/arch/sh/include/asm/processor_64.h | 4 + trunk/arch/sh/include/asm/stackprotector.h | 27 - trunk/arch/sh/include/asm/thread_info.h | 46 +- trunk/arch/sh/include/asm/traps_64.h | 14 - trunk/arch/sh/include/cpu-sh2/cpu/dma.h | 23 + trunk/arch/sh/include/cpu-sh2a/cpu/dma.h | 1 + trunk/arch/sh/include/cpu-sh2a/cpu/sh7264.h | 176 -- trunk/arch/sh/include/cpu-sh2a/cpu/sh7269.h | 201 -- trunk/arch/sh/include/cpu-sh3/cpu/dma.h | 13 +- trunk/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 83 + trunk/arch/sh/include/cpu-sh4/cpu/dma.h | 25 +- trunk/arch/sh/include/cpu-sh4/cpu/freq.h | 5 - trunk/arch/sh/include/cpu-sh4/cpu/sh7734.h | 306 -- trunk/arch/sh/include/cpu-sh4a/cpu/dma.h | 72 - trunk/arch/sh/include/cpu-sh5/cpu/dma.h | 6 + .../arch/sh/include/mach-common/mach/hp6xx.h | 7 +- .../sh/include/mach-common/mach/lboxre2.h | 13 +- .../sh/include/mach-common/mach/sdk7780.h | 5 +- .../arch/sh/include/mach-common/mach/titan.h | 12 +- .../arch/sh/include/mach-dreamcast/mach/dma.h | 2 + .../mach-landisk/mach/iodata_landisk.h | 19 +- trunk/arch/sh/include/mach-se/mach/se.h | 19 +- trunk/arch/sh/include/mach-se/mach/se7343.h | 9 +- trunk/arch/sh/include/mach-se/mach/se7721.h | 6 +- trunk/arch/sh/include/mach-se/mach/se7722.h | 9 +- trunk/arch/sh/include/mach-se/mach/se7724.h | 7 +- trunk/arch/sh/include/mach-se/mach/se7751.h | 3 +- trunk/arch/sh/include/mach-se/mach/se7780.h | 7 +- trunk/arch/sh/kernel/cpu/proc.c | 4 +- trunk/arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 +- trunk/arch/sh/kernel/cpu/sh2a/Makefile | 4 - trunk/arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 153 - trunk/arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 184 -- trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 2136 ------------- trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 2800 ----------------- trunk/arch/sh/kernel/cpu/sh2a/probe.c | 6 - trunk/arch/sh/kernel/cpu/sh2a/setup-mxg.c | 2 +- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 16 +- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 8 +- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 8 +- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 606 ---- trunk/arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 615 ---- trunk/arch/sh/kernel/cpu/sh3/entry.S | 11 +- trunk/arch/sh/kernel/cpu/sh3/setup-sh7705.c | 13 +- trunk/arch/sh/kernel/cpu/sh3/setup-sh770x.c | 15 +- trunk/arch/sh/kernel/cpu/sh3/setup-sh7710.c | 13 +- trunk/arch/sh/kernel/cpu/sh3/setup-sh7720.c | 32 +- trunk/arch/sh/kernel/cpu/sh4/probe.c | 3 - trunk/arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 12 +- trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c | 17 +- trunk/arch/sh/kernel/cpu/sh4/setup-sh7760.c | 26 +- trunk/arch/sh/kernel/cpu/sh4a/Makefile | 3 - trunk/arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 266 -- trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c | 2497 --------------- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 31 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 23 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 47 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 47 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 77 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 800 ----- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 90 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 30 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 39 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 37 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 43 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 47 +- trunk/arch/sh/kernel/cpu/sh4a/setup-shx3.c | 31 +- trunk/arch/sh/kernel/cpu/sh5/entry.S | 22 +- trunk/arch/sh/kernel/cpu/sh5/fpu.c | 3 + trunk/arch/sh/kernel/irq.c | 6 +- trunk/arch/sh/kernel/kgdb.c | 105 +- trunk/arch/sh/kernel/machvec.c | 3 + trunk/arch/sh/kernel/process.c | 14 - trunk/arch/sh/kernel/process_32.c | 14 +- trunk/arch/sh/kernel/traps_64.c | 2 + trunk/arch/sh/mm/Makefile | 8 +- trunk/arch/sh/mm/fault.c | 514 --- trunk/arch/sh/mm/fault_32.c | 374 +++ trunk/arch/sh/mm/fault_64.c | 265 ++ trunk/arch/sh/mm/tlb-sh5.c | 40 - trunk/arch/sh/mm/tlbex_32.c | 78 - trunk/arch/sh/mm/tlbex_64.c | 166 - trunk/arch/sh/mm/tlbflush_64.c | 294 +- trunk/arch/sh/tools/mach-types | 2 - trunk/arch/sparc/include/asm/processor_32.h | 3 + trunk/arch/sparc/include/asm/processor_64.h | 3 + trunk/arch/tile/include/asm/processor.h | 3 + trunk/arch/um/Kconfig.common | 5 + trunk/arch/um/defconfig | 1 + trunk/arch/um/drivers/chan_kern.c | 9 +- trunk/arch/um/drivers/line.c | 2 +- trunk/arch/um/drivers/net_kern.c | 4 +- trunk/arch/um/drivers/port_kern.c | 2 +- trunk/arch/um/drivers/xterm_kern.c | 2 +- trunk/arch/um/include/asm/pgtable.h | 10 +- trunk/arch/um/include/asm/processor-generic.h | 5 + trunk/arch/um/include/asm/thread_info.h | 2 +- trunk/arch/um/include/shared/irq_kern.h | 2 +- trunk/arch/um/kernel/irq.c | 9 +- trunk/arch/um/kernel/process.c | 10 +- trunk/arch/um/kernel/signal.c | 14 +- trunk/arch/um/kernel/skas/syscall.c | 2 +- trunk/arch/um/kernel/tlb.c | 1 - trunk/arch/um/os-Linux/skas/mem.c | 10 + trunk/arch/unicore32/include/asm/processor.h | 3 + trunk/arch/x86/Kconfig | 40 +- trunk/arch/x86/Makefile | 1 - trunk/arch/x86/boot/compressed/eboot.c | 14 +- trunk/arch/x86/boot/header.S | 26 +- trunk/arch/x86/boot/main.c | 18 +- trunk/arch/x86/boot/tools/build.c | 24 +- trunk/arch/x86/ia32/ia32entry.S | 9 +- trunk/arch/x86/ia32/sys_ia32.c | 23 + trunk/arch/x86/include/asm/asm.h | 38 +- trunk/arch/x86/include/asm/bootparam.h | 3 +- trunk/arch/x86/include/asm/device.h | 4 +- trunk/arch/x86/include/asm/dma-mapping.h | 9 +- trunk/arch/x86/include/asm/kbdleds.h | 17 - trunk/arch/x86/include/asm/kdebug.h | 1 + trunk/arch/x86/include/asm/kvm_host.h | 5 +- trunk/arch/x86/include/asm/mmzone_32.h | 6 + trunk/arch/x86/include/asm/msr.h | 9 +- trunk/arch/x86/include/asm/nops.h | 4 - trunk/arch/x86/include/asm/paravirt.h | 6 +- trunk/arch/x86/include/asm/processor.h | 3 + trunk/arch/x86/include/asm/segment.h | 4 +- trunk/arch/x86/include/asm/spinlock.h | 2 + trunk/arch/x86/include/asm/tlbflush.h | 6 +- trunk/arch/x86/include/asm/uaccess.h | 25 +- trunk/arch/x86/include/asm/xsave.h | 10 +- trunk/arch/x86/kernel/check.c | 20 +- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- trunk/arch/x86/kernel/cpu/mcheck/mce.c | 37 - trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 65 +- trunk/arch/x86/kernel/cpu/perf_event_amd.c | 11 +- trunk/arch/x86/kernel/dumpstack.c | 23 +- trunk/arch/x86/kernel/dumpstack_32.c | 2 +- trunk/arch/x86/kernel/dumpstack_64.c | 2 +- trunk/arch/x86/kernel/entry_32.S | 47 +- trunk/arch/x86/kernel/entry_64.S | 16 +- trunk/arch/x86/kernel/head_32.S | 223 +- trunk/arch/x86/kernel/head_64.S | 80 +- trunk/arch/x86/kernel/kprobes.c | 4 +- trunk/arch/x86/kernel/microcode_core.c | 9 +- trunk/arch/x86/kernel/nmi.c | 2 +- trunk/arch/x86/kernel/nmi_selftest.c | 12 +- trunk/arch/x86/kernel/pci-calgary_64.c | 8 +- trunk/arch/x86/kernel/process.c | 29 +- trunk/arch/x86/kernel/process_32.c | 9 + trunk/arch/x86/kernel/process_64.c | 9 + trunk/arch/x86/kernel/reboot.c | 277 +- trunk/arch/x86/kernel/setup.c | 7 +- trunk/arch/x86/kernel/smp.c | 100 +- trunk/arch/x86/kernel/test_rodata.c | 10 +- trunk/arch/x86/kernel/vsmp_64.c | 40 - trunk/arch/x86/kernel/xsave.c | 2 + trunk/arch/x86/lib/checksum_32.S | 9 +- trunk/arch/x86/lib/copy_user_64.S | 63 +- trunk/arch/x86/lib/copy_user_nocache_64.S | 50 +- trunk/arch/x86/lib/csum-copy_64.S | 16 +- trunk/arch/x86/lib/getuser.S | 9 +- trunk/arch/x86/lib/putuser.S | 12 +- trunk/arch/x86/lib/usercopy_32.c | 232 +- trunk/arch/x86/mm/extable.c | 142 +- trunk/arch/x86/mm/init.c | 21 +- trunk/arch/x86/mm/init_64.c | 23 +- trunk/arch/x86/mm/tlb.c | 8 +- trunk/arch/x86/pci/Makefile | 2 - trunk/arch/x86/pci/fixup.c | 17 - trunk/arch/x86/pci/sta2x11-fixup.c | 366 --- trunk/arch/x86/platform/olpc/olpc-xo1-sci.c | 43 +- trunk/arch/x86/um/asm/elf.h | 42 +- trunk/arch/x86/um/asm/ptrace.h | 34 - trunk/arch/x86/um/asm/ptrace_32.h | 23 + trunk/arch/x86/um/asm/ptrace_64.h | 26 + trunk/arch/x86/um/checksum_32.S | 9 +- trunk/arch/x86/um/shared/sysdep/ptrace.h | 67 +- trunk/arch/x86/um/shared/sysdep/ptrace_32.h | 92 +- trunk/arch/x86/um/shared/sysdep/ptrace_64.h | 101 +- trunk/arch/x86/um/signal.c | 29 +- trunk/arch/x86/um/sys_call_table_64.c | 1 + trunk/arch/x86/um/syscalls_32.c | 12 +- trunk/arch/x86/um/sysrq_32.c | 8 +- trunk/arch/x86/um/sysrq_64.c | 8 +- trunk/arch/x86/um/tls_32.c | 2 +- trunk/arch/x86/xen/xen-asm_32.S | 6 +- trunk/arch/xtensa/include/asm/processor.h | 3 + trunk/arch/xtensa/kernel/process.c | 9 +- trunk/drivers/ata/Kconfig | 9 - trunk/drivers/ata/Makefile | 1 - trunk/drivers/ata/ata_generic.c | 2 +- trunk/drivers/ata/ata_piix.c | 36 - trunk/drivers/ata/libata-core.c | 7 - trunk/drivers/ata/libata-eh.c | 24 +- trunk/drivers/ata/pata_ep93xx.c | 1044 ------ trunk/drivers/base/power/domain.c | 176 +- trunk/drivers/base/power/domain_governor.c | 166 +- trunk/drivers/base/power/main.c | 10 - trunk/drivers/base/power/qos.c | 19 +- trunk/drivers/base/power/runtime.c | 103 +- trunk/drivers/base/power/sysfs.c | 54 +- trunk/drivers/base/power/wakeup.c | 174 +- trunk/drivers/base/regmap/Kconfig | 1 - trunk/drivers/char/hw_random/Kconfig | 13 - trunk/drivers/char/hw_random/Makefile | 1 - trunk/drivers/char/hw_random/pseries-rng.c | 96 - trunk/drivers/crypto/Kconfig | 17 - trunk/drivers/crypto/nx/Makefile | 11 - trunk/drivers/crypto/nx/nx-aes-cbc.c | 141 - trunk/drivers/crypto/nx/nx-aes-ccm.c | 468 --- trunk/drivers/crypto/nx/nx-aes-ctr.c | 178 -- trunk/drivers/crypto/nx/nx-aes-ecb.c | 139 - trunk/drivers/crypto/nx/nx-aes-gcm.c | 353 --- trunk/drivers/crypto/nx/nx-aes-xcbc.c | 236 -- trunk/drivers/crypto/nx/nx-sha256.c | 246 -- trunk/drivers/crypto/nx/nx-sha512.c | 265 -- trunk/drivers/crypto/nx/nx.c | 716 ----- trunk/drivers/crypto/nx/nx.h | 193 -- trunk/drivers/crypto/nx/nx_csbcpb.h | 205 -- trunk/drivers/crypto/nx/nx_debugfs.c | 103 - trunk/drivers/devfreq/governor_performance.c | 7 - trunk/drivers/devfreq/governor_powersave.c | 7 - trunk/drivers/hwmon/Kconfig | 13 - trunk/drivers/hwmon/Makefile | 1 - trunk/drivers/hwmon/acpi_power_meter.c | 166 +- trunk/drivers/hwmon/ad7314.c | 11 +- trunk/drivers/hwmon/fam15h_power.c | 13 +- trunk/drivers/hwmon/ina2xx.c | 368 --- trunk/drivers/hwmon/it87.c | 384 +-- trunk/drivers/hwmon/k10temp.c | 13 +- trunk/drivers/hwmon/k8temp.c | 13 +- trunk/drivers/hwmon/ntc_thermistor.c | 191 +- trunk/drivers/i2c/busses/i2c-powermac.c | 98 +- trunk/drivers/macintosh/Kconfig | 23 +- trunk/drivers/macintosh/Makefile | 14 - trunk/drivers/macintosh/ams/ams-i2c.c | 2 +- trunk/drivers/macintosh/therm_adt746x.c | 480 +-- trunk/drivers/macintosh/windfarm.h | 51 +- .../macintosh/windfarm_ad7417_sensor.c | 347 -- trunk/drivers/macintosh/windfarm_core.c | 23 +- .../macintosh/windfarm_cpufreq_clamp.c | 6 + .../drivers/macintosh/windfarm_fcu_controls.c | 613 ---- .../drivers/macintosh/windfarm_lm75_sensor.c | 135 +- .../drivers/macintosh/windfarm_lm87_sensor.c | 201 -- .../macintosh/windfarm_max6690_sensor.c | 109 +- trunk/drivers/macintosh/windfarm_mpu.h | 105 - trunk/drivers/macintosh/windfarm_pm72.c | 847 ----- trunk/drivers/macintosh/windfarm_pm81.c | 25 +- trunk/drivers/macintosh/windfarm_pm91.c | 33 +- trunk/drivers/macintosh/windfarm_rm31.c | 740 ----- .../drivers/macintosh/windfarm_smu_controls.c | 1 + trunk/drivers/macintosh/windfarm_smu_sat.c | 132 +- trunk/drivers/mfd/Kconfig | 3 + trunk/drivers/mfd/mc13xxx-core.c | 3 +- trunk/drivers/ps3/ps3av.c | 24 +- trunk/drivers/sh/clk/cpg.c | 77 +- trunk/drivers/sh/intc/dynamic.c | 8 + trunk/drivers/tty/serial/sh-sci.c | 49 +- trunk/drivers/tty/vt/keyboard.c | 20 +- trunk/drivers/watchdog/Kconfig | 1 - trunk/drivers/watchdog/shwdt.c | 306 +- trunk/drivers/watchdog/sp5100_tco.c | 2 +- trunk/fs/eventpoll.c | 90 +- trunk/fs/exec.c | 15 +- trunk/include/linux/capability.h | 5 +- trunk/include/linux/cs5535.h | 1 - trunk/include/linux/eventpoll.h | 12 - trunk/include/linux/irq.h | 5 + trunk/include/linux/libata.h | 1 - trunk/include/linux/mfd/mc13xxx.h | 11 - trunk/include/linux/perf_event.h | 24 +- trunk/include/linux/platform_data/ina2xx.h | 19 - trunk/include/linux/pm.h | 2 + trunk/include/linux/pm_domain.h | 13 +- trunk/include/linux/pm_runtime.h | 3 + trunk/include/linux/pm_wakeup.h | 15 +- trunk/include/linux/serial_sci.h | 2 - trunk/include/linux/sh_clk.h | 34 +- trunk/include/linux/sh_intc.h | 1 + trunk/include/linux/suspend.h | 14 +- trunk/include/sound/asound.h | 14 - trunk/include/sound/asoundef.h | 41 - trunk/include/sound/cs42l52.h | 36 - trunk/include/sound/max98095.h | 12 - trunk/include/sound/sh_fsi.h | 18 +- trunk/include/sound/simple_card.h | 38 - trunk/include/sound/soc-dai.h | 4 - trunk/include/sound/soc-dapm.h | 28 +- trunk/include/sound/soc-dpcm.h | 138 - trunk/include/sound/soc.h | 118 +- trunk/include/trace/events/asoc.h | 80 - trunk/include/trace/events/power.h | 34 - trunk/init/Kconfig | 3 - trunk/kernel/events/core.c | 14 +- trunk/kernel/extable.c | 8 +- trunk/kernel/fork.c | 2 + trunk/kernel/irq/manage.c | 6 + trunk/kernel/power/Kconfig | 27 - trunk/kernel/power/Makefile | 2 - trunk/kernel/power/autosleep.c | 127 - trunk/kernel/power/hibernate.c | 13 - trunk/kernel/power/main.c | 160 +- trunk/kernel/power/power.h | 27 - trunk/kernel/power/swap.c | 62 +- trunk/kernel/power/wakelock.c | 259 -- trunk/kernel/sched/core.c | 9 +- trunk/lib/Kconfig.debug | 9 - trunk/scripts/.gitignore | 1 - trunk/scripts/Makefile | 3 - trunk/scripts/sortextable.c | 322 -- trunk/scripts/sortextable.h | 191 -- trunk/sound/atmel/ac97c.c | 2 - trunk/sound/core/jack.c | 5 +- trunk/sound/core/pcm_lib.c | 18 +- trunk/sound/core/pcm_native.c | 12 +- trunk/sound/core/sound_oss.c | 6 +- trunk/sound/drivers/aloop.c | 62 +- trunk/sound/firewire/amdtp.c | 49 +- trunk/sound/firewire/amdtp.h | 29 +- trunk/sound/pci/Kconfig | 2 +- trunk/sound/pci/ad1889.c | 15 +- trunk/sound/pci/ali5451/ali5451.c | 15 +- trunk/sound/pci/als300.c | 15 +- trunk/sound/pci/als4000.c | 15 +- trunk/sound/pci/atiixp.c | 16 +- trunk/sound/pci/atiixp_modem.c | 16 +- trunk/sound/pci/au88x0/au88x0.c | 17 +- trunk/sound/pci/aw2/aw2-alsa.c | 23 +- trunk/sound/pci/azt3328.c | 23 +- trunk/sound/pci/bt87x.c | 19 +- trunk/sound/pci/ca0106/ca0106_main.c | 17 +- trunk/sound/pci/cmipci.c | 15 +- trunk/sound/pci/cs4281.c | 15 +- trunk/sound/pci/cs46xx/cs46xx.c | 15 +- trunk/sound/pci/cs5530.c | 16 +- trunk/sound/pci/cs5535audio/cs5535audio.c | 15 +- trunk/sound/pci/ctxfi/xfi.c | 13 +- trunk/sound/pci/echoaudio/echoaudio.c | 22 +- trunk/sound/pci/emu10k1/emu10k1.c | 15 +- trunk/sound/pci/emu10k1/emu10k1x.c | 17 +- trunk/sound/pci/ens1370.c | 15 +- trunk/sound/pci/es1938.c | 15 +- trunk/sound/pci/es1968.c | 15 +- trunk/sound/pci/fm801.c | 15 +- trunk/sound/pci/hda/Makefile | 2 +- trunk/sound/pci/hda/hda_auto_parser.c | 760 ----- trunk/sound/pci/hda/hda_auto_parser.h | 160 - trunk/sound/pci/hda/hda_codec.c | 1027 ++++-- trunk/sound/pci/hda/hda_codec.h | 15 +- trunk/sound/pci/hda/hda_intel.c | 57 +- trunk/sound/pci/hda/hda_jack.c | 1 - trunk/sound/pci/hda/hda_jack.h | 2 - trunk/sound/pci/hda/hda_local.h | 122 +- trunk/sound/pci/hda/patch_analog.c | 14 +- trunk/sound/pci/hda/patch_ca0110.c | 8 +- trunk/sound/pci/hda/patch_ca0132.c | 9 +- trunk/sound/pci/hda/patch_cirrus.c | 30 +- trunk/sound/pci/hda/patch_cmedia.c | 1 - trunk/sound/pci/hda/patch_conexant.c | 186 +- trunk/sound/pci/hda/patch_hdmi.c | 4 +- trunk/sound/pci/hda/patch_realtek.c | 465 ++- trunk/sound/pci/hda/patch_sigmatel.c | 120 +- trunk/sound/pci/hda/patch_via.c | 33 +- trunk/sound/pci/ice1712/ice1712.c | 15 +- trunk/sound/pci/ice1712/ice1724.c | 15 +- trunk/sound/pci/intel8x0.c | 16 +- trunk/sound/pci/intel8x0m.c | 16 +- trunk/sound/pci/korg1212/korg1212.c | 15 +- trunk/sound/pci/lola/lola.c | 15 +- trunk/sound/pci/lx6464es/lx6464es.c | 17 +- trunk/sound/pci/maestro3.c | 15 +- trunk/sound/pci/mixart/mixart.c | 15 +- trunk/sound/pci/nm256/nm256.c | 16 +- trunk/sound/pci/oxygen/oxygen.c | 21 +- trunk/sound/pci/oxygen/virtuoso.c | 13 +- trunk/sound/pci/oxygen/xonar_dg.c | 7 +- trunk/sound/pci/pcxhr/pcxhr.c | 15 +- trunk/sound/pci/riptide/riptide.c | 3 +- trunk/sound/pci/rme32.c | 15 +- trunk/sound/pci/rme96.c | 15 +- trunk/sound/pci/rme9652/hdsp.c | 15 +- trunk/sound/pci/rme9652/hdspm.c | 16 +- trunk/sound/pci/rme9652/rme9652.c | 15 +- trunk/sound/pci/sis7019.c | 13 +- trunk/sound/pci/sonicvibes.c | 15 +- trunk/sound/pci/trident/trident.c | 15 +- trunk/sound/pci/via82xx.c | 15 +- trunk/sound/pci/via82xx_modem.c | 15 +- trunk/sound/pci/vx222/vx222.c | 15 +- trunk/sound/pci/ymfpci/ymfpci.c | 15 +- trunk/sound/sh/sh_dac_audio.c | 4 +- trunk/sound/soc/Kconfig | 5 +- trunk/sound/soc/Makefile | 3 +- trunk/sound/soc/blackfin/bf5xx-ssm2602.c | 37 +- trunk/sound/soc/codecs/Kconfig | 20 - trunk/sound/soc/codecs/Makefile | 12 +- trunk/sound/soc/codecs/ac97.c | 6 +- trunk/sound/soc/codecs/ad1836.c | 4 +- trunk/sound/soc/codecs/ad193x.c | 4 +- trunk/sound/soc/codecs/adau1701.c | 3 +- trunk/sound/soc/codecs/ak4104.c | 3 +- trunk/sound/soc/codecs/ak4535.c | 3 +- trunk/sound/soc/codecs/ak4641.c | 113 +- trunk/sound/soc/codecs/alc5623.c | 23 +- trunk/sound/soc/codecs/alc5632.c | 31 +- trunk/sound/soc/codecs/cs4270.c | 11 +- trunk/sound/soc/codecs/cs4271.c | 3 +- trunk/sound/soc/codecs/cs42l51.c | 9 +- trunk/sound/soc/codecs/cs42l52.c | 1295 -------- trunk/sound/soc/codecs/cs42l52.h | 274 -- trunk/sound/soc/codecs/cs42l73.c | 93 +- trunk/sound/soc/codecs/da7210.c | 379 +-- trunk/sound/soc/codecs/jz4740.c | 3 +- trunk/sound/soc/codecs/lm49453.c | 1550 --------- trunk/sound/soc/codecs/lm49453.h | 380 --- trunk/sound/soc/codecs/max98095.c | 158 +- trunk/sound/soc/codecs/max98095.h | 22 - trunk/sound/soc/codecs/mc13783.c | 786 ----- trunk/sound/soc/codecs/mc13783.h | 28 - trunk/sound/soc/codecs/ml26124.c | 681 ---- trunk/sound/soc/codecs/ml26124.h | 184 -- trunk/sound/soc/codecs/omap-hdmi.c | 69 - trunk/sound/soc/codecs/rt5631.c | 110 +- trunk/sound/soc/codecs/sgtl5000.c | 25 +- trunk/sound/soc/codecs/ssm2602.c | 138 +- trunk/sound/soc/codecs/sta32x.c | 3 +- trunk/sound/soc/codecs/tlv320aic23.c | 13 +- trunk/sound/soc/codecs/tlv320aic26.c | 3 +- trunk/sound/soc/codecs/tlv320aic3x.c | 21 +- trunk/sound/soc/codecs/tlv320dac33.c | 35 +- trunk/sound/soc/codecs/twl4030.c | 18 +- trunk/sound/soc/codecs/twl6040.c | 450 ++- trunk/sound/soc/codecs/uda134x.c | 6 +- trunk/sound/soc/codecs/uda1380.c | 6 +- trunk/sound/soc/codecs/wl1273.c | 6 +- trunk/sound/soc/codecs/wm1250-ev1.c | 65 +- trunk/sound/soc/codecs/wm5100-tables.c | 125 +- trunk/sound/soc/codecs/wm5100.c | 47 +- trunk/sound/soc/codecs/wm5100.h | 159 - trunk/sound/soc/codecs/wm8350.c | 187 +- trunk/sound/soc/codecs/wm8400.c | 135 +- trunk/sound/soc/codecs/wm8510.c | 3 +- trunk/sound/soc/codecs/wm8523.c | 3 +- trunk/sound/soc/codecs/wm8728.c | 3 +- trunk/sound/soc/codecs/wm8731.c | 37 +- trunk/sound/soc/codecs/wm8737.c | 3 +- trunk/sound/soc/codecs/wm8741.c | 3 +- trunk/sound/soc/codecs/wm8750.c | 3 +- trunk/sound/soc/codecs/wm8753.c | 6 +- trunk/sound/soc/codecs/wm8900.c | 3 +- trunk/sound/soc/codecs/wm8903.c | 3 +- trunk/sound/soc/codecs/wm8940.c | 3 +- trunk/sound/soc/codecs/wm8960.c | 3 +- trunk/sound/soc/codecs/wm8962.c | 18 +- trunk/sound/soc/codecs/wm8971.c | 3 +- trunk/sound/soc/codecs/wm8978.c | 3 +- trunk/sound/soc/codecs/wm8988.c | 3 +- trunk/sound/soc/codecs/wm8990.c | 3 +- trunk/sound/soc/codecs/wm8993.c | 86 +- trunk/sound/soc/codecs/wm8994.c | 290 +- trunk/sound/soc/codecs/wm8994.h | 3 - trunk/sound/soc/codecs/wm8996.c | 12 - trunk/sound/soc/codecs/wm9081.c | 5 +- trunk/sound/soc/codecs/wm9705.c | 6 +- trunk/sound/soc/codecs/wm9712.c | 10 +- trunk/sound/soc/codecs/wm_hubs.c | 220 +- trunk/sound/soc/codecs/wm_hubs.h | 12 +- trunk/sound/soc/ep93xx/ep93xx-ac97.c | 74 +- trunk/sound/soc/ep93xx/ep93xx-i2s.c | 49 +- trunk/sound/soc/fsl/Kconfig | 129 +- trunk/sound/soc/fsl/Makefile | 31 +- trunk/sound/soc/fsl/fsl_ssi.c | 167 +- trunk/sound/soc/fsl/fsl_utils.c | 91 - trunk/sound/soc/fsl/fsl_utils.h | 26 - trunk/sound/soc/fsl/imx-mc13783.c | 156 - trunk/sound/soc/fsl/imx-sgtl5000.c | 221 -- trunk/sound/soc/fsl/mpc8610_hpcd.c | 166 +- trunk/sound/soc/fsl/p1022_ds.c | 158 +- trunk/sound/soc/generic/Kconfig | 4 - trunk/sound/soc/generic/Makefile | 3 - trunk/sound/soc/generic/simple-card.c | 114 - trunk/sound/soc/imx/Kconfig | 79 + trunk/sound/soc/imx/Makefile | 22 + trunk/sound/soc/{fsl => imx}/eukrea-tlv320.c | 2 +- trunk/sound/soc/{fsl => imx}/imx-audmux.c | 0 trunk/sound/soc/{fsl => imx}/imx-audmux.h | 0 .../imx-pcm-dma.c => imx/imx-pcm-dma-mx2.c} | 3 +- trunk/sound/soc/{fsl => imx}/imx-pcm-fiq.c | 0 trunk/sound/soc/{fsl => imx}/imx-pcm.c | 0 trunk/sound/soc/{fsl => imx}/imx-pcm.h | 1 - trunk/sound/soc/{fsl => imx}/imx-ssi.c | 2 +- trunk/sound/soc/{fsl => imx}/imx-ssi.h | 0 .../sound/soc/{fsl => imx}/mx27vis-aic32x4.c | 0 trunk/sound/soc/{fsl => imx}/phycore-ac97.c | 0 trunk/sound/soc/{fsl => imx}/wm1133-ev1.c | 0 trunk/sound/soc/jz4740/jz4740-i2s.c | 4 +- trunk/sound/soc/mxs/mxs-pcm.c | 24 +- trunk/sound/soc/mxs/mxs-pcm.h | 3 - trunk/sound/soc/mxs/mxs-saif.c | 92 +- trunk/sound/soc/mxs/mxs-saif.h | 1 + trunk/sound/soc/mxs/mxs-sgtl5000.c | 50 +- trunk/sound/soc/omap/Kconfig | 1 - trunk/sound/soc/pxa/pxa-ssp.c | 28 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 4 +- trunk/sound/soc/samsung/littlemill.c | 102 +- trunk/sound/soc/samsung/lowland.c | 75 +- trunk/sound/soc/samsung/speyside.c | 33 +- trunk/sound/soc/sh/Kconfig | 24 +- trunk/sound/soc/sh/Makefile | 6 + trunk/sound/soc/sh/fsi-ak4642.c | 108 + trunk/sound/soc/sh/fsi-da7210.c | 81 + trunk/sound/soc/sh/fsi-hdmi.c | 118 + trunk/sound/soc/sh/fsi.c | 224 +- trunk/sound/soc/soc-core.c | 690 ++-- trunk/sound/soc/soc-dapm.c | 562 +--- trunk/sound/soc/soc-jack.c | 5 +- trunk/sound/soc/soc-pcm.c | 1764 +---------- trunk/sound/soc/tegra/Kconfig | 68 +- trunk/sound/soc/tegra/Makefile | 20 +- trunk/sound/soc/tegra/tegra20_das.c | 233 -- trunk/sound/soc/tegra/tegra20_das.h | 134 - trunk/sound/soc/tegra/tegra20_i2s.c | 494 --- trunk/sound/soc/tegra/tegra20_i2s.h | 164 - trunk/sound/soc/tegra/tegra20_spdif.c | 404 --- trunk/sound/soc/tegra/tegra20_spdif.h | 471 --- trunk/sound/soc/tegra/tegra30_ahub.c | 631 ---- trunk/sound/soc/tegra/tegra30_ahub.h | 483 --- trunk/sound/soc/tegra/tegra30_i2s.c | 536 ---- trunk/sound/soc/tegra/tegra30_i2s.h | 242 -- trunk/sound/soc/tegra/tegra_alc5632.c | 48 +- trunk/sound/soc/tegra/tegra_asoc_utils.c | 37 +- trunk/sound/soc/tegra/tegra_asoc_utils.h | 9 +- trunk/sound/soc/tegra/tegra_das.c | 261 ++ trunk/sound/soc/tegra/tegra_das.h | 135 + trunk/sound/soc/tegra/tegra_i2s.c | 459 +++ trunk/sound/soc/tegra/tegra_i2s.h | 166 + trunk/sound/soc/tegra/tegra_pcm.c | 28 +- trunk/sound/soc/tegra/tegra_pcm.h | 5 +- trunk/sound/soc/tegra/tegra_spdif.c | 364 +++ trunk/sound/soc/tegra/tegra_spdif.h | 473 +++ trunk/sound/soc/tegra/tegra_wm8753.c | 224 -- trunk/sound/soc/tegra/tegra_wm8903.c | 29 +- trunk/sound/soc/tegra/trimslice.c | 41 +- trunk/sound/soc/ux500/Kconfig | 14 - trunk/sound/soc/ux500/Makefile | 4 - trunk/sound/soc/ux500/ux500_msp_dai.c | 843 ----- trunk/sound/soc/ux500/ux500_msp_dai.h | 79 - trunk/sound/soc/ux500/ux500_msp_i2s.c | 742 ----- trunk/sound/soc/ux500/ux500_msp_i2s.h | 553 ---- trunk/sound/sound_core.c | 2 +- trunk/sound/usb/card.c | 10 +- trunk/sound/usb/card.h | 86 +- trunk/sound/usb/endpoint.c | 1609 +++++----- trunk/sound/usb/endpoint.h | 32 +- trunk/sound/usb/mixer.c | 50 +- trunk/sound/usb/mixer.h | 3 - trunk/sound/usb/mixer_maps.c | 13 - trunk/sound/usb/mixer_quirks.c | 472 +-- trunk/sound/usb/pcm.c | 453 +-- trunk/sound/usb/proc.c | 38 +- trunk/sound/usb/stream.c | 31 +- trunk/sound/usb/usbaudio.h | 2 - .../tools/perf/Documentation/perf-evlist.txt | 8 - .../tools/perf/Documentation/perf-record.txt | 2 +- trunk/tools/perf/Makefile | 37 +- trunk/tools/perf/builtin-buildid-list.c | 6 +- trunk/tools/perf/builtin-evlist.c | 103 +- trunk/tools/perf/builtin-inject.c | 5 - trunk/tools/perf/builtin-record.c | 6 +- trunk/tools/perf/builtin-test.c | 552 +++- trunk/tools/perf/builtin-top.c | 5 +- trunk/tools/perf/util/build-id.c | 2 - trunk/tools/perf/util/evsel.c | 12 +- trunk/tools/perf/util/header.c | 10 +- trunk/tools/perf/util/header.h | 2 +- trunk/tools/perf/util/parse-events-test.c | 625 ---- trunk/tools/perf/util/parse-events.c | 69 +- trunk/tools/perf/util/parse-events.h | 20 +- trunk/tools/perf/util/parse-events.l | 26 +- trunk/tools/perf/util/parse-events.y | 77 +- trunk/tools/perf/util/pmu.c | 4 +- .../util/scripting-engines/trace-event-perl.c | 16 +- trunk/tools/perf/util/session.c | 68 +- trunk/tools/perf/util/types.h | 5 - trunk/tools/testing/ktest/sample.conf | 2 +- 757 files changed, 14223 insertions(+), 49970 deletions(-) delete mode 100644 trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto delete mode 100644 trunk/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/mxs-saif.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt delete mode 100644 trunk/Documentation/hwmon/ina2xx delete mode 100644 trunk/arch/parisc/include/asm/kbdleds.h delete mode 100644 trunk/arch/sh/boards/mach-rsk/devices-rsk7264.c delete mode 100644 trunk/arch/sh/boards/mach-rsk/devices-rsk7269.c delete mode 100644 trunk/arch/sh/configs/rsk7264_defconfig delete mode 100644 trunk/arch/sh/configs/rsk7269_defconfig create mode 100644 trunk/arch/sh/include/asm/dma-sh.h delete mode 100644 trunk/arch/sh/include/asm/io_noioport.h delete mode 100644 trunk/arch/sh/include/asm/stackprotector.h create mode 100644 trunk/arch/sh/include/cpu-sh2/cpu/dma.h create mode 100644 trunk/arch/sh/include/cpu-sh2a/cpu/dma.h delete mode 100644 trunk/arch/sh/include/cpu-sh2a/cpu/sh7264.h delete mode 100644 trunk/arch/sh/include/cpu-sh2a/cpu/sh7269.h create mode 100644 trunk/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h delete mode 100644 trunk/arch/sh/include/cpu-sh4/cpu/sh7734.h delete mode 100644 trunk/arch/sh/include/cpu-sh4a/cpu/dma.h create mode 100644 trunk/arch/sh/include/cpu-sh5/cpu/dma.h delete mode 100644 trunk/arch/sh/kernel/cpu/sh2a/clock-sh7264.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh2a/clock-sh7269.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh2a/setup-sh7264.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh2a/setup-sh7269.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh4a/clock-sh7734.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c delete mode 100644 trunk/arch/sh/kernel/cpu/sh4a/setup-sh7734.c delete mode 100644 trunk/arch/sh/mm/fault.c create mode 100644 trunk/arch/sh/mm/fault_32.c create mode 100644 trunk/arch/sh/mm/fault_64.c delete mode 100644 trunk/arch/sh/mm/tlbex_32.c delete mode 100644 trunk/arch/sh/mm/tlbex_64.c delete mode 100644 trunk/arch/x86/include/asm/kbdleds.h delete mode 100644 trunk/arch/x86/pci/sta2x11-fixup.c delete mode 100644 trunk/drivers/ata/pata_ep93xx.c delete mode 100644 trunk/drivers/char/hw_random/pseries-rng.c delete mode 100644 trunk/drivers/crypto/nx/Makefile delete mode 100644 trunk/drivers/crypto/nx/nx-aes-cbc.c delete mode 100644 trunk/drivers/crypto/nx/nx-aes-ccm.c delete mode 100644 trunk/drivers/crypto/nx/nx-aes-ctr.c delete mode 100644 trunk/drivers/crypto/nx/nx-aes-ecb.c delete mode 100644 trunk/drivers/crypto/nx/nx-aes-gcm.c delete mode 100644 trunk/drivers/crypto/nx/nx-aes-xcbc.c delete mode 100644 trunk/drivers/crypto/nx/nx-sha256.c delete mode 100644 trunk/drivers/crypto/nx/nx-sha512.c delete mode 100644 trunk/drivers/crypto/nx/nx.c delete mode 100644 trunk/drivers/crypto/nx/nx.h delete mode 100644 trunk/drivers/crypto/nx/nx_csbcpb.h delete mode 100644 trunk/drivers/crypto/nx/nx_debugfs.c delete mode 100644 trunk/drivers/hwmon/ina2xx.c delete mode 100644 trunk/drivers/macintosh/windfarm_ad7417_sensor.c delete mode 100644 trunk/drivers/macintosh/windfarm_fcu_controls.c delete mode 100644 trunk/drivers/macintosh/windfarm_lm87_sensor.c delete mode 100644 trunk/drivers/macintosh/windfarm_mpu.h delete mode 100644 trunk/drivers/macintosh/windfarm_pm72.c delete mode 100644 trunk/drivers/macintosh/windfarm_rm31.c delete mode 100644 trunk/include/linux/platform_data/ina2xx.h delete mode 100644 trunk/include/sound/cs42l52.h delete mode 100644 trunk/include/sound/simple_card.h delete mode 100644 trunk/include/sound/soc-dpcm.h delete mode 100644 trunk/kernel/power/autosleep.c delete mode 100644 trunk/kernel/power/wakelock.c delete mode 100644 trunk/scripts/sortextable.c delete mode 100644 trunk/scripts/sortextable.h delete mode 100644 trunk/sound/pci/hda/hda_auto_parser.c delete mode 100644 trunk/sound/pci/hda/hda_auto_parser.h delete mode 100644 trunk/sound/soc/codecs/cs42l52.c delete mode 100644 trunk/sound/soc/codecs/cs42l52.h delete mode 100644 trunk/sound/soc/codecs/lm49453.c delete mode 100644 trunk/sound/soc/codecs/lm49453.h delete mode 100644 trunk/sound/soc/codecs/mc13783.c delete mode 100644 trunk/sound/soc/codecs/mc13783.h delete mode 100644 trunk/sound/soc/codecs/ml26124.c delete mode 100644 trunk/sound/soc/codecs/ml26124.h delete mode 100644 trunk/sound/soc/codecs/omap-hdmi.c delete mode 100644 trunk/sound/soc/fsl/fsl_utils.c delete mode 100644 trunk/sound/soc/fsl/fsl_utils.h delete mode 100644 trunk/sound/soc/fsl/imx-mc13783.c delete mode 100644 trunk/sound/soc/fsl/imx-sgtl5000.c delete mode 100644 trunk/sound/soc/generic/Kconfig delete mode 100644 trunk/sound/soc/generic/Makefile delete mode 100644 trunk/sound/soc/generic/simple-card.c create mode 100644 trunk/sound/soc/imx/Kconfig create mode 100644 trunk/sound/soc/imx/Makefile rename trunk/sound/soc/{fsl => imx}/eukrea-tlv320.c (99%) rename trunk/sound/soc/{fsl => imx}/imx-audmux.c (100%) rename trunk/sound/soc/{fsl => imx}/imx-audmux.h (100%) rename trunk/sound/soc/{fsl/imx-pcm-dma.c => imx/imx-pcm-dma-mx2.c} (97%) rename trunk/sound/soc/{fsl => imx}/imx-pcm-fiq.c (100%) rename trunk/sound/soc/{fsl => imx}/imx-pcm.c (100%) rename trunk/sound/soc/{fsl => imx}/imx-pcm.h (93%) rename trunk/sound/soc/{fsl => imx}/imx-ssi.c (99%) rename trunk/sound/soc/{fsl => imx}/imx-ssi.h (100%) rename trunk/sound/soc/{fsl => imx}/mx27vis-aic32x4.c (100%) rename trunk/sound/soc/{fsl => imx}/phycore-ac97.c (100%) rename trunk/sound/soc/{fsl => imx}/wm1133-ev1.c (100%) create mode 100644 trunk/sound/soc/sh/fsi-ak4642.c create mode 100644 trunk/sound/soc/sh/fsi-da7210.c create mode 100644 trunk/sound/soc/sh/fsi-hdmi.c delete mode 100644 trunk/sound/soc/tegra/tegra20_das.c delete mode 100644 trunk/sound/soc/tegra/tegra20_das.h delete mode 100644 trunk/sound/soc/tegra/tegra20_i2s.c delete mode 100644 trunk/sound/soc/tegra/tegra20_i2s.h delete mode 100644 trunk/sound/soc/tegra/tegra20_spdif.c delete mode 100644 trunk/sound/soc/tegra/tegra20_spdif.h delete mode 100644 trunk/sound/soc/tegra/tegra30_ahub.c delete mode 100644 trunk/sound/soc/tegra/tegra30_ahub.h delete mode 100644 trunk/sound/soc/tegra/tegra30_i2s.c delete mode 100644 trunk/sound/soc/tegra/tegra30_i2s.h create mode 100644 trunk/sound/soc/tegra/tegra_das.c create mode 100644 trunk/sound/soc/tegra/tegra_das.h create mode 100644 trunk/sound/soc/tegra/tegra_i2s.c create mode 100644 trunk/sound/soc/tegra/tegra_i2s.h create mode 100644 trunk/sound/soc/tegra/tegra_spdif.c create mode 100644 trunk/sound/soc/tegra/tegra_spdif.h delete mode 100644 trunk/sound/soc/tegra/tegra_wm8753.c delete mode 100644 trunk/sound/soc/ux500/Kconfig delete mode 100644 trunk/sound/soc/ux500/Makefile delete mode 100644 trunk/sound/soc/ux500/ux500_msp_dai.c delete mode 100644 trunk/sound/soc/ux500/ux500_msp_dai.h delete mode 100644 trunk/sound/soc/ux500/ux500_msp_i2s.c delete mode 100644 trunk/sound/soc/ux500/ux500_msp_i2s.h delete mode 100644 trunk/tools/perf/util/parse-events-test.c diff --git a/[refs] b/[refs] index 208e5471e10f..dcb02c0f4187 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59d0952b43552570e0f1c3ff91ebb16d4caec171 +refs/heads/master: 62a9aebc5b8e28073a8609b9af6e8321cc622344 diff --git a/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto b/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto deleted file mode 100644 index 685d5a448423..000000000000 --- a/trunk/Documentation/ABI/testing/debugfs-pfo-nx-crypto +++ /dev/null @@ -1,45 +0,0 @@ -What: /sys/kernel/debug/nx-crypto/* -Date: March 2012 -KernelVersion: 3.4 -Contact: Kent Yoder -Description: - - These debugfs interfaces are built by the nx-crypto driver, built in -arch/powerpc/crypto/nx. - -Error Detection -=============== - -errors: -- A u32 providing a total count of errors since the driver was loaded. The -only errors counted here are those returned from the hcall, H_COP_OP. - -last_error: -- The most recent non-zero return code from the H_COP_OP hcall. -EBUSY is not -recorded here (the hcall will retry until -EBUSY goes away). - -last_error_pid: -- The process ID of the process who received the most recent error from the -hcall. - -Device Use -========== - -aes_bytes: -- The total number of bytes encrypted using AES in any of the driver's -supported modes. - -aes_ops: -- The total number of AES operations submitted to the hardware. - -sha256_bytes: -- The total number of bytes hashed by the hardware using SHA-256. - -sha256_ops: -- The total number of SHA-256 operations submitted to the hardware. - -sha512_bytes: -- The total number of bytes hashed by the hardware using SHA-512. - -sha512_ops: -- The total number of SHA-512 operations submitted to the hardware. diff --git a/trunk/Documentation/ABI/testing/sysfs-devices-power b/trunk/Documentation/ABI/testing/sysfs-devices-power index 45000f0db4d4..840f7d64d483 100644 --- a/trunk/Documentation/ABI/testing/sysfs-devices-power +++ b/trunk/Documentation/ABI/testing/sysfs-devices-power @@ -96,26 +96,16 @@ Description: is read-only. If the device is not enabled to wake up the system from sleep states, this attribute is not present. -What: /sys/devices/.../power/wakeup_abort_count -Date: February 2012 +What: /sys/devices/.../power/wakeup_hit_count +Date: September 2010 Contact: Rafael J. Wysocki Description: - The /sys/devices/.../wakeup_abort_count attribute contains the + The /sys/devices/.../wakeup_hit_count attribute contains the number of times the processing of a wakeup event associated with - the device might have aborted system transition into a sleep - state in progress. This attribute is read-only. If the device - is not enabled to wake up the system from sleep states, this - attribute is not present. - -What: /sys/devices/.../power/wakeup_expire_count -Date: February 2012 -Contact: Rafael J. Wysocki -Description: - The /sys/devices/.../wakeup_expire_count attribute contains the - number of times a wakeup event associated with the device has - been reported with a timeout that expired. This attribute is - read-only. If the device is not enabled to wake up the system - from sleep states, this attribute is not present. + the device might prevent the system from entering a sleep state. + This attribute is read-only. If the device is not enabled to + wake up the system from sleep states, this attribute is not + present. What: /sys/devices/.../power/wakeup_active Date: September 2010 @@ -158,17 +148,6 @@ Description: not enabled to wake up the system from sleep states, this attribute is not present. -What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms -Date: February 2012 -Contact: Rafael J. Wysocki -Description: - The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute - contains the total time the device has been preventing - opportunistic transitions to sleep states from occuring. - This attribute is read-only. If the device is not enabled to - wake up the system from sleep states, this attribute is not - present. - What: /sys/devices/.../power/autosuspend_delay_ms Date: September 2010 Contact: Alan Stern diff --git a/trunk/Documentation/ABI/testing/sysfs-power b/trunk/Documentation/ABI/testing/sysfs-power index 31725ffeeb3a..b464d12761ba 100644 --- a/trunk/Documentation/ABI/testing/sysfs-power +++ b/trunk/Documentation/ABI/testing/sysfs-power @@ -172,62 +172,3 @@ Description: Reading from this file will display the current value, which is set to 1 MB by default. - -What: /sys/power/autosleep -Date: April 2012 -Contact: Rafael J. Wysocki -Description: - The /sys/power/autosleep file can be written one of the strings - returned by reads from /sys/power/state. If that happens, a - work item attempting to trigger a transition of the system to - the sleep state represented by that string is queued up. This - attempt will only succeed if there are no active wakeup sources - in the system at that time. After every execution, regardless - of whether or not the attempt to put the system to sleep has - succeeded, the work item requeues itself until user space - writes "off" to /sys/power/autosleep. - - Reading from this file causes the last string successfully - written to it to be returned. - -What: /sys/power/wake_lock -Date: February 2012 -Contact: Rafael J. Wysocki -Description: - The /sys/power/wake_lock file allows user space to create - wakeup source objects and activate them on demand (if one of - those wakeup sources is active, reads from the - /sys/power/wakeup_count file block or return false). When a - string without white space is written to /sys/power/wake_lock, - it will be assumed to represent a wakeup source name. If there - is a wakeup source object with that name, it will be activated - (unless active already). Otherwise, a new wakeup source object - will be registered, assigned the given name and activated. - If a string written to /sys/power/wake_lock contains white - space, the part of the string preceding the white space will be - regarded as a wakeup source name and handled as descrived above. - The other part of the string will be regarded as a timeout (in - nanoseconds) such that the wakeup source will be automatically - deactivated after it has expired. The timeout, if present, is - set regardless of the current state of the wakeup source object - in question. - - Reads from this file return a string consisting of the names of - wakeup sources created with the help of it that are active at - the moment, separated with spaces. - - -What: /sys/power/wake_unlock -Date: February 2012 -Contact: Rafael J. Wysocki -Description: - The /sys/power/wake_unlock file allows user space to deactivate - wakeup sources created with the help of /sys/power/wake_lock. - When a string is written to /sys/power/wake_unlock, it will be - assumed to represent the name of a wakeup source to deactivate. - If a wakeup source object of that name exists and is active at - the moment, it will be deactivated. - - Reads from this file return a string consisting of the names of - wakeup sources created with the help of /sys/power/wake_lock - that are inactive at the moment, separated with spaces. diff --git a/trunk/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt b/trunk/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt deleted file mode 100644 index e4acdd891e49..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt +++ /dev/null @@ -1,49 +0,0 @@ -Freescale i.MX audio complex with SGTL5000 codec - -Required properties: -- compatible : "fsl,imx-audio-sgtl5000" -- model : The user-visible name of this sound complex -- ssi-controller : The phandle of the i.MX SSI controller -- audio-codec : The phandle of the SGTL5000 audio codec -- audio-routing : A list of the connections between audio components. - Each entry is a pair of strings, the first being the connection's sink, - the second being the connection's source. Valid names could be power - supplies, SGTL5000 pins, and the jacks on the board: - - Power supplies: - * Mic Bias - - SGTL5000 pins: - * MIC_IN - * LINE_IN - * HP_OUT - * LINE_OUT - - Board connectors: - * Mic Jack - * Line In Jack - * Headphone Jack - * Line Out Jack - * Ext Spk - -- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX) -- mux-ext-port : The external port of the i.MX audio muxer - -Note: The AUDMUX port numbering should start at 1, which is consistent with -hardware manual. - -Example: - -sound { - compatible = "fsl,imx51-babbage-sgtl5000", - "fsl,imx-audio-sgtl5000"; - model = "imx51-babbage-sgtl5000"; - ssi-controller = <&ssi1>; - audio-codec = <&sgtl5000>; - audio-routing = - "MIC_IN", "Mic Jack", - "Mic Jack", "Mic Bias", - "Headphone Jack", "HP_OUT"; - mux-int-port = <1>; - mux-ext-port = <3>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt b/trunk/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt deleted file mode 100644 index 601c518eddaa..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt +++ /dev/null @@ -1,17 +0,0 @@ -* Freescale MXS audio complex with SGTL5000 codec - -Required properties: -- compatible: "fsl,mxs-audio-sgtl5000" -- model: The user-visible name of this sound complex -- saif-controllers: The phandle list of the MXS SAIF controller -- audio-codec: The phandle of the SGTL5000 audio codec - -Example: - -sound { - compatible = "fsl,imx28-evk-sgtl5000", - "fsl,mxs-audio-sgtl5000"; - model = "imx28-evk-sgtl5000"; - saif-controllers = <&saif0 &saif1>; - audio-codec = <&sgtl5000>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/mxs-saif.txt b/trunk/Documentation/devicetree/bindings/sound/mxs-saif.txt deleted file mode 100644 index c37ba6143d9b..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/mxs-saif.txt +++ /dev/null @@ -1,36 +0,0 @@ -* Freescale MXS Serial Audio Interface (SAIF) - -Required properties: -- compatible: Should be "fsl,-saif" -- reg: Should contain registers location and length -- interrupts: Should contain ERROR and DMA interrupts -- fsl,saif-dma-channel: APBX DMA channel for the SAIF - -Optional properties: -- fsl,saif-master: phandle to the master SAIF. It's only required for - the slave SAIF. - -Note: Each SAIF controller should have an alias correctly numbered -in "aliases" node. - -Example: - -aliases { - saif0 = &saif0; - saif1 = &saif1; -}; - -saif0: saif@80042000 { - compatible = "fsl,imx28-saif"; - reg = <0x80042000 2000>; - interrupts = <59 80>; - fsl,saif-dma-channel = <4>; -}; - -saif1: saif@80046000 { - compatible = "fsl,imx28-saif"; - reg = <0x80046000 2000>; - interrupts = <58 81>; - fsl,saif-dma-channel = <5>; - fsl,saif-master = <&saif0>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt b/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt deleted file mode 100644 index 1ac7b1642186..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt +++ /dev/null @@ -1,32 +0,0 @@ -NVIDIA Tegra30 AHUB (Audio Hub) - -Required properties: -- compatible : "nvidia,tegra30-ahub" -- reg : Should contain the register physical address and length for each of - the AHUB's APBIF registers and the AHUB's own registers. -- interrupts : Should contain AHUB interrupt -- nvidia,dma-request-selector : The Tegra DMA controller's phandle and - request selector for the first APBIF channel. -- ranges : The bus address mapping for the configlink register bus. - Can be empty since the mapping is 1:1. -- #address-cells : For the configlink bus. Should be <1>; -- #size-cells : For the configlink bus. Should be <1>. - -AHUB client modules need to specify the IDs of their CIFs (Client InterFaces). -For RX CIFs, the numbers indicate the register number within AHUB routing -register space (APBIF 0..3 RX, I2S 0..5 RX, DAM 0..2 RX 0..1, SPDIF RX 0..1). -For TX CIFs, the numbers indicate the bit position within the AHUB routing -registers (APBIF 0..3 TX, I2S 0..5 TX, DAM 0..2 TX, SPDIF TX 0..1). - -Example: - -ahub@70080000 { - compatible = "nvidia,tegra30-ahub"; - reg = <0x70080000 0x200 0x70080200 0x100>; - interrupts = < 0 103 0x04 >; - nvidia,dma-request-selector = <&apbdma 1>; - - ranges; - #address-cells = <1>; - #size-cells = <1>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt b/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt deleted file mode 100644 index dfa6c037124a..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt +++ /dev/null @@ -1,15 +0,0 @@ -NVIDIA Tegra30 I2S controller - -Required properties: -- compatible : "nvidia,tegra30-i2s" -- reg : Should contain I2S registers location and length -- nvidia,ahub-cif-ids : The list of AHUB CIF IDs for this port, rx (playback) - first, tx (capture) second. See nvidia,tegra30-ahub.txt for values. - -Example: - -i2s@70002800 { - compatible = "nvidia,tegra30-i2s"; - reg = <0x70080300 0x100>; - nvidia,ahub-cif-ids = <4 4>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt b/trunk/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt deleted file mode 100644 index 04b14cfb1f16..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt +++ /dev/null @@ -1,14 +0,0 @@ -NVIDIA Tegra audio complex for TrimSlice - -Required properties: -- compatible : "nvidia,tegra-audio-trimslice" -- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller -- nvidia,audio-codec : The phandle of the WM8903 audio codec - -Example: - -sound { - compatible = "nvidia,tegra-audio-trimslice"; - nvidia,i2s-controller = <&tegra_i2s1>; - nvidia,audio-codec = <&codec>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt b/trunk/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt deleted file mode 100644 index c4dd39ce6165..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt +++ /dev/null @@ -1,54 +0,0 @@ -NVIDIA Tegra audio complex - -Required properties: -- compatible : "nvidia,tegra-audio-wm8753" -- nvidia,model : The user-visible name of this sound complex. -- nvidia,audio-routing : A list of the connections between audio components. - Each entry is a pair of strings, the first being the connection's sink, - the second being the connection's source. Valid names for sources and - sinks are the WM8753's pins, and the jacks on the board: - - WM8753 pins: - - * LOUT1 - * LOUT2 - * ROUT1 - * ROUT2 - * MONO1 - * MONO2 - * OUT3 - * OUT4 - * LINE1 - * LINE2 - * RXP - * RXN - * ACIN - * ACOP - * MIC1N - * MIC1 - * MIC2N - * MIC2 - * Mic Bias - - Board connectors: - - * Headphone Jack - * Mic Jack - -- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller -- nvidia,audio-codec : The phandle of the WM8753 audio codec -Example: - -sound { - compatible = "nvidia,tegra-audio-wm8753-whistler", - "nvidia,tegra-audio-wm8753" - nvidia,model = "tegra-wm8753-harmony"; - - nvidia,audio-routing = - "Headphone Jack", "LOUT1", - "Headphone Jack", "ROUT1"; - - nvidia,i2s-controller = <&i2s1>; - nvidia,audio-codec = <&wm8753>; -}; - diff --git a/trunk/Documentation/hwmon/ina2xx b/trunk/Documentation/hwmon/ina2xx deleted file mode 100644 index f50a6cc27616..000000000000 --- a/trunk/Documentation/hwmon/ina2xx +++ /dev/null @@ -1,29 +0,0 @@ -Kernel driver ina2xx -==================== - -Supported chips: - * Texas Instruments INA219 - Prefix: 'ina219' - Addresses: I2C 0x40 - 0x4f - Datasheet: Publicly available at the Texas Instruments website - http://www.ti.com/ - - * Texas Instruments INA226 - Prefix: 'ina226' - Addresses: I2C 0x40 - 0x4f - Datasheet: Publicly available at the Texas Instruments website - http://www.ti.com/ - -Author: Lothar Felten - -Description ------------ - -The INA219 is a high-side current shunt and power monitor with an I2C -interface. The INA219 monitors both shunt drop and supply voltage, with -programmable conversion times and filtering. - -The INA226 is a current shunt and power monitor with an I2C interface. -The INA226 monitors both a shunt voltage drop and bus supply voltage. - -The shunt value in micro-ohms can be set via platform data. diff --git a/trunk/Documentation/hwmon/it87 b/trunk/Documentation/hwmon/it87 index 87850d86c559..fba745571684 100644 --- a/trunk/Documentation/hwmon/it87 +++ b/trunk/Documentation/hwmon/it87 @@ -30,14 +30,6 @@ Supported chips: Prefix: 'it8728' Addresses scanned: from Super I/O config space (8 I/O ports) Datasheet: Not publicly available - * IT8782F - Prefix: 'it8782' - Addresses scanned: from Super I/O config space (8 I/O ports) - Datasheet: Not publicly available - * IT8783E/F - Prefix: 'it8783' - Addresses scanned: from Super I/O config space (8 I/O ports) - Datasheet: Not publicly available * SiS950 [clone of IT8705F] Prefix: 'it87' Addresses scanned: from Super I/O config space (8 I/O ports) @@ -83,8 +75,7 @@ Description ----------- This driver implements support for the IT8705F, IT8712F, IT8716F, -IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E, IT8781F, IT8782F, -IT8783E/F, and SiS950 chips. +IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E and SiS950 chips. These chips are 'Super I/O chips', supporting floppy disks, infrared ports, joysticks and other miscellaneous stuff. For hardware monitoring, they @@ -108,11 +99,11 @@ The IT8716F, IT8718F, IT8720F, IT8721F/IT8758E and later IT8712F revisions have support for 2 additional fans. The additional fans are supported by the driver. -The IT8716F, IT8718F, IT8720F, IT8721F/IT8758E, IT8782F, IT8783E/F, and late -IT8712F and IT8705F also have optional 16-bit tachometer counters for fans 1 to -3. This is better (no more fan clock divider mess) but not compatible with the -older chips and revisions. The 16-bit tachometer mode is enabled by the driver -when one of the above chips is detected. +The IT8716F, IT8718F, IT8720F and IT8721F/IT8758E, and late IT8712F and +IT8705F also have optional 16-bit tachometer counters for fans 1 to 3. This +is better (no more fan clock divider mess) but not compatible with the older +chips and revisions. The 16-bit tachometer mode is enabled by the driver when +one of the above chips is detected. The IT8726F is just bit enhanced IT8716F with additional hardware for AMD power sequencing. Therefore the chip will appear as IT8716F @@ -140,10 +131,9 @@ inputs can measure voltages between 0 and 4.08 volts, with a resolution of 0.016 volt (except IT8721F/IT8758E and IT8728F: 0.012 volt.) The battery voltage in8 does not have limit registers. -On the IT8721F/IT8758E, IT8782F, and IT8783E/F, some voltage inputs are -internal and scaled inside the chip (in7 (optional for IT8782F and IT8783E/F), -in8 and optionally in3). The driver handles this transparently so user-space -doesn't have to care. +On the IT8721F/IT8758E, some voltage inputs are internal and scaled inside +the chip (in7, in8 and optionally in3). The driver handles this transparently +so user-space doesn't have to care. The VID lines (IT8712F/IT8716F/IT8718F/IT8720F) encode the core voltage value: the voltage level your processor should work with. This is hardcoded by diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 8cb10f77c723..62aba89b04a2 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -2463,8 +2463,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. resume= [SWSUSP] Specify the partition device for software suspend - Format: - {/dev/ | PARTUUID= | : | } resume_offset= [SWSUSP] Specify the offset from the beginning of the partition diff --git a/trunk/Documentation/power/suspend-and-cpuhotplug.txt b/trunk/Documentation/power/suspend-and-cpuhotplug.txt index e13dafc8e8f1..f28f9a6f0347 100644 --- a/trunk/Documentation/power/suspend-and-cpuhotplug.txt +++ b/trunk/Documentation/power/suspend-and-cpuhotplug.txt @@ -29,7 +29,7 @@ More details follow: Write 'mem' to /sys/power/state - sysfs file + syfs file | v Acquire pm_mutex lock diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 221b81016dba..8c16d50f6cb6 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1545,7 +1545,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module for sound cards based on the C-Media CMI8786/8787/8788 chip: * Asound A-8788 - * Asus Xonar DG/DGX + * Asus Xonar DG * AuzenTech X-Meridian * AuzenTech X-Meridian 2G * Bgears b-Enspirer diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 61dd168d349a..591a10c11257 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6573,7 +6573,7 @@ M: Paul Mundt L: linux-sh@vger.kernel.org W: http://www.linux-sh.org Q: http://patchwork.kernel.org/project/linux-sh/list/ -T: git git://github.com/pmundt/linux-sh.git sh-latest +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest S: Supported F: Documentation/sh/ F: arch/sh/ @@ -6691,12 +6691,6 @@ F: drivers/misc/tifm* F: drivers/mmc/host/tifm_sd.c F: include/linux/tifm.h -TI LM49xxx FAMILY ASoC CODEC DRIVERS -M: M R Swami Reddy -L: alsa-devel@alsa-project.org (moderated for non-subscribers) -S: Maintained -F: sound/soc/codecs/lm49453* - TI TWL4030 SERIES SOC CODEC DRIVER M: Peter Ujfalusi L: alsa-devel@alsa-project.org (moderated for non-subscribers) diff --git a/trunk/Makefile b/trunk/Makefile index b62c1e09444a..546515cd07f3 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -566,16 +566,6 @@ else KBUILD_CFLAGS += -O2 endif -ifdef CONFIG_READABLE_ASM -# Disable optimizations that make assembler listings hard to read. -# reorder blocks reorders the control in the function -# ipa clone creates specialized cloned functions -# partial inlining inlines only parts of functions -KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \ - $(call cc-option,-fno-ipa-cp-clone,) \ - $(call cc-option,-fno-partial-inlining) -endif - include $(srctree)/arch/$(SRCARCH)/Makefile ifneq ($(CONFIG_FRAME_WARN),0) @@ -796,10 +786,6 @@ quiet_cmd_vmlinux_version = GEN .version quiet_cmd_sysmap = SYSMAP cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap -# Sort exception table at build time -quiet_cmd_sortextable = SORTEX - cmd_sortextable = $(objtree)/scripts/sortextable - # Link of vmlinux # If CONFIG_KALLSYMS is set .version is already updated # Generate System.map and verify that the content is consistent @@ -812,12 +798,6 @@ define rule_vmlinux__ $(call cmd,vmlinux__) $(Q)echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd - $(if $(CONFIG_BUILDTIME_EXTABLE_SORT), \ - $(Q)$(if $($(quiet)cmd_sortextable), \ - echo ' $($(quiet)cmd_sortextable) vmlinux' &&) \ - $(cmd_sortextable) vmlinux) - - $(Q)$(if $($(quiet)cmd_sysmap), \ echo ' $($(quiet)cmd_sysmap) System.map' &&) \ $(cmd_sysmap) $@ System.map; \ diff --git a/trunk/arch/alpha/include/asm/processor.h b/trunk/arch/alpha/include/asm/processor.h index e37b887b3d9f..94afe5859301 100644 --- a/trunk/arch/alpha/include/asm/processor.h +++ b/trunk/arch/alpha/include/asm/processor.h @@ -49,6 +49,9 @@ extern void start_thread(struct pt_regs *, unsigned long, unsigned long); /* Free all resources held by a thread. */ extern void release_thread(struct task_struct *); +/* Prepare to copy thread state - unlazy all lazy status */ +#define prepare_to_copy(tsk) do { } while (0) + /* Create a kernel thread without removing it from tasklists. */ extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); diff --git a/trunk/arch/arm/include/asm/processor.h b/trunk/arch/arm/include/asm/processor.h index 99afa7498260..d7038fa22343 100644 --- a/trunk/arch/arm/include/asm/processor.h +++ b/trunk/arch/arm/include/asm/processor.h @@ -77,6 +77,9 @@ struct task_struct; /* Free all resources held by a thread. */ extern void release_thread(struct task_struct *); +/* Prepare to copy thread state - unlazy all lazy status */ +#define prepare_to_copy(tsk) do { } while (0) + unsigned long get_wchan(struct task_struct *p); #if __LINUX_ARM_ARCH__ == 6 || defined(CONFIG_ARM_ERRATA_754327) diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index cca8c0c74794..7d6322ce5223 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -151,7 +151,6 @@ config MACH_MX25_3DS select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMXDI_RTC select IMX_HAVE_PLATFORM_IMX_I2C - select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_KEYPAD select IMX_HAVE_PLATFORM_IMX_UART @@ -496,7 +495,6 @@ config MACH_MX31MOBOARD select IMX_HAVE_PLATFORM_FSL_USB2_UDC select IMX_HAVE_PLATFORM_IMX2_WDT select IMX_HAVE_PLATFORM_IMX_I2C - select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IPU_CORE select IMX_HAVE_PLATFORM_MXC_EHCI diff --git a/trunk/arch/arm/mach-imx/mach-mx31_3ds.c b/trunk/arch/arm/mach-imx/mach-mx31_3ds.c index 4eafdf275ea2..4d1aab154400 100644 --- a/trunk/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/trunk/arch/arm/mach-imx/mach-mx31_3ds.c @@ -156,11 +156,6 @@ static int mx31_3ds_pins[] = { MX31_PIN_CSI_VSYNC__CSI_VSYNC, MX31_PIN_CSI_D5__GPIO3_5, /* CMOS PWDN */ IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */ - /* SSI */ - MX31_PIN_STXD4__STXD4, - MX31_PIN_SRXD4__SRXD4, - MX31_PIN_SCK4__SCK4, - MX31_PIN_SFS4__SFS4, }; /* @@ -493,23 +488,12 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { }; /* MC13783 */ -static struct mc13xxx_codec_platform_data mx31_3ds_codec = { - .dac_ssi_port = MC13783_SSI1_PORT, - .adc_ssi_port = MC13783_SSI1_PORT, -}; - static struct mc13xxx_platform_data mc13783_pdata = { .regulators = { .regulators = mx31_3ds_regulators, .num_regulators = ARRAY_SIZE(mx31_3ds_regulators), }, - .codec = &mx31_3ds_codec, - .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC | MC13XXX_USE_CODEC, - -}; - -static struct imx_ssi_platform_data mx31_3ds_ssi_pdata = { - .flags = IMX_SSI_DMA | IMX_SSI_NET, + .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC, }; /* SPI */ @@ -757,10 +741,6 @@ static void __init mx31_3ds_init(void) } mx31_3ds_init_camera(); - - imx31_add_imx_ssi(0, &mx31_3ds_ssi_pdata); - - imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0); } static void __init mx31_3ds_timer_init(void) diff --git a/trunk/arch/arm/mach-imx/mach-mx31moboard.c b/trunk/arch/arm/mach-imx/mach-mx31moboard.c index 016791f038b0..1dfe3c7a7be1 100644 --- a/trunk/arch/arm/mach-imx/mach-mx31moboard.c +++ b/trunk/arch/arm/mach-imx/mach-mx31moboard.c @@ -47,7 +47,6 @@ #include #include #include -#include #include "devices-imx31.h" @@ -103,9 +102,6 @@ static unsigned int moboard_pins[] = { MX31_PIN_CSPI3_MOSI__MOSI, MX31_PIN_CSPI3_MISO__MISO, MX31_PIN_CSPI3_SCLK__SCLK, MX31_PIN_CSPI3_SPI_RDY__SPI_RDY, MX31_PIN_CSPI2_SS1__CSPI3_SS1, - /* SSI */ - MX31_PIN_STXD4__STXD4, MX31_PIN_SRXD4__SRXD4, - MX31_PIN_SCK4__SCK4, MX31_PIN_SFS4__SFS4, }; static struct physmap_flash_data mx31moboard_flash_data = { @@ -280,11 +276,6 @@ static struct mc13xxx_buttons_platform_data moboard_buttons = { .b1on_key = KEY_POWER, }; -static struct mc13xxx_codec_platform_data moboard_codec = { - .dac_ssi_port = MC13783_SSI1_PORT, - .adc_ssi_port = MC13783_SSI1_PORT, -}; - static struct mc13xxx_platform_data moboard_pmic = { .regulators = { .regulators = moboard_regulators, @@ -292,12 +283,7 @@ static struct mc13xxx_platform_data moboard_pmic = { }, .leds = &moboard_leds, .buttons = &moboard_buttons, - .codec = &moboard_codec, - .flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC | MC13XXX_USE_CODEC, -}; - -static struct imx_ssi_platform_data moboard_ssi_pdata = { - .flags = IMX_SSI_DMA | IMX_SSI_NET, + .flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC, }; static struct spi_board_info moboard_spi_board_info[] __initdata = { @@ -568,10 +554,6 @@ static void __init mx31moboard_init(void) moboard_usbh2_init(); - imx31_add_imx_ssi(0, &moboard_ssi_pdata); - - imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0); - pm_power_off = mx31moboard_poweroff; switch (mx31moboard_baseboard) { diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig index f31383c32f9c..98327b7a503c 100644 --- a/trunk/arch/arm/mach-shmobile/Kconfig +++ b/trunk/arch/arm/mach-shmobile/Kconfig @@ -64,7 +64,6 @@ config MACH_AP4EVB depends on ARCH_SH7372 select ARCH_REQUIRE_GPIOLIB select SH_LCD_MIPI_DSI - select SND_SOC_AK4642 if SND_SIMPLE_CARD choice prompt "AP4EVB LCD panel selection" @@ -89,7 +88,6 @@ config MACH_MACKEREL bool "mackerel board" depends on ARCH_SH7372 select ARCH_REQUIRE_GPIOLIB - select SND_SOC_AK4642 if SND_SIMPLE_CARD config MACH_KOTA2 bool "KOTA2 board" diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index b540b8eb20ca..0c3caeba2f3e 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -50,7 +50,6 @@ #include #include -#include #include