From 7b85c311c8bb5f8d6091b3e3d684ded6206fb596 Mon Sep 17 00:00:00 2001 From: "brenohl@br.ibm.com" Date: Fri, 27 Jul 2012 08:54:52 +0000 Subject: [PATCH] --- yaml --- r: 320508 b: refs/heads/master c: 1a0150a93c496986297fc08304ac564213c08942 h: refs/heads/master v: v3 --- [refs] | 2 +- .../ABI/stable/sysfs-bus-firewire | 11 - trunk/Documentation/ABI/testing/sysfs-bus-rbd | 10 +- .../ABI/testing/sysfs-devices-edac | 140 - .../ABI/testing/sysfs-platform-asus-wmi | 7 - trunk/Documentation/DMA-attributes.txt | 42 - .../DocBook/media/v4l/biblio.xml | 2 +- .../DocBook/media/v4l/common.xml | 17 +- .../DocBook/media/v4l/compat.xml | 21 +- .../DocBook/media/v4l/dev-subdev.xml | 36 +- trunk/Documentation/DocBook/media/v4l/io.xml | 19 +- .../DocBook/media/v4l/selection-api.xml | 34 +- .../DocBook/media/v4l/selections-common.xml | 164 - .../Documentation/DocBook/media/v4l/v4l2.xml | 5 - .../DocBook/media/v4l/vidioc-create-bufs.xml | 8 +- .../DocBook/media/v4l/vidioc-g-frequency.xml | 6 - .../DocBook/media/v4l/vidioc-g-selection.xml | 86 +- .../DocBook/media/v4l/vidioc-g-tuner.xml | 12 - .../DocBook/media/v4l/vidioc-qbuf.xml | 9 +- .../media/v4l/vidioc-s-hw-freq-seek.xml | 18 +- .../media/v4l/vidioc-subdev-g-selection.xml | 79 +- trunk/Documentation/device-mapper/striped.txt | 7 +- .../device-mapper/thin-provisioning.txt | 24 +- .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 - .../bindings/arm/calxeda/mem-ctrlr.txt | 14 - .../bindings/ata/cavium-compact-flash.txt | 30 - .../bindings/gpio/cavium-octeon-gpio.txt | 49 - .../{i2c/gpio-i2c.txt => gpio/gpio_i2c.txt} | 0 .../devicetree/bindings/i2c/cavium-i2c.txt | 34 - .../devicetree/bindings/i2c/i2c-mxs.txt | 3 - .../devicetree/bindings/i2c/i2c-ocores.txt | 33 - .../devicetree/bindings/i2c/mrvl-i2c.txt | 19 +- .../devicetree/bindings/mfd/ab8500.txt | 123 - .../devicetree/bindings/mfd/max77686.txt | 59 - .../devicetree/bindings/mfd/tps65910.txt | 2 +- .../devicetree/bindings/mfd/twl6040.txt | 2 +- .../bindings/mips/cavium/bootbus.txt | 126 - .../devicetree/bindings/mips/cavium/ciu.txt | 26 - .../devicetree/bindings/mips/cavium/ciu2.txt | 27 - .../bindings/mips/cavium/dma-engine.txt | 21 - .../devicetree/bindings/mips/cavium/uctl.txt | 46 - .../devicetree/bindings/net/cavium-mdio.txt | 27 - .../devicetree/bindings/net/cavium-mix.txt | 39 - .../devicetree/bindings/net/cavium-pip.txt | 98 - .../devicetree/bindings/pwm/lpc32xx-pwm.txt | 12 - .../devicetree/bindings/pwm/mxs-pwm.txt | 17 - .../bindings/pwm/nvidia,tegra20-pwm.txt | 18 - .../devicetree/bindings/pwm/pwm.txt | 57 - .../bindings/serial/cavium-uart.txt | 19 - .../video/backlight/pwm-backlight.txt | 28 - trunk/Documentation/dontdiff | 1 + trunk/Documentation/dvb/get_dvb_firmware | 42 +- trunk/Documentation/edac.txt | 112 +- .../fault-injection/fault-injection.txt | 27 - .../fault-injection/notifier-error-inject.txt | 99 - .../feature-removal-schedule.txt | 18 - trunk/Documentation/input/edt-ft5x06.txt | 54 - trunk/Documentation/kernel-parameters.txt | 2 +- .../power/power_supply_class.txt | 10 - trunk/Documentation/printk-formats.txt | 15 - trunk/Documentation/pwm.txt | 76 - trunk/Documentation/sysctl/fs.txt | 18 +- .../video4linux/v4l2-framework.txt | 73 +- trunk/MAINTAINERS | 39 +- trunk/Makefile | 24 +- trunk/arch/Kconfig | 7 - trunk/arch/alpha/Kconfig | 1 - trunk/arch/alpha/include/asm/unistd.h | 1 + trunk/arch/alpha/kernel/smc37c669.c | 12 + trunk/arch/arm/Kconfig | 3 +- trunk/arch/arm/boot/dts/highbank.dts | 12 - trunk/arch/arm/boot/dts/imx28.dtsi | 2 - trunk/arch/arm/boot/dts/r8a7740.dtsi | 21 - trunk/arch/arm/boot/dts/sh7377.dtsi | 21 - trunk/arch/arm/boot/dts/tegra20.dtsi | 6 - trunk/arch/arm/boot/dts/tegra30.dtsi | 6 - trunk/arch/arm/common/dmabounce.c | 1 - .../arm/configs/armadillo800eva_defconfig | 25 +- trunk/arch/arm/configs/kzm9d_defconfig | 89 - trunk/arch/arm/configs/kzm9g_defconfig | 8 +- trunk/arch/arm/configs/tegra_defconfig | 1 - trunk/arch/arm/include/asm/dma-mapping.h | 24 +- trunk/arch/arm/include/asm/unistd.h | 1 + trunk/arch/arm/lib/io-acorn.S | 3 +- trunk/arch/arm/mach-exynos/clock-exynos4.c | 41 +- trunk/arch/arm/mach-exynos/clock-exynos4.h | 3 - trunk/arch/arm/mach-exynos/clock-exynos4210.c | 37 - trunk/arch/arm/mach-exynos/clock-exynos4212.c | 41 +- trunk/arch/arm/mach-exynos/mach-nuri.c | 4 + trunk/arch/arm/mach-exynos/mach-origen.c | 1 + trunk/arch/arm/mach-netx/fb.c | 23 + trunk/arch/arm/mach-pxa/eseries.h | 14 + trunk/arch/arm/mach-pxa/hx4700.c | 56 +- .../arm/mach-s3c64xx/include/mach/pm-core.h | 4 - trunk/arch/arm/mach-shmobile/Kconfig | 13 - trunk/arch/arm/mach-shmobile/Makefile | 2 - trunk/arch/arm/mach-shmobile/board-ag5evm.c | 82 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 62 +- .../arm/mach-shmobile/board-armadillo800eva.c | 455 +- trunk/arch/arm/mach-shmobile/board-bonito.c | 10 - trunk/arch/arm/mach-shmobile/board-g4evm.c | 52 +- trunk/arch/arm/mach-shmobile/board-kota2.c | 30 - trunk/arch/arm/mach-shmobile/board-kzm9d.c | 10 - trunk/arch/arm/mach-shmobile/board-kzm9g.c | 320 - trunk/arch/arm/mach-shmobile/board-mackerel.c | 83 +- trunk/arch/arm/mach-shmobile/board-marzen.c | 10 - trunk/arch/arm/mach-shmobile/clock-r8a7740.c | 150 +- trunk/arch/arm/mach-shmobile/clock-r8a7779.c | 2 +- trunk/arch/arm/mach-shmobile/clock-sh7367.c | 2 +- trunk/arch/arm/mach-shmobile/clock-sh7372.c | 2 +- trunk/arch/arm/mach-shmobile/clock-sh7377.c | 2 +- trunk/arch/arm/mach-shmobile/clock-sh73a0.c | 12 +- .../arm/mach-shmobile/include/mach/common.h | 1 - .../mach-shmobile/include/mach/dma-register.h | 84 - .../arm/mach-shmobile/include/mach/gpio.h | 32 - .../mach-shmobile/include/mach/pm-rmobile.h | 44 - .../arm/mach-shmobile/include/mach/r8a7740.h | 33 +- .../arm/mach-shmobile/include/mach/sh7372.h | 45 +- .../arm/mach-shmobile/include/mach/sh73a0.h | 7 - trunk/arch/arm/mach-shmobile/intc-r8a7740.c | 13 +- trunk/arch/arm/mach-shmobile/pfc-r8a7740.c | 24 +- trunk/arch/arm/mach-shmobile/pm-r8a7740.c | 54 - trunk/arch/arm/mach-shmobile/pm-rmobile.c | 167 - trunk/arch/arm/mach-shmobile/pm-sh7372.c | 297 +- trunk/arch/arm/mach-shmobile/setup-r8a7740.c | 360 - trunk/arch/arm/mach-shmobile/setup-sh7372.c | 209 +- trunk/arch/arm/mach-shmobile/setup-sh7377.c | 47 - trunk/arch/arm/mach-shmobile/setup-sh73a0.c | 152 +- trunk/arch/arm/mach-tegra/board-dt-tegra20.c | 3 +- trunk/arch/arm/mach-tegra/board-dt-tegra30.c | 3 - trunk/arch/arm/mach-ux500/board-mop500.c | 32 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 7 +- trunk/arch/arm/mach-ux500/devices-common.h | 24 +- .../arch/arm/mach-ux500/include/mach/setup.h | 3 +- trunk/arch/arm/mach-vt8500/Makefile | 2 + trunk/arch/arm/mach-vt8500/pwm.c | 265 + trunk/arch/arm/mm/dma-mapping.c | 561 +- trunk/arch/arm/mm/mm.h | 3 - trunk/arch/arm/plat-mxc/Kconfig | 6 + trunk/arch/arm/plat-mxc/Makefile | 1 + trunk/arch/arm/plat-mxc/include/mach/i2c.h | 2 +- .../pwm/pwm-imx.c => arch/arm/plat-mxc/pwm.c} | 204 +- .../arm/plat-nomadik/include/plat/i2c.h} | 6 +- trunk/arch/arm/plat-pxa/Makefile | 1 + trunk/arch/arm/plat-pxa/pwm.c | 304 + trunk/arch/arm/plat-samsung/Makefile | 4 + .../arm/plat-samsung/pwm.c} | 234 +- trunk/arch/arm/vfp/vfphw.S | 7 +- trunk/arch/avr32/Kconfig | 1 - trunk/arch/avr32/boards/atstk1000/atstk1002.c | 2 +- trunk/arch/avr32/include/asm/unistd.h | 1 + trunk/arch/avr32/mm/fault.c | 33 +- trunk/arch/blackfin/Kconfig | 11 +- trunk/arch/blackfin/include/asm/unistd.h | 1 + trunk/arch/blackfin/kernel/Makefile | 1 + trunk/arch/blackfin/kernel/pwm.c | 100 + trunk/arch/cris/Kconfig | 1 - trunk/arch/cris/include/asm/unistd.h | 1 + trunk/arch/frv/Kconfig | 1 - trunk/arch/frv/include/asm/cpumask.h | 6 + trunk/arch/frv/include/asm/unistd.h | 1 + trunk/arch/frv/kernel/kernel_thread.S | 2 +- trunk/arch/h8300/Kconfig | 1 - trunk/arch/h8300/include/asm/unistd.h | 1 + trunk/arch/hexagon/include/asm/Kbuild | 2 + trunk/arch/ia64/Kconfig | 3 +- trunk/arch/ia64/include/asm/atomic.h | 4 +- trunk/arch/ia64/include/asm/machvec.h | 2 +- trunk/arch/ia64/include/asm/machvec_dig.h | 2 +- trunk/arch/ia64/include/asm/machvec_dig_vtd.h | 2 +- trunk/arch/ia64/include/asm/machvec_hpsim.h | 2 +- trunk/arch/ia64/include/asm/machvec_hpzx1.h | 2 +- .../ia64/include/asm/machvec_hpzx1_swiotlb.h | 2 +- trunk/arch/ia64/include/asm/machvec_sn2.h | 2 +- trunk/arch/ia64/include/asm/machvec_uv.h | 2 +- trunk/arch/ia64/include/asm/machvec_xen.h | 2 +- trunk/arch/ia64/include/asm/processor.h | 2 +- trunk/arch/ia64/kvm/Kconfig | 1 - trunk/arch/ia64/pci/fixup.c | 4 +- trunk/arch/m32r/Kconfig | 1 - trunk/arch/m32r/include/asm/unistd.h | 1 + trunk/arch/m68k/Kconfig | 1 - trunk/arch/m68k/include/asm/unistd.h | 1 + trunk/arch/microblaze/Kconfig | 1 - trunk/arch/microblaze/include/asm/unistd.h | 1 + trunk/arch/mips/Kbuild.platforms | 1 - trunk/arch/mips/Kconfig | 40 +- trunk/arch/mips/alchemy/board-mtx1.c | 4 +- trunk/arch/mips/alchemy/common/platform.c | 10 +- trunk/arch/mips/alchemy/devboards/Makefile | 2 +- trunk/arch/mips/alchemy/devboards/bcsr.c | 5 +- trunk/arch/mips/alchemy/devboards/pb1100.c | 4 +- trunk/arch/mips/alchemy/devboards/pb1500.c | 4 +- trunk/arch/mips/alchemy/devboards/platform.c | 30 - trunk/arch/mips/alchemy/devboards/prom.c | 69 + trunk/arch/mips/bcm63xx/Kconfig | 4 - trunk/arch/mips/bcm63xx/Makefile | 3 +- .../arch/mips/bcm63xx/boards/board_bcm963xx.c | 107 +- trunk/arch/mips/bcm63xx/clk.c | 26 +- trunk/arch/mips/bcm63xx/cpu.c | 63 +- trunk/arch/mips/bcm63xx/dev-dsp.c | 2 +- trunk/arch/mips/bcm63xx/dev-flash.c | 123 - trunk/arch/mips/bcm63xx/dev-rng.c | 40 - trunk/arch/mips/bcm63xx/dev-spi.c | 119 - trunk/arch/mips/bcm63xx/dev-wdt.c | 2 +- trunk/arch/mips/bcm63xx/irq.c | 21 - trunk/arch/mips/bcm63xx/prom.c | 4 +- trunk/arch/mips/bcm63xx/setup.c | 13 +- trunk/arch/mips/boot/compressed/Makefile | 4 - trunk/arch/mips/boot/compressed/uart-16550.c | 5 - trunk/arch/mips/cavium-octeon/.gitignore | 2 - trunk/arch/mips/cavium-octeon/Makefile | 16 - .../mips/cavium-octeon/executive/cvmx-fpa.c | 183 + .../cavium-octeon/executive/cvmx-helper-fpa.c | 243 + trunk/arch/mips/cavium-octeon/octeon-irq.c | 399 +- trunk/arch/mips/cavium-octeon/octeon-memcpy.S | 16 +- .../arch/mips/cavium-octeon/octeon-platform.c | 699 +- trunk/arch/mips/cavium-octeon/octeon_3xxx.dts | 571 -- trunk/arch/mips/cavium-octeon/octeon_68xx.dts | 625 -- trunk/arch/mips/cavium-octeon/serial.c | 134 +- trunk/arch/mips/cavium-octeon/setup.c | 45 - trunk/arch/mips/configs/ls1b_defconfig | 109 - trunk/arch/mips/configs/nlm_xlr_defconfig | 4 - trunk/arch/mips/dec/prom/memory.c | 2 +- trunk/arch/mips/include/asm/cpu.h | 3 +- .../include/asm/mach-bcm63xx/bcm63xx_cpu.h | 150 +- .../asm/mach-bcm63xx/bcm63xx_dev_flash.h | 12 - .../asm/mach-bcm63xx/bcm63xx_dev_spi.h | 89 - .../include/asm/mach-bcm63xx/bcm63xx_gpio.h | 2 - .../include/asm/mach-bcm63xx/bcm63xx_io.h | 8 - .../include/asm/mach-bcm63xx/bcm63xx_regs.h | 286 +- .../mips/include/asm/mach-bcm63xx/ioremap.h | 1 - .../mips/include/asm/mach-cavium-octeon/irq.h | 45 +- .../include/asm/mach-jz4740/jz4740_nand.h | 4 - .../mips/include/asm/mach-loongson/loongson.h | 3 +- .../mips/include/asm/mach-loongson1/irq.h | 73 - .../include/asm/mach-loongson1/loongson1.h | 44 - .../include/asm/mach-loongson1/platform.h | 23 - .../mips/include/asm/mach-loongson1/prom.h | 24 - .../include/asm/mach-loongson1/regs-clk.h | 33 - .../include/asm/mach-loongson1/regs-wdt.h | 22 - .../mips/include/asm/mach-loongson1/war.h | 25 - .../asm/mach-netlogic/cpu-feature-overrides.h | 1 + .../include/asm/mach-tx49xx/mangle-port.h | 2 +- trunk/arch/mips/include/asm/mipsmtregs.h | 13 - trunk/arch/mips/include/asm/module.h | 2 - .../include/asm/netlogic/xlp-hal/cpucontrol.h | 4 +- .../mips/include/asm/netlogic/xlp-hal/iomap.h | 5 +- .../include/asm/netlogic/xlp-hal/pcibus.h | 76 - .../mips/include/asm/netlogic/xlp-hal/pic.h | 4 - .../mips/include/asm/netlogic/xlp-hal/usb.h | 64 - .../mips/include/asm/netlogic/xlp-hal/xlp.h | 17 +- .../mips/include/asm/netlogic/xlr/bridge.h | 104 - .../mips/include/asm/netlogic/xlr/flash.h | 55 - .../arch/mips/include/asm/netlogic/xlr/gpio.h | 59 +- .../mips/include/asm/octeon/cvmx-helper-fpa.h | 64 + .../mips/include/asm/octeon/cvmx-helper.h | 2 + trunk/arch/mips/include/asm/octeon/octeon.h | 5 + trunk/arch/mips/include/asm/prom.h | 3 + trunk/arch/mips/include/asm/smtc.h | 6 - trunk/arch/mips/include/asm/uaccess.h | 6 +- trunk/arch/mips/include/asm/uasm.h | 100 +- trunk/arch/mips/include/asm/unistd.h | 1 + trunk/arch/mips/jz4740/board-qi_lb60.c | 1 - trunk/arch/mips/jz4740/platform.c | 20 +- trunk/arch/mips/jz4740/reset.c | 49 +- trunk/arch/mips/kernel/cpu-probe.c | 299 +- trunk/arch/mips/kernel/perf_event_mipsxx.c | 5 - trunk/arch/mips/kernel/prom.c | 29 + trunk/arch/mips/kernel/smp.c | 4 +- trunk/arch/mips/kernel/smtc.c | 76 +- trunk/arch/mips/kernel/traps.c | 1 - trunk/arch/mips/lib/Makefile | 2 +- trunk/arch/mips/lib/memcpy-inatomic.S | 451 ++ trunk/arch/mips/lib/memcpy.S | 11 - trunk/arch/mips/loongson1/Kconfig | 21 - trunk/arch/mips/loongson1/Makefile | 11 - trunk/arch/mips/loongson1/Platform | 7 - trunk/arch/mips/loongson1/common/Makefile | 5 - trunk/arch/mips/loongson1/common/clock.c | 165 - trunk/arch/mips/loongson1/common/irq.c | 147 - trunk/arch/mips/loongson1/common/platform.c | 124 - trunk/arch/mips/loongson1/common/prom.c | 87 - trunk/arch/mips/loongson1/common/reset.c | 45 - trunk/arch/mips/loongson1/common/setup.c | 29 - trunk/arch/mips/loongson1/ls1b/Makefile | 5 - trunk/arch/mips/loongson1/ls1b/board.c | 33 - trunk/arch/mips/mm/uasm.c | 62 +- trunk/arch/mips/netlogic/common/earlycons.c | 2 +- trunk/arch/mips/netlogic/common/smpboot.S | 157 +- trunk/arch/mips/netlogic/xlp/Makefile | 2 - trunk/arch/mips/netlogic/xlp/nlm_hal.c | 52 - trunk/arch/mips/netlogic/xlp/of.c | 34 - trunk/arch/mips/netlogic/xlp/platform.c | 2 +- trunk/arch/mips/netlogic/xlp/setup.c | 16 - trunk/arch/mips/netlogic/xlp/usb-init.c | 124 - trunk/arch/mips/netlogic/xlr/Makefile | 2 +- trunk/arch/mips/netlogic/xlr/platform-flash.c | 220 - trunk/arch/mips/netlogic/xlr/platform.c | 140 - trunk/arch/mips/netlogic/xlr/setup.c | 2 +- trunk/arch/mips/oprofile/common.c | 1 - trunk/arch/mips/oprofile/op_model_mipsxx.c | 10 +- trunk/arch/mips/pci/Makefile | 1 - trunk/arch/mips/pci/fixup-cobalt.c | 8 +- trunk/arch/mips/pci/fixup-malta.c | 14 - trunk/arch/mips/pci/fixup-rc32434.c | 2 +- trunk/arch/mips/pci/ops-bcm63xx.c | 63 +- trunk/arch/mips/pci/pci-bcm63xx.c | 133 +- trunk/arch/mips/pci/pci-bcm63xx.h | 5 - trunk/arch/mips/pci/pci-xlp.c | 248 - trunk/arch/mips/pci/pci-xlr.c | 4 + trunk/arch/mips/pnx833x/stb22x/board.c | 4 +- trunk/arch/mips/txx9/generic/pci.c | 6 +- trunk/arch/mips/txx9/generic/setup.c | 12 +- trunk/arch/mips/txx9/generic/setup_tx4939.c | 2 +- trunk/arch/mips/txx9/rbtx4939/setup.c | 11 +- trunk/arch/mn10300/Kconfig | 1 - trunk/arch/mn10300/include/asm/ipc.h | 1 + trunk/arch/mn10300/include/asm/unistd.h | 1 + trunk/arch/openrisc/include/asm/Kbuild | 2 + trunk/arch/powerpc/Kconfig | 2 - .../arch/powerpc/boot/dts/p2020rdb-pc_32b.dts | 4 +- .../arch/powerpc/boot/dts/p2020rdb-pc_36b.dts | 4 +- trunk/arch/powerpc/boot/dts/p3041ds.dts | 2 +- trunk/arch/powerpc/include/asm/dma-mapping.h | 8 +- trunk/arch/powerpc/include/asm/unistd.h | 1 + trunk/arch/powerpc/kernel/dma-iommu.c | 1 - trunk/arch/powerpc/kernel/dma-swiotlb.c | 1 - trunk/arch/powerpc/kernel/dma.c | 36 +- trunk/arch/powerpc/kernel/vio.c | 1 - trunk/arch/powerpc/kvm/book3s_rmhandlers.S | 1 + trunk/arch/powerpc/platforms/85xx/p1022_ds.c | 122 +- .../arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 4 +- trunk/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 39 +- trunk/arch/s390/Kconfig | 3 - trunk/arch/s390/defconfig | 5 +- trunk/arch/s390/include/asm/mmu_context.h | 16 +- trunk/arch/s390/include/asm/processor.h | 2 - trunk/arch/s390/include/asm/setup.h | 2 +- trunk/arch/s390/include/asm/unistd.h | 1 + trunk/arch/s390/kernel/debug.c | 70 +- trunk/arch/s390/kernel/dis.c | 4 +- trunk/arch/s390/kernel/early.c | 1 + trunk/arch/s390/kernel/ipl.c | 12 +- trunk/arch/s390/kernel/setup.c | 12 +- trunk/arch/s390/kernel/traps.c | 16 +- trunk/arch/s390/kernel/vdso.c | 9 +- trunk/arch/s390/kernel/vmlinux.lds.S | 2 +- trunk/arch/s390/mm/fault.c | 35 +- trunk/arch/s390/mm/mmap.c | 12 +- trunk/arch/s390/mm/pgtable.c | 7 +- trunk/arch/s390/oprofile/backtrace.c | 2 +- trunk/arch/sh/Kconfig | 2 - trunk/arch/sh/include/asm/unistd.h | 1 + trunk/arch/sparc/Kconfig | 1 - trunk/arch/sparc/include/asm/unistd.h | 1 + trunk/arch/sparc/kernel/sys_sparc_64.c | 2 +- trunk/arch/tile/include/asm/Kbuild | 1 + trunk/arch/x86/Kconfig | 2 - trunk/arch/x86/include/asm/perf_event.h | 2 +- trunk/arch/x86/include/asm/unistd.h | 1 + trunk/arch/x86/kernel/cpu/perf_event.h | 2 +- trunk/arch/x86/kernel/cpu/perf_event_intel.c | 92 +- .../x86/kernel/cpu/perf_event_intel_uncore.c | 1524 +--- .../x86/kernel/cpu/perf_event_intel_uncore.h | 207 +- trunk/arch/x86/kernel/e820.c | 2 +- trunk/arch/xtensa/include/asm/cpumask.h | 16 + trunk/arch/xtensa/include/asm/rmap.h | 16 + trunk/arch/xtensa/kernel/syscall.c | 2 +- trunk/arch/xtensa/mm/fault.c | 29 +- trunk/drivers/Kconfig | 2 - trunk/drivers/Makefile | 1 - trunk/drivers/acpi/video_detect.c | 60 +- trunk/drivers/ata/pata_arasan_cf.c | 14 +- trunk/drivers/base/dma-mapping.c | 49 - trunk/drivers/block/rbd.c | 816 +- trunk/drivers/block/rbd_types.h | 1 + trunk/drivers/block/virtio_blk.c | 115 +- trunk/drivers/char/hw_random/Kconfig | 14 - trunk/drivers/char/hw_random/Makefile | 1 - trunk/drivers/char/hw_random/bcm63xx-rng.c | 175 - trunk/drivers/char/hw_random/virtio-rng.c | 37 +- trunk/drivers/char/mspec.c | 2 +- trunk/drivers/clk/Kconfig | 1 + trunk/drivers/clk/clk.c | 3 - trunk/drivers/cpufreq/exynos5250-cpufreq.c | 55 +- trunk/drivers/edac/Kconfig | 24 +- trunk/drivers/edac/Makefile | 3 - trunk/drivers/edac/amd64_edac.c | 376 +- trunk/drivers/edac/amd64_edac.h | 29 +- trunk/drivers/edac/amd64_edac_dbg.c | 89 +- trunk/drivers/edac/amd64_edac_inj.c | 134 +- trunk/drivers/edac/amd76x_edac.c | 34 +- trunk/drivers/edac/cell_edac.c | 28 +- trunk/drivers/edac/cpc925_edac.c | 96 +- trunk/drivers/edac/e752x_edac.c | 92 +- trunk/drivers/edac/e7xxx_edac.c | 89 +- trunk/drivers/edac/edac_core.h | 39 +- trunk/drivers/edac/edac_device.c | 47 +- trunk/drivers/edac/edac_device_sysfs.c | 71 +- trunk/drivers/edac/edac_mc.c | 395 +- trunk/drivers/edac/edac_mc_sysfs.c | 1355 ++-- trunk/drivers/edac/edac_module.c | 20 +- trunk/drivers/edac/edac_module.h | 26 +- trunk/drivers/edac/edac_pci.c | 26 +- trunk/drivers/edac/edac_pci_sysfs.c | 49 +- trunk/drivers/edac/highbank_l2_edac.c | 149 - trunk/drivers/edac/highbank_mc_edac.c | 264 - trunk/drivers/edac/i3000_edac.c | 47 +- trunk/drivers/edac/i3200_edac.c | 48 +- trunk/drivers/edac/i5000_edac.c | 207 +- trunk/drivers/edac/i5100_edac.c | 14 +- trunk/drivers/edac/i5400_edac.c | 201 +- trunk/drivers/edac/i7300_edac.c | 173 +- trunk/drivers/edac/i7core_edac.c | 520 +- trunk/drivers/edac/i82443bxgx_edac.c | 51 +- trunk/drivers/edac/i82860_edac.c | 45 +- trunk/drivers/edac/i82875p_edac.c | 53 +- trunk/drivers/edac/i82975x_edac.c | 55 +- trunk/drivers/edac/mpc85xx_edac.c | 131 +- trunk/drivers/edac/mv64x60_edac.c | 40 +- trunk/drivers/edac/pasemi_edac.c | 22 +- trunk/drivers/edac/ppc4xx_edac.c | 16 +- trunk/drivers/edac/r82600_edac.c | 48 +- trunk/drivers/edac/sb_edac.c | 257 +- trunk/drivers/edac/tile_edac.c | 12 +- trunk/drivers/edac/x38_edac.c | 48 +- trunk/drivers/extcon/Kconfig | 2 +- trunk/drivers/extcon/extcon-max8997.c | 29 +- trunk/drivers/firewire/core-device.c | 9 - trunk/drivers/firewire/core-iso.c | 2 +- trunk/drivers/firewire/core-transaction.c | 23 +- trunk/drivers/firewire/ohci.c | 30 +- trunk/drivers/firmware/memmap.c | 8 +- trunk/drivers/firmware/pcdp.c | 4 +- trunk/drivers/gpio/Kconfig | 7 - trunk/drivers/gpio/Makefile | 1 - trunk/drivers/gpio/gpio-tps6586x.c | 158 - .../gpu/drm/exynos/exynos_drm_connector.c | 3 +- .../drivers/gpu/drm/exynos/exynos_drm_core.c | 5 + .../drivers/gpu/drm/exynos/exynos_drm_crtc.c | 294 +- .../drivers/gpu/drm/exynos/exynos_drm_crtc.h | 31 + .../gpu/drm/exynos/exynos_drm_dmabuf.c | 33 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c | 9 +- trunk/drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 - .../gpu/drm/exynos/exynos_drm_encoder.c | 123 +- .../gpu/drm/exynos/exynos_drm_encoder.h | 12 +- .../drivers/gpu/drm/exynos/exynos_drm_fimd.c | 40 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.c | 49 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 +- .../drivers/gpu/drm/exynos/exynos_drm_plane.c | 246 +- .../drivers/gpu/drm/exynos/exynos_drm_plane.h | 12 +- .../drivers/gpu/drm/exynos/exynos_drm_vidi.c | 53 +- trunk/drivers/gpu/drm/exynos/exynos_hdmi.c | 36 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 48 +- trunk/drivers/hwmon/acpi_power_meter.c | 4 - trunk/drivers/hwmon/applesmc.c | 70 +- trunk/drivers/hwmon/coretemp.c | 2 +- trunk/drivers/hwmon/jc42.c | 26 +- trunk/drivers/hwmon/via-cputemp.c | 2 +- trunk/drivers/i2c/busses/Kconfig | 7 +- trunk/drivers/i2c/busses/i2c-at91.c | 13 +- trunk/drivers/i2c/busses/i2c-bfin-twi.c | 147 +- trunk/drivers/i2c/busses/i2c-imx.c | 75 +- trunk/drivers/i2c/busses/i2c-mv64xxx.c | 133 +- trunk/drivers/i2c/busses/i2c-mxs.c | 68 +- trunk/drivers/i2c/busses/i2c-nomadik.c | 189 +- trunk/drivers/i2c/busses/i2c-ocores.c | 113 +- trunk/drivers/i2c/busses/i2c-octeon.c | 92 +- trunk/drivers/i2c/busses/i2c-omap.c | 155 +- trunk/drivers/i2c/busses/i2c-pnx.c | 19 +- trunk/drivers/i2c/busses/i2c-puv3.c | 15 +- trunk/drivers/i2c/busses/i2c-pxa.c | 7 + trunk/drivers/i2c/busses/i2c-s3c2410.c | 6 +- trunk/drivers/i2c/busses/i2c-stu300.c | 102 +- trunk/drivers/i2c/busses/i2c-tegra.c | 122 +- trunk/drivers/i2c/i2c-core.c | 44 +- trunk/drivers/input/misc/88pm80x_onkey.c | 168 - trunk/drivers/input/misc/Kconfig | 10 - trunk/drivers/input/misc/Makefile | 1 - trunk/drivers/input/misc/ab8500-ponkey.c | 4 +- trunk/drivers/input/mouse/synaptics.c | 22 - trunk/drivers/input/tablet/wacom_wac.c | 21 +- trunk/drivers/input/tablet/wacom_wac.h | 3 +- trunk/drivers/input/touchscreen/Kconfig | 13 - trunk/drivers/input/touchscreen/Makefile | 1 - trunk/drivers/input/touchscreen/edt-ft5x06.c | 898 --- trunk/drivers/md/Kconfig | 9 + trunk/drivers/md/dm-crypt.c | 219 +- trunk/drivers/md/dm-delay.c | 2 +- trunk/drivers/md/dm-exception-store.c | 13 +- trunk/drivers/md/dm-flakey.c | 2 +- trunk/drivers/md/dm-ioctl.c | 5 +- trunk/drivers/md/dm-linear.c | 2 +- trunk/drivers/md/dm-log.c | 13 +- trunk/drivers/md/dm-mpath.c | 49 +- trunk/drivers/md/dm-raid.c | 56 +- trunk/drivers/md/dm-raid1.c | 10 +- trunk/drivers/md/dm-snap.c | 34 +- trunk/drivers/md/dm-stripe.c | 87 +- trunk/drivers/md/dm-table.c | 3 - trunk/drivers/md/dm-thin-metadata.c | 769 +- trunk/drivers/md/dm-thin-metadata.h | 25 +- trunk/drivers/md/dm-thin.c | 542 +- trunk/drivers/md/dm-verity.c | 2 +- trunk/drivers/md/dm.c | 40 +- trunk/drivers/md/dm.h | 5 - trunk/drivers/md/persistent-data/Makefile | 1 + .../md/persistent-data/dm-block-manager.c | 105 +- .../md/persistent-data/dm-block-manager.h | 21 +- .../md/persistent-data/dm-space-map-checker.c | 446 ++ .../md/persistent-data/dm-space-map-checker.h | 26 + .../md/persistent-data/dm-space-map-common.c | 12 +- .../md/persistent-data/dm-space-map-common.h | 1 - .../md/persistent-data/dm-space-map-disk.c | 34 +- .../persistent-data/dm-transaction-manager.c | 91 +- .../persistent-data/dm-transaction-manager.h | 11 +- trunk/drivers/media/Kconfig | 114 +- trunk/drivers/media/common/tuners/Kconfig | 64 +- .../media/common/tuners/tuner-xc2028.c | 249 +- trunk/drivers/media/common/tuners/xc5000.c | 6 - .../media/dvb/ddbridge/ddbridge-core.c | 1 - .../drivers/media/dvb/dvb-core/dvb_frontend.h | 1 - trunk/drivers/media/dvb/dvb-usb/Kconfig | 3 - trunk/drivers/media/dvb/dvb-usb/az6007.c | 4 +- trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 - trunk/drivers/media/dvb/dvb-usb/rtl28xxu.c | 516 +- trunk/drivers/media/dvb/frontends/Kconfig | 8 - trunk/drivers/media/dvb/frontends/Makefile | 1 - trunk/drivers/media/dvb/frontends/a8293.c | 37 +- trunk/drivers/media/dvb/frontends/drxk.h | 11 +- trunk/drivers/media/dvb/frontends/drxk_hard.c | 350 +- trunk/drivers/media/dvb/frontends/drxk_hard.h | 17 +- trunk/drivers/media/dvb/frontends/rtl2832.c | 789 -- trunk/drivers/media/dvb/frontends/rtl2832.h | 74 - .../media/dvb/frontends/rtl2832_priv.h | 260 - trunk/drivers/media/dvb/frontends/s5h1420.c | 20 + .../drivers/media/dvb/frontends/stb0899_drv.c | 22 +- trunk/drivers/media/dvb/frontends/stv0367.c | 5 +- trunk/drivers/media/dvb/frontends/stv090x.c | 4 +- trunk/drivers/media/dvb/frontends/tda10071.c | 351 +- .../media/dvb/frontends/tda10071_priv.h | 15 +- trunk/drivers/media/dvb/ngene/ngene-cards.c | 1 - trunk/drivers/media/radio/Kconfig | 1 - trunk/drivers/media/radio/lm7000.h | 43 - trunk/drivers/media/radio/radio-aimslab.c | 66 +- trunk/drivers/media/radio/radio-mr800.c | 5 +- trunk/drivers/media/radio/radio-sf16fmi.c | 61 +- trunk/drivers/media/radio/radio-wl1273.c | 3 +- .../media/radio/si470x/radio-si470x-common.c | 6 +- trunk/drivers/media/radio/wl128x/fmdrv_rx.c | 2 +- trunk/drivers/media/radio/wl128x/fmdrv_v4l2.c | 4 +- trunk/drivers/media/rc/Kconfig | 49 +- trunk/drivers/media/rc/ene_ir.c | 3 +- trunk/drivers/media/rc/fintek-cir.c | 32 +- trunk/drivers/media/rc/gpio-ir-recv.c | 26 +- trunk/drivers/media/rc/nuvoton-cir.c | 145 +- trunk/drivers/media/video/Kconfig | 85 +- trunk/drivers/media/video/Makefile | 1 - trunk/drivers/media/video/adv7393.c | 487 -- trunk/drivers/media/video/adv7393_regs.h | 188 - trunk/drivers/media/video/bt8xx/bttv-cards.c | 1 - trunk/drivers/media/video/bt8xx/bttv-driver.c | 6 + trunk/drivers/media/video/cpia2/cpia2_v4l.c | 2 +- trunk/drivers/media/video/cs8420.h | 50 + trunk/drivers/media/video/cx18/cx18-ioctl.c | 18 + trunk/drivers/media/video/cx18/cx18-ioctl.h | 2 + trunk/drivers/media/video/cx18/cx18-streams.c | 4 +- .../media/video/cx231xx/cx231xx-avcore.c | 56 +- .../media/video/cx231xx/cx231xx-cards.c | 17 +- trunk/drivers/media/video/cx88/cx88-alsa.c | 31 +- .../drivers/media/video/cx88/cx88-blackbird.c | 234 +- trunk/drivers/media/video/cx88/cx88-cards.c | 20 - trunk/drivers/media/video/cx88/cx88-core.c | 7 +- trunk/drivers/media/video/cx88/cx88-video.c | 901 ++- trunk/drivers/media/video/cx88/cx88.h | 68 +- .../drivers/media/video/em28xx/em28xx-audio.c | 27 +- .../drivers/media/video/em28xx/em28xx-cards.c | 7 +- .../drivers/media/video/em28xx/em28xx-core.c | 33 +- trunk/drivers/media/video/em28xx/em28xx-dvb.c | 95 +- trunk/drivers/media/video/em28xx/em28xx-i2c.c | 1 - .../drivers/media/video/em28xx/em28xx-input.c | 2 +- trunk/drivers/media/video/em28xx/em28xx-reg.h | 51 +- trunk/drivers/media/video/ibmmpeg2.h | 94 + trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 12 + trunk/drivers/media/video/ivtv/ivtv-ioctl.h | 1 + trunk/drivers/media/video/ivtv/ivtv-streams.c | 4 +- trunk/drivers/media/video/m5mols/Kconfig | 1 - trunk/drivers/media/video/mem2mem_testdev.c | 135 +- trunk/drivers/media/video/mt9m001.c | 2 +- trunk/drivers/media/video/mt9m032.c | 13 +- trunk/drivers/media/video/mt9m111.c | 1 + trunk/drivers/media/video/mt9p031.c | 5 +- trunk/drivers/media/video/mt9t001.c | 13 +- trunk/drivers/media/video/mt9v022.c | 2 +- trunk/drivers/media/video/omap3isp/ispccdc.c | 8 +- .../drivers/media/video/omap3isp/isppreview.c | 8 +- .../drivers/media/video/omap3isp/ispresizer.c | 6 +- trunk/drivers/media/video/pvrusb2/Kconfig | 1 + .../media/video/pvrusb2/pvrusb2-v4l2.c | 12 +- trunk/drivers/media/video/pwc/pwc-if.c | 171 +- trunk/drivers/media/video/pwc/pwc-v4l.c | 165 +- trunk/drivers/media/video/pwc/pwc.h | 3 + .../media/video/s5p-fimc/fimc-capture.c | 34 +- .../drivers/media/video/s5p-fimc/fimc-core.c | 2 +- .../media/video/s5p-fimc/fimc-lite-reg.c | 2 +- .../drivers/media/video/s5p-fimc/fimc-lite.c | 15 +- .../media/video/s5p-fimc/fimc-mdevice.c | 7 +- .../drivers/media/video/s5p-jpeg/jpeg-core.c | 28 +- .../drivers/media/video/s5p-tv/mixer_video.c | 8 +- .../drivers/media/video/s5p-tv/sii9234_drv.c | 12 +- trunk/drivers/media/video/saa7121.h | 132 + .../drivers/media/video/saa7134/saa7134-dvb.c | 82 +- trunk/drivers/media/video/saa7146.h | 112 + trunk/drivers/media/video/saa7146reg.h | 283 + .../drivers/media/video/saa7164/saa7164-api.c | 14 + trunk/drivers/media/video/smiapp/Kconfig | 1 - .../drivers/media/video/smiapp/smiapp-core.c | 40 +- trunk/drivers/media/video/sn9c102/sn9c102.h | 2 +- trunk/drivers/media/video/tuner-core.c | 15 +- trunk/drivers/media/video/tvaudio.c | 291 +- trunk/drivers/media/video/tvp5150.c | 95 +- trunk/drivers/media/video/uvc/Kconfig | 1 - trunk/drivers/media/video/uvc/uvc_ctrl.c | 5 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 2 +- trunk/drivers/media/video/uvc/uvc_video.c | 8 +- .../drivers/media/video/v4l2-compat-ioctl32.c | 9 +- trunk/drivers/media/video/v4l2-dev.c | 65 +- trunk/drivers/media/video/v4l2-ioctl.c | 3287 ++++---- trunk/drivers/media/video/v4l2-subdev.c | 4 +- trunk/drivers/media/video/videobuf-core.c | 16 + .../drivers/media/video/videobuf-dma-contig.c | 2 +- trunk/drivers/media/video/videobuf2-core.c | 417 +- trunk/drivers/media/video/vivi.c | 194 +- trunk/drivers/media/video/zr364xx.c | 484 +- trunk/drivers/message/i2o/i2o_config.c | 7 - trunk/drivers/message/i2o/i2o_proc.c | 37 +- trunk/drivers/mfd/88pm800.c | 596 -- trunk/drivers/mfd/88pm805.c | 301 - trunk/drivers/mfd/88pm80x.c | 145 - trunk/drivers/mfd/88pm860x-core.c | 23 - trunk/drivers/mfd/Kconfig | 99 +- trunk/drivers/mfd/Makefile | 15 +- trunk/drivers/mfd/ab3100-core.c | 23 +- trunk/drivers/mfd/ab8500-core.c | 242 +- trunk/drivers/mfd/ab8500-debugfs.c | 12 +- trunk/drivers/mfd/ab8500-gpadc.c | 9 +- trunk/drivers/mfd/ab8500-sysctrl.c | 6 + trunk/drivers/mfd/adp5520.c | 2 +- trunk/drivers/mfd/anatop-mfd.c | 2 +- trunk/drivers/mfd/arizona-core.c | 566 -- trunk/drivers/mfd/arizona-i2c.c | 97 - trunk/drivers/mfd/arizona-irq.c | 275 - trunk/drivers/mfd/arizona-spi.c | 97 - trunk/drivers/mfd/arizona.h | 40 - trunk/drivers/mfd/da9052-core.c | 1 + trunk/drivers/mfd/db8500-prcmu.c | 92 +- trunk/drivers/mfd/dbx500-prcmu-regs.h | 1 - trunk/drivers/mfd/max77686-irq.c | 319 - trunk/drivers/mfd/max77686.c | 187 - trunk/drivers/mfd/max77693.c | 11 +- trunk/drivers/mfd/max8925-core.c | 8 +- trunk/drivers/mfd/max8997-irq.c | 62 +- trunk/drivers/mfd/max8997.c | 9 +- trunk/drivers/mfd/mc13xxx-core.c | 4 + trunk/drivers/mfd/mc13xxx-i2c.c | 12 +- trunk/drivers/mfd/mc13xxx-spi.c | 15 +- trunk/drivers/mfd/mfd-core.c | 30 +- trunk/drivers/mfd/pcf50633-core.c | 9 +- trunk/drivers/mfd/s5m-core.c | 206 + trunk/drivers/mfd/s5m-irq.c | 495 ++ trunk/drivers/mfd/sec-core.c | 216 - trunk/drivers/mfd/sec-irq.c | 317 - trunk/drivers/mfd/tc3589x.c | 9 +- trunk/drivers/mfd/timberdale.c | 2 +- trunk/drivers/mfd/tps65090.c | 4 +- trunk/drivers/mfd/tps6586x.c | 296 +- trunk/drivers/mfd/tps65910.c | 23 +- trunk/drivers/mfd/twl-core.c | 12 +- trunk/drivers/mfd/twl6040-core.c | 24 +- trunk/drivers/mfd/wm5102-tables.c | 2399 ------ trunk/drivers/mfd/wm5110-tables.c | 2281 ------ trunk/drivers/mfd/wm8350-core.c | 354 +- trunk/drivers/mfd/wm8350-i2c.c | 5 + trunk/drivers/mfd/wm8350-irq.c | 8 +- trunk/drivers/mfd/wm8350-regmap.c | 3222 +++++++- trunk/drivers/mfd/wm8994-core.c | 17 +- trunk/drivers/mfd/wm8994-irq.c | 10 +- trunk/drivers/misc/Kconfig | 1 - trunk/drivers/misc/ab8500-pwm.c | 6 + trunk/drivers/misc/lkdtm.c | 2 - trunk/drivers/misc/ti-st/st_core.c | 5 - trunk/drivers/mtd/nand/jz4740_nand.c | 228 +- trunk/drivers/net/can/c_can/c_can_platform.c | 8 + .../drivers/net/ethernet/octeon/octeon_mgmt.c | 312 +- .../net/ethernet/qlogic/qlge/qlge_main.c | 1 + .../net/ethernet/stmicro/stmmac/stmmac.h | 42 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 33 +- trunk/drivers/net/phy/mdio-octeon.c | 92 +- trunk/drivers/platform/x86/acer-wmi.c | 153 +- trunk/drivers/platform/x86/apple-gmux.c | 6 - trunk/drivers/platform/x86/asus-nb-wmi.c | 108 +- trunk/drivers/platform/x86/asus-wmi.c | 23 +- trunk/drivers/platform/x86/asus-wmi.h | 1 - trunk/drivers/platform/x86/classmate-laptop.c | 405 +- trunk/drivers/platform/x86/dell-laptop.c | 54 - trunk/drivers/platform/x86/eeepc-wmi.c | 25 +- trunk/drivers/platform/x86/samsung-laptop.c | 41 +- trunk/drivers/platform/x86/thinkpad_acpi.c | 5 +- trunk/drivers/power/Kconfig | 1 - trunk/drivers/power/bq27x00_battery.c | 155 +- trunk/drivers/power/charger-manager.c | 152 +- trunk/drivers/power/ds2781_battery.c | 2 +- trunk/drivers/power/gpio-charger.c | 2 +- trunk/drivers/power/lp8727_charger.c | 2 +- trunk/drivers/power/max17042_battery.c | 8 - trunk/drivers/power/olpc_battery.c | 62 +- trunk/drivers/power/pda_power.c | 4 +- trunk/drivers/power/power_supply_core.c | 65 - trunk/drivers/power/power_supply_sysfs.c | 8 - trunk/drivers/power/sbs-battery.c | 2 +- trunk/drivers/power/smb347-charger.c | 123 +- trunk/drivers/power/test_power.c | 75 - trunk/drivers/power/twl4030_charger.c | 80 +- trunk/drivers/pps/pps.c | 4 +- trunk/drivers/pwm/Kconfig | 108 - trunk/drivers/pwm/Makefile | 11 - trunk/drivers/pwm/core.c | 713 -- trunk/drivers/pwm/pwm-bfin.c | 162 - trunk/drivers/pwm/pwm-lpc32xx.c | 148 - trunk/drivers/pwm/pwm-mxs.c | 203 - trunk/drivers/pwm/pwm-pxa.c | 218 - trunk/drivers/pwm/pwm-tegra.c | 261 - trunk/drivers/pwm/pwm-tiecap.c | 232 - trunk/drivers/pwm/pwm-tiehrpwm.c | 411 - trunk/drivers/pwm/pwm-vt8500.c | 177 - trunk/drivers/regulator/Kconfig | 2 +- trunk/drivers/regulator/ab8500.c | 6 + trunk/drivers/regulator/db8500-prcmu.c | 6 + trunk/drivers/regulator/s5m8767.c | 78 +- trunk/drivers/rtc/Kconfig | 11 - trunk/drivers/rtc/Makefile | 1 - trunk/drivers/rtc/rtc-88pm80x.c | 371 - trunk/drivers/rtc/rtc-ab8500.c | 42 +- trunk/drivers/rtc/rtc-coh901331.c | 61 +- trunk/drivers/rtc/rtc-da9052.c | 5 +- trunk/drivers/rtc/rtc-max8925.c | 13 +- trunk/drivers/rtc/rtc-mc13xxx.c | 6 +- trunk/drivers/rtc/rtc-pcf8563.c | 11 - trunk/drivers/rtc/rtc-pl031.c | 95 +- trunk/drivers/rtc/rtc-r9701.c | 6 +- trunk/drivers/rtc/rtc-s3c.c | 4 +- trunk/drivers/spi/Kconfig | 9 - trunk/drivers/spi/Makefile | 1 - trunk/drivers/spi/spi-falcon.c | 469 -- trunk/drivers/staging/media/lirc/lirc_sir.c | 60 +- trunk/drivers/staging/media/solo6x10/TODO | 2 +- trunk/drivers/staging/media/solo6x10/i2c.c | 2 +- trunk/drivers/staging/octeon/ethernet-mdio.c | 28 +- trunk/drivers/staging/octeon/ethernet.c | 153 +- .../drivers/staging/octeon/octeon-ethernet.h | 3 - trunk/drivers/thermal/thermal_sys.c | 2 +- trunk/drivers/usb/gadget/m66592-udc.c | 9 +- trunk/drivers/usb/gadget/m66592-udc.h | 5 + trunk/drivers/usb/gadget/r8a66597-udc.c | 11 +- trunk/drivers/usb/gadget/r8a66597-udc.h | 5 + trunk/drivers/usb/host/ehci-omap.c | 8 +- trunk/drivers/usb/host/r8a66597-hcd.c | 12 + trunk/drivers/usb/host/r8a66597.h | 5 + trunk/drivers/usb/musb/musb_core.h | 8 + trunk/drivers/video/backlight/Kconfig | 2 +- trunk/drivers/video/backlight/atmel-pwm-bl.c | 19 +- trunk/drivers/video/backlight/corgi_lcd.c | 19 +- trunk/drivers/video/backlight/l4f00242t03.c | 29 +- trunk/drivers/video/backlight/lm3533_bl.c | 8 +- trunk/drivers/video/backlight/lms283gf05.c | 24 +- trunk/drivers/video/backlight/lp855x_bl.c | 10 +- trunk/drivers/video/backlight/ot200_bl.c | 21 +- trunk/drivers/video/backlight/pwm_bl.c | 159 +- trunk/drivers/video/backlight/tosa_bl.c | 8 +- trunk/drivers/video/backlight/tosa_lcd.c | 7 +- trunk/fs/affs/bitmap.c | 28 +- trunk/fs/btrfs/ctree.h | 13 - trunk/fs/btrfs/disk-io.c | 2 +- trunk/fs/btrfs/relocation.c | 2 +- trunk/fs/btrfs/super.c | 41 +- trunk/fs/cachefiles/rdwr.c | 2 +- trunk/fs/ceph/dir.c | 7 +- trunk/fs/ceph/mds_client.c | 23 +- trunk/fs/ceph/snap.c | 18 +- trunk/fs/ceph/super.c | 1 - trunk/fs/ceph/super.h | 4 +- trunk/fs/ceph/xattr.c | 1 - trunk/fs/exec.c | 42 +- trunk/fs/ext2/balloc.c | 14 +- trunk/fs/ext2/ialloc.c | 1 - trunk/fs/ext3/balloc.c | 2 +- trunk/fs/ext3/bitmap.c | 12 +- trunk/fs/ext4/bitmap.c | 9 +- trunk/fs/fat/dir.c | 255 +- trunk/fs/fat/fat.h | 15 - trunk/fs/fat/inode.c | 12 +- trunk/fs/fat/namei_msdos.c | 11 +- trunk/fs/fat/namei_vfat.c | 11 +- trunk/fs/fcntl.c | 29 - trunk/fs/fs-writeback.c | 4 +- trunk/fs/hfsplus/super.c | 2 +- trunk/fs/lockd/grace.c | 16 +- trunk/fs/lockd/host.c | 92 +- trunk/fs/lockd/netns.h | 7 - trunk/fs/lockd/svc.c | 43 +- trunk/fs/lockd/svc4proc.c | 13 +- trunk/fs/lockd/svclock.c | 16 +- trunk/fs/lockd/svcproc.c | 15 +- trunk/fs/lockd/svcsubs.c | 19 +- trunk/fs/locks.c | 28 +- trunk/fs/minix/itree_v2.c | 3 +- trunk/fs/nfs/Kconfig | 9 +- trunk/fs/nfs/Makefile | 11 +- trunk/fs/nfs/callback_xdr.c | 4 +- trunk/fs/nfs/client.c | 685 +- trunk/fs/nfs/delegation.c | 7 +- trunk/fs/nfs/delegation.h | 19 +- trunk/fs/nfs/dir.c | 107 +- trunk/fs/nfs/direct.c | 6 +- trunk/fs/nfs/file.c | 179 +- trunk/fs/nfs/getroot.c | 50 + trunk/fs/nfs/inode.c | 71 +- trunk/fs/nfs/internal.h | 87 +- trunk/fs/nfs/nfs2xdr.c | 28 +- trunk/fs/nfs/nfs3proc.c | 46 - trunk/fs/nfs/nfs3xdr.c | 43 +- trunk/fs/nfs/nfs4_fs.h | 33 +- trunk/fs/nfs/nfs4client.c | 663 -- trunk/fs/nfs/nfs4file.c | 126 - trunk/fs/nfs/nfs4filelayout.c | 10 +- trunk/fs/nfs/nfs4filelayoutdev.c | 2 +- trunk/fs/nfs/nfs4getroot.c | 49 - trunk/fs/nfs/nfs4proc.c | 303 +- trunk/fs/nfs/nfs4state.c | 114 +- trunk/fs/nfs/nfs4super.c | 360 - trunk/fs/nfs/nfs4sysctl.c | 68 - trunk/fs/nfs/nfs4xdr.c | 84 +- trunk/fs/nfs/pnfs.c | 55 +- trunk/fs/nfs/pnfs.h | 31 +- trunk/fs/nfs/proc.c | 38 - trunk/fs/nfs/read.c | 16 +- trunk/fs/nfs/super.c | 438 +- trunk/fs/nfs/sysctl.c | 26 + trunk/fs/nfs/unlink.c | 2 +- trunk/fs/nfs/write.c | 34 +- trunk/fs/nfsd/export.c | 10 +- trunk/fs/nfsd/netns.h | 4 - trunk/fs/nfsd/nfs4callback.c | 1 + trunk/fs/nfsd/nfs4idmap.c | 4 +- trunk/fs/nfsd/nfs4proc.c | 18 +- trunk/fs/nfsd/nfs4state.c | 201 +- trunk/fs/nfsd/nfs4xdr.c | 2 +- trunk/fs/nfsd/nfsctl.c | 8 +- trunk/fs/nfsd/nfsd.h | 13 - trunk/fs/nfsd/nfssvc.c | 24 +- trunk/fs/nfsd/state.h | 5 +- trunk/fs/nfsd/vfs.c | 10 +- trunk/fs/nilfs2/alloc.h | 14 +- trunk/fs/nilfs2/bmap.h | 7 - trunk/fs/nilfs2/btnode.h | 8 +- trunk/fs/nilfs2/cpfile.c | 10 +- trunk/fs/nilfs2/dat.c | 6 - trunk/fs/nilfs2/export.h | 8 - trunk/fs/nilfs2/ifile.c | 6 +- trunk/fs/nilfs2/inode.c | 7 - trunk/fs/nilfs2/ioctl.c | 4 +- trunk/fs/nilfs2/mdt.h | 7 - trunk/fs/nilfs2/nilfs.h | 17 +- trunk/fs/nilfs2/sufile.c | 8 +- trunk/fs/nilfs2/super.c | 6 +- trunk/fs/nilfs2/the_nilfs.c | 1 - trunk/fs/nilfs2/the_nilfs.h | 6 +- trunk/fs/ntfs/super.c | 17 + trunk/fs/ocfs2/localalloc.c | 8 +- trunk/fs/proc/base.c | 22 +- trunk/fs/qnx4/bitmap.c | 24 +- trunk/fs/super.c | 2 +- trunk/fs/xattr.c | 16 +- trunk/fs/xfs/xfs_alloc_btree.h | 14 + trunk/fs/xfs/xfs_aops.c | 79 +- trunk/fs/xfs/xfs_aops.h | 14 +- trunk/fs/xfs/xfs_attr.c | 78 +- trunk/fs/xfs/xfs_attr_leaf.c | 255 +- trunk/fs/xfs/xfs_attr_leaf.h | 21 +- trunk/fs/xfs/xfs_bmap.c | 2 +- trunk/fs/xfs/xfs_buf.c | 240 +- trunk/fs/xfs/xfs_buf.h | 116 +- trunk/fs/xfs/xfs_buf_item.c | 345 +- trunk/fs/xfs/xfs_buf_item.h | 38 +- trunk/fs/xfs/xfs_da_btree.c | 823 +- trunk/fs/xfs/xfs_da_btree.h | 38 +- trunk/fs/xfs/xfs_dinode.h | 2 +- trunk/fs/xfs/xfs_dir2.c | 4 +- trunk/fs/xfs/xfs_dir2_block.c | 118 +- trunk/fs/xfs/xfs_dir2_data.c | 50 +- trunk/fs/xfs/xfs_dir2_leaf.c | 621 +- trunk/fs/xfs/xfs_dir2_node.c | 236 +- trunk/fs/xfs/xfs_dir2_priv.h | 46 +- trunk/fs/xfs/xfs_dir2_sf.c | 4 +- trunk/fs/xfs/xfs_file.c | 19 +- trunk/fs/xfs/xfs_ialloc.c | 446 +- trunk/fs/xfs/xfs_ialloc.h | 2 + trunk/fs/xfs/xfs_iget.c | 15 + trunk/fs/xfs/xfs_inode.c | 208 +- trunk/fs/xfs/xfs_inode.h | 13 +- trunk/fs/xfs/xfs_iomap.c | 6 +- trunk/fs/xfs/xfs_iops.c | 45 - trunk/fs/xfs/xfs_itable.c | 2 +- trunk/fs/xfs/xfs_log.c | 223 +- trunk/fs/xfs/xfs_log_priv.h | 18 +- trunk/fs/xfs/xfs_log_recover.c | 142 +- trunk/fs/xfs/xfs_mount.c | 11 +- trunk/fs/xfs/xfs_mount.h | 3 + trunk/fs/xfs/xfs_qm.c | 2 +- trunk/fs/xfs/xfs_super.c | 88 +- trunk/fs/xfs/xfs_sync.c | 13 +- trunk/fs/xfs/xfs_trace.h | 2 +- trunk/fs/xfs/xfs_trans.h | 50 +- trunk/fs/xfs/xfs_trans_ail.c | 35 +- trunk/fs/xfs/xfs_trans_buf.c | 68 +- trunk/fs/xfs/xfs_trans_priv.h | 1 - trunk/fs/xfs/xfs_types.h | 14 - trunk/fs/xfs/xfs_utils.c | 17 +- trunk/fs/xfs/xfs_vnodeops.c | 285 +- trunk/include/asm-generic/dma-coherent.h | 1 - .../include/asm-generic/dma-mapping-common.h | 55 - trunk/include/asm-generic/fcntl.h | 4 - trunk/include/drm/exynos_drm.h | 9 + trunk/include/linux/Kbuild | 1 - trunk/include/linux/acpi.h | 10 - trunk/include/linux/aio.h | 38 +- trunk/include/linux/backing-dev.h | 4 +- trunk/include/linux/ceph/ceph_features.h | 27 - trunk/include/linux/ceph/ceph_fs.h | 14 + trunk/include/linux/ceph/decode.h | 49 +- trunk/include/linux/ceph/libceph.h | 10 +- trunk/include/linux/ceph/messenger.h | 60 +- trunk/include/linux/ceph/mon_client.h | 2 +- trunk/include/linux/ceph/msgpool.h | 3 +- trunk/include/linux/clk.h | 168 +- trunk/include/linux/compat.h | 4 +- trunk/include/linux/crush/crush.h | 8 - trunk/include/linux/device-mapper.h | 29 +- trunk/include/linux/dm-ioctl.h | 6 +- trunk/include/linux/dma-attrs.h | 2 - trunk/include/linux/dma-mapping.h | 3 - trunk/include/linux/edac.h | 208 +- trunk/include/linux/firewire.h | 4 +- trunk/include/linux/flex_proportions.h | 101 - trunk/include/linux/fs.h | 5 +- trunk/include/linux/i2c-ocores.h | 3 +- trunk/include/linux/i2c.h | 3 - trunk/include/linux/i2c/twl.h | 2 - trunk/include/linux/input/edt-ft5x06.h | 24 - trunk/include/linux/kern_levels.h | 25 - trunk/include/linux/key-type.h | 1 - trunk/include/linux/libfdt.h | 8 - trunk/include/linux/libfdt_env.h | 13 - trunk/include/linux/lockd/lockd.h | 6 +- .../linux/{platform_data => }/lp855x.h | 6 + .../linux/{platform_data => }/lp8727.h | 0 trunk/include/linux/mempolicy.h | 2 +- trunk/include/linux/mfd/88pm80x.h | 369 - trunk/include/linux/mfd/88pm860x.h | 1 - trunk/include/linux/mfd/abx500/ab8500.h | 5 - trunk/include/linux/mfd/arizona/core.h | 114 - trunk/include/linux/mfd/arizona/pdata.h | 119 - trunk/include/linux/mfd/arizona/registers.h | 6594 ----------------- trunk/include/linux/mfd/core.h | 5 - trunk/include/linux/mfd/db8500-prcmu.h | 7 +- trunk/include/linux/mfd/dbx500-prcmu.h | 7 +- trunk/include/linux/mfd/max77686-private.h | 246 - trunk/include/linux/mfd/max77686.h | 114 - trunk/include/linux/mfd/max77693-private.h | 1 + trunk/include/linux/mfd/max8997-private.h | 4 +- trunk/include/linux/mfd/max8997.h | 1 + trunk/include/linux/mfd/s5m87xx/s5m-core.h | 379 + trunk/include/linux/mfd/s5m87xx/s5m-pmic.h | 129 + .../mfd/{samsung/rtc.h => s5m87xx/s5m-rtc.h} | 69 +- trunk/include/linux/mfd/samsung/core.h | 159 - trunk/include/linux/mfd/samsung/irq.h | 152 - trunk/include/linux/mfd/samsung/s2mps11.h | 196 - trunk/include/linux/mfd/samsung/s5m8763.h | 96 - trunk/include/linux/mfd/samsung/s5m8767.h | 188 - trunk/include/linux/mfd/tps65910.h | 1 - trunk/include/linux/mfd/twl6040.h | 6 +- trunk/include/linux/mfd/wm8350/core.h | 26 +- trunk/include/linux/mfd/wm8994/pdata.h | 1 - trunk/include/linux/mm_types.h | 11 +- trunk/include/linux/nfs_fs.h | 8 + trunk/include/linux/nfs_fs_sb.h | 3 +- trunk/include/linux/nfs_page.h | 2 +- trunk/include/linux/nfs_xdr.h | 16 +- trunk/include/linux/nilfs2_fs.h | 63 +- trunk/include/linux/of.h | 16 - trunk/include/linux/platform_data/mv_usb.h | 9 + trunk/include/linux/power/charger-manager.h | 67 +- trunk/include/linux/power_supply.h | 13 - trunk/include/linux/printk.h | 41 +- trunk/include/linux/pwm.h | 117 - trunk/include/linux/pwm_backlight.h | 1 - trunk/include/linux/scatterlist.h | 4 - trunk/include/linux/sched.h | 13 - trunk/include/linux/shm.h | 6 +- trunk/include/linux/slab.h | 24 - trunk/include/linux/slab_def.h | 12 +- trunk/include/linux/slub_def.h | 3 +- trunk/include/linux/string.h | 3 - trunk/include/linux/sunrpc/auth.h | 2 - trunk/include/linux/sunrpc/cache.h | 34 +- trunk/include/linux/sunrpc/gss_api.h | 3 +- trunk/include/linux/sunrpc/svc.h | 2 - trunk/include/linux/sunrpc/xdr.h | 6 +- trunk/include/linux/thermal.h | 2 +- trunk/include/linux/uvcvideo.h | 3 +- trunk/include/linux/v4l2-common.h | 71 - trunk/include/linux/v4l2-subdev.h | 20 +- trunk/include/linux/videodev2.h | 32 +- trunk/include/linux/virtio_blk.h | 10 +- trunk/include/linux/virtio_ids.h | 2 +- trunk/include/linux/vmalloc.h | 9 +- trunk/include/media/adv7393.h | 28 - trunk/include/media/gpio-ir-recv.h | 6 +- trunk/include/media/mt9t001.h | 1 - trunk/include/media/v4l2-chip-ident.h | 3 - trunk/include/media/v4l2-dev.h | 3 - trunk/include/media/v4l2-ioctl.h | 25 +- trunk/include/media/videobuf-core.h | 2 + trunk/include/media/videobuf2-core.h | 54 - trunk/include/media/videobuf2-dma-contig.h | 6 +- trunk/include/ras/ras_event.h | 102 - trunk/ipc/compat.c | 18 +- trunk/ipc/shm.c | 9 +- trunk/ipc/syscall.c | 2 +- trunk/ipc/util.c | 4 +- trunk/ipc/util.h | 2 +- trunk/kernel/events/uprobes.c | 213 +- trunk/kernel/fork.c | 40 +- trunk/kernel/kexec.c | 2 +- trunk/kernel/kmod.c | 37 +- trunk/kernel/panic.c | 8 - trunk/kernel/power/suspend.c | 3 - trunk/kernel/printk.c | 32 +- trunk/kernel/resource.c | 24 +- trunk/kernel/sched/core.c | 2 +- trunk/kernel/sys.c | 57 +- trunk/kernel/sysctl.c | 43 +- trunk/kernel/taskstats.c | 5 - trunk/kernel/watchdog.c | 21 +- trunk/lib/Kconfig | 9 - trunk/lib/Kconfig.debug | 91 +- trunk/lib/Makefile | 14 +- trunk/lib/atomic64_test.c | 5 +- trunk/lib/cpu-notifier-error-inject.c | 63 +- trunk/lib/crc32.c | 2 - trunk/lib/fdt.c | 2 - trunk/lib/fdt_ro.c | 2 - trunk/lib/fdt_rw.c | 2 - trunk/lib/fdt_strerror.c | 2 - trunk/lib/fdt_sw.c | 2 - trunk/lib/fdt_wip.c | 2 - trunk/lib/flex_proportions.c | 272 - trunk/lib/memory-notifier-error-inject.c | 48 - trunk/lib/memweight.c | 38 - trunk/lib/notifier-error-inject.c | 112 - trunk/lib/notifier-error-inject.h | 24 - .../pSeries-reconfig-notifier-error-inject.c | 51 - trunk/lib/pm-notifier-error-inject.c | 49 - trunk/lib/scatterlist.c | 72 +- trunk/lib/spinlock_debug.c | 2 +- trunk/lib/vsprintf.c | 83 +- trunk/mm/Makefile | 3 +- trunk/mm/backing-dev.c | 6 +- trunk/mm/memory-failure.c | 6 +- trunk/mm/mempolicy.c | 8 +- trunk/mm/mmap.c | 6 + trunk/mm/page-writeback.c | 107 +- trunk/mm/slab.c | 406 +- trunk/mm/slab.h | 33 - trunk/mm/slab_common.c | 120 - trunk/mm/slob.c | 152 +- trunk/mm/slub.c | 436 +- trunk/mm/vmalloc.c | 28 +- trunk/net/ceph/ceph_common.c | 25 +- trunk/net/ceph/crush/mapper.c | 13 +- trunk/net/ceph/messenger.c | 925 +-- trunk/net/ceph/mon_client.c | 76 +- trunk/net/ceph/msgpool.c | 7 +- trunk/net/ceph/osd_client.c | 77 +- trunk/net/ceph/osdmap.c | 59 +- trunk/net/sunrpc/auth.c | 54 - trunk/net/sunrpc/auth_gss/auth_gss.c | 1 - trunk/net/sunrpc/auth_gss/gss_mech_switch.c | 20 +- trunk/net/sunrpc/cache.c | 5 +- trunk/net/sunrpc/clnt.c | 3 +- trunk/net/sunrpc/xdr.c | 127 +- trunk/scripts/checkpatch.pl | 71 +- .../coccinelle/iterators/use_after_iter.cocci | 147 - .../coccinelle/misc/irqf_oneshot.cocci | 65 - trunk/scripts/config | 62 +- trunk/scripts/kconfig/.gitignore | 1 + trunk/scripts/kconfig/Makefile | 41 +- trunk/scripts/kconfig/confdata.c | 61 +- .../kconfig/lxdialog/check-lxdialog.sh | 8 +- trunk/scripts/kconfig/lxdialog/textbox.c | 3 - trunk/scripts/kconfig/mconf.c | 6 +- trunk/scripts/kconfig/nconf.c | 10 +- trunk/scripts/kconfig/nconf.gui.c | 8 +- trunk/scripts/kconfig/streamline_config.pl | 175 +- trunk/scripts/link-vmlinux.sh | 4 +- trunk/scripts/package/builddeb | 7 +- trunk/scripts/sortextable.c | 1 - trunk/scripts/tags.sh | 6 +- trunk/security/selinux/hooks.c | 16 +- trunk/security/smack/smackfs.c | 8 +- trunk/sound/core/misc.c | 13 +- trunk/sound/i2c/other/tea575x-tuner.c | 4 +- trunk/sound/soc/codecs/twl6040.c | 2 +- trunk/tools/lib/traceevent/.gitignore | 1 - trunk/tools/lib/traceevent/Makefile | 14 +- trunk/tools/perf/Makefile | 4 - trunk/tools/perf/builtin-test.c | 4 - trunk/tools/perf/builtin-top.c | 2 +- trunk/tools/perf/ui/browsers/hists.c | 4 +- trunk/tools/perf/util/annotate.c | 15 +- trunk/tools/perf/util/dso-test-data.c | 153 - trunk/tools/perf/util/evlist.c | 2 +- trunk/tools/perf/util/header.c | 6 - trunk/tools/perf/util/hist.c | 7 +- trunk/tools/perf/util/map.c | 41 +- trunk/tools/perf/util/map.h | 1 - trunk/tools/perf/util/parse-events.c | 2 - trunk/tools/perf/util/session.c | 5 +- trunk/tools/perf/util/symbol.c | 447 +- trunk/tools/perf/util/symbol.h | 54 +- trunk/tools/perf/util/target.c | 11 +- .../tools/testing/fault-injection/failcmd.sh | 219 - trunk/tools/testing/ktest/ktest.pl | 167 +- trunk/tools/testing/ktest/sample.conf | 52 - trunk/tools/testing/selftests/Makefile | 2 +- .../testing/selftests/cpu-hotplug/Makefile | 6 - .../selftests/cpu-hotplug/on-off-test.sh | 221 - .../testing/selftests/memory-hotplug/Makefile | 6 - .../selftests/memory-hotplug/on-off-test.sh | 230 - trunk/tools/vm/slabinfo.c | 14 +- 1151 files changed, 28217 insertions(+), 62483 deletions(-) delete mode 100644 trunk/Documentation/ABI/testing/sysfs-devices-edac delete mode 100644 trunk/Documentation/DocBook/media/v4l/selections-common.xml delete mode 100644 trunk/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt delete mode 100644 trunk/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt delete mode 100644 trunk/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt delete mode 100644 trunk/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt rename trunk/Documentation/devicetree/bindings/{i2c/gpio-i2c.txt => gpio/gpio_i2c.txt} (100%) delete mode 100644 trunk/Documentation/devicetree/bindings/i2c/cavium-i2c.txt delete mode 100644 trunk/Documentation/devicetree/bindings/i2c/i2c-ocores.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mfd/ab8500.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mfd/max77686.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mips/cavium/bootbus.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mips/cavium/ciu.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mips/cavium/ciu2.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mips/cavium/uctl.txt delete mode 100644 trunk/Documentation/devicetree/bindings/net/cavium-mdio.txt delete mode 100644 trunk/Documentation/devicetree/bindings/net/cavium-mix.txt delete mode 100644 trunk/Documentation/devicetree/bindings/net/cavium-pip.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/serial/cavium-uart.txt delete mode 100644 trunk/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt delete mode 100644 trunk/Documentation/fault-injection/notifier-error-inject.txt delete mode 100644 trunk/Documentation/input/edt-ft5x06.txt delete mode 100644 trunk/Documentation/pwm.txt delete mode 100644 trunk/arch/arm/boot/dts/r8a7740.dtsi delete mode 100644 trunk/arch/arm/boot/dts/sh7377.dtsi delete mode 100644 trunk/arch/arm/configs/kzm9d_defconfig create mode 100644 trunk/arch/arm/mach-pxa/eseries.h delete mode 100644 trunk/arch/arm/mach-shmobile/include/mach/dma-register.h delete mode 100644 trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h delete mode 100644 trunk/arch/arm/mach-shmobile/pm-r8a7740.c delete mode 100644 trunk/arch/arm/mach-shmobile/pm-rmobile.c create mode 100644 trunk/arch/arm/mach-vt8500/pwm.c rename trunk/{drivers/pwm/pwm-imx.c => arch/arm/plat-mxc/pwm.c} (50%) rename trunk/{include/linux/platform_data/i2c-nomadik.h => arch/arm/plat-nomadik/include/plat/i2c.h} (91%) create mode 100644 trunk/arch/arm/plat-pxa/pwm.c rename trunk/{drivers/pwm/pwm-samsung.c => arch/arm/plat-samsung/pwm.c} (56%) create mode 100644 trunk/arch/blackfin/kernel/pwm.c create mode 100644 trunk/arch/frv/include/asm/cpumask.h create mode 100644 trunk/arch/mips/alchemy/devboards/prom.c delete mode 100644 trunk/arch/mips/bcm63xx/dev-flash.c delete mode 100644 trunk/arch/mips/bcm63xx/dev-rng.c delete mode 100644 trunk/arch/mips/bcm63xx/dev-spi.c delete mode 100644 trunk/arch/mips/cavium-octeon/.gitignore create mode 100644 trunk/arch/mips/cavium-octeon/executive/cvmx-fpa.c create mode 100644 trunk/arch/mips/cavium-octeon/executive/cvmx-helper-fpa.c delete mode 100644 trunk/arch/mips/cavium-octeon/octeon_3xxx.dts delete mode 100644 trunk/arch/mips/cavium-octeon/octeon_68xx.dts delete mode 100644 trunk/arch/mips/configs/ls1b_defconfig delete mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h delete mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/irq.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/loongson1.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/platform.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/prom.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/regs-clk.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/regs-wdt.h delete mode 100644 trunk/arch/mips/include/asm/mach-loongson1/war.h delete mode 100644 trunk/arch/mips/include/asm/netlogic/xlp-hal/pcibus.h delete mode 100644 trunk/arch/mips/include/asm/netlogic/xlp-hal/usb.h delete mode 100644 trunk/arch/mips/include/asm/netlogic/xlr/bridge.h delete mode 100644 trunk/arch/mips/include/asm/netlogic/xlr/flash.h create mode 100644 trunk/arch/mips/include/asm/octeon/cvmx-helper-fpa.h create mode 100644 trunk/arch/mips/lib/memcpy-inatomic.S delete mode 100644 trunk/arch/mips/loongson1/Kconfig delete mode 100644 trunk/arch/mips/loongson1/Makefile delete mode 100644 trunk/arch/mips/loongson1/Platform delete mode 100644 trunk/arch/mips/loongson1/common/Makefile delete mode 100644 trunk/arch/mips/loongson1/common/clock.c delete mode 100644 trunk/arch/mips/loongson1/common/irq.c delete mode 100644 trunk/arch/mips/loongson1/common/platform.c delete mode 100644 trunk/arch/mips/loongson1/common/prom.c delete mode 100644 trunk/arch/mips/loongson1/common/reset.c delete mode 100644 trunk/arch/mips/loongson1/common/setup.c delete mode 100644 trunk/arch/mips/loongson1/ls1b/Makefile delete mode 100644 trunk/arch/mips/loongson1/ls1b/board.c delete mode 100644 trunk/arch/mips/netlogic/xlp/of.c delete mode 100644 trunk/arch/mips/netlogic/xlp/usb-init.c delete mode 100644 trunk/arch/mips/netlogic/xlr/platform-flash.c delete mode 100644 trunk/arch/mips/pci/pci-xlp.c create mode 100644 trunk/arch/mn10300/include/asm/ipc.h create mode 100644 trunk/arch/xtensa/include/asm/cpumask.h create mode 100644 trunk/arch/xtensa/include/asm/rmap.h delete mode 100644 trunk/drivers/char/hw_random/bcm63xx-rng.c delete mode 100644 trunk/drivers/edac/highbank_l2_edac.c delete mode 100644 trunk/drivers/edac/highbank_mc_edac.c delete mode 100644 trunk/drivers/gpio/gpio-tps6586x.c delete mode 100644 trunk/drivers/input/misc/88pm80x_onkey.c delete mode 100644 trunk/drivers/input/touchscreen/edt-ft5x06.c create mode 100644 trunk/drivers/md/persistent-data/dm-space-map-checker.c create mode 100644 trunk/drivers/md/persistent-data/dm-space-map-checker.h delete mode 100644 trunk/drivers/media/dvb/frontends/rtl2832.c delete mode 100644 trunk/drivers/media/dvb/frontends/rtl2832.h delete mode 100644 trunk/drivers/media/dvb/frontends/rtl2832_priv.h delete mode 100644 trunk/drivers/media/radio/lm7000.h delete mode 100644 trunk/drivers/media/video/adv7393.c delete mode 100644 trunk/drivers/media/video/adv7393_regs.h create mode 100644 trunk/drivers/media/video/cs8420.h create mode 100644 trunk/drivers/media/video/ibmmpeg2.h create mode 100644 trunk/drivers/media/video/saa7121.h create mode 100644 trunk/drivers/media/video/saa7146.h create mode 100644 trunk/drivers/media/video/saa7146reg.h delete mode 100644 trunk/drivers/mfd/88pm800.c delete mode 100644 trunk/drivers/mfd/88pm805.c delete mode 100644 trunk/drivers/mfd/88pm80x.c delete mode 100644 trunk/drivers/mfd/arizona-core.c delete mode 100644 trunk/drivers/mfd/arizona-i2c.c delete mode 100644 trunk/drivers/mfd/arizona-irq.c delete mode 100644 trunk/drivers/mfd/arizona-spi.c delete mode 100644 trunk/drivers/mfd/arizona.h delete mode 100644 trunk/drivers/mfd/max77686-irq.c delete mode 100644 trunk/drivers/mfd/max77686.c create mode 100644 trunk/drivers/mfd/s5m-core.c create mode 100644 trunk/drivers/mfd/s5m-irq.c delete mode 100644 trunk/drivers/mfd/sec-core.c delete mode 100644 trunk/drivers/mfd/sec-irq.c delete mode 100644 trunk/drivers/mfd/wm5102-tables.c delete mode 100644 trunk/drivers/mfd/wm5110-tables.c delete mode 100644 trunk/drivers/pwm/Kconfig delete mode 100644 trunk/drivers/pwm/Makefile delete mode 100644 trunk/drivers/pwm/core.c delete mode 100644 trunk/drivers/pwm/pwm-bfin.c delete mode 100644 trunk/drivers/pwm/pwm-lpc32xx.c delete mode 100644 trunk/drivers/pwm/pwm-mxs.c delete mode 100644 trunk/drivers/pwm/pwm-pxa.c delete mode 100644 trunk/drivers/pwm/pwm-tegra.c delete mode 100644 trunk/drivers/pwm/pwm-tiecap.c delete mode 100644 trunk/drivers/pwm/pwm-tiehrpwm.c delete mode 100644 trunk/drivers/pwm/pwm-vt8500.c delete mode 100644 trunk/drivers/rtc/rtc-88pm80x.c delete mode 100644 trunk/drivers/spi/spi-falcon.c delete mode 100644 trunk/fs/nfs/nfs4client.c delete mode 100644 trunk/fs/nfs/nfs4file.c delete mode 100644 trunk/fs/nfs/nfs4getroot.c delete mode 100644 trunk/fs/nfs/nfs4super.c delete mode 100644 trunk/fs/nfs/nfs4sysctl.c delete mode 100644 trunk/include/linux/ceph/ceph_features.h delete mode 100644 trunk/include/linux/flex_proportions.h delete mode 100644 trunk/include/linux/input/edt-ft5x06.h delete mode 100644 trunk/include/linux/kern_levels.h delete mode 100644 trunk/include/linux/libfdt.h delete mode 100644 trunk/include/linux/libfdt_env.h rename trunk/include/linux/{platform_data => }/lp855x.h (96%) rename trunk/include/linux/{platform_data => }/lp8727.h (100%) delete mode 100644 trunk/include/linux/mfd/88pm80x.h delete mode 100644 trunk/include/linux/mfd/arizona/core.h delete mode 100644 trunk/include/linux/mfd/arizona/pdata.h delete mode 100644 trunk/include/linux/mfd/arizona/registers.h delete mode 100644 trunk/include/linux/mfd/max77686-private.h delete mode 100644 trunk/include/linux/mfd/max77686.h create mode 100644 trunk/include/linux/mfd/s5m87xx/s5m-core.h create mode 100644 trunk/include/linux/mfd/s5m87xx/s5m-pmic.h rename trunk/include/linux/mfd/{samsung/rtc.h => s5m87xx/s5m-rtc.h} (59%) delete mode 100644 trunk/include/linux/mfd/samsung/core.h delete mode 100644 trunk/include/linux/mfd/samsung/irq.h delete mode 100644 trunk/include/linux/mfd/samsung/s2mps11.h delete mode 100644 trunk/include/linux/mfd/samsung/s5m8763.h delete mode 100644 trunk/include/linux/mfd/samsung/s5m8767.h delete mode 100644 trunk/include/linux/v4l2-common.h delete mode 100644 trunk/include/media/adv7393.h delete mode 100644 trunk/include/ras/ras_event.h delete mode 100644 trunk/lib/fdt.c delete mode 100644 trunk/lib/fdt_ro.c delete mode 100644 trunk/lib/fdt_rw.c delete mode 100644 trunk/lib/fdt_strerror.c delete mode 100644 trunk/lib/fdt_sw.c delete mode 100644 trunk/lib/fdt_wip.c delete mode 100644 trunk/lib/flex_proportions.c delete mode 100644 trunk/lib/memory-notifier-error-inject.c delete mode 100644 trunk/lib/memweight.c delete mode 100644 trunk/lib/notifier-error-inject.c delete mode 100644 trunk/lib/notifier-error-inject.h delete mode 100644 trunk/lib/pSeries-reconfig-notifier-error-inject.c delete mode 100644 trunk/lib/pm-notifier-error-inject.c delete mode 100644 trunk/mm/slab.h delete mode 100644 trunk/mm/slab_common.c delete mode 100644 trunk/scripts/coccinelle/iterators/use_after_iter.cocci delete mode 100644 trunk/scripts/coccinelle/misc/irqf_oneshot.cocci delete mode 100644 trunk/tools/lib/traceevent/.gitignore delete mode 100644 trunk/tools/perf/util/dso-test-data.c delete mode 100644 trunk/tools/testing/fault-injection/failcmd.sh delete mode 100644 trunk/tools/testing/selftests/cpu-hotplug/Makefile delete mode 100644 trunk/tools/testing/selftests/cpu-hotplug/on-off-test.sh delete mode 100644 trunk/tools/testing/selftests/memory-hotplug/Makefile delete mode 100644 trunk/tools/testing/selftests/memory-hotplug/on-off-test.sh diff --git a/[refs] b/[refs] index 199fd0a14ebe..47023c3f8fa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b24ff71108164e047cf2c95990b77651163e315 +refs/heads/master: 1a0150a93c496986297fc08304ac564213c08942 diff --git a/trunk/Documentation/ABI/stable/sysfs-bus-firewire b/trunk/Documentation/ABI/stable/sysfs-bus-firewire index 41e5a0cd1e3e..3d484e5dc846 100644 --- a/trunk/Documentation/ABI/stable/sysfs-bus-firewire +++ b/trunk/Documentation/ABI/stable/sysfs-bus-firewire @@ -39,17 +39,6 @@ Users: udev rules to set ownership and access permissions or ACLs of /dev/fw[0-9]+ character device files -What: /sys/bus/firewire/devices/fw[0-9]+/is_local -Date: July 2012 -KernelVersion: 3.6 -Contact: linux1394-devel@lists.sourceforge.net -Description: - IEEE 1394 node device attribute. - Read-only and immutable. -Values: 1: The sysfs entry represents a local node (a controller card). - 0: The sysfs entry represents a remote node. - - What: /sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/ Date: May 2007 KernelVersion: 2.6.22 diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-rbd b/trunk/Documentation/ABI/testing/sysfs-bus-rbd index 3c17b62899f6..bcd88eb7ebcd 100644 --- a/trunk/Documentation/ABI/testing/sysfs-bus-rbd +++ b/trunk/Documentation/ABI/testing/sysfs-bus-rbd @@ -35,14 +35,8 @@ name pool - The name of the storage pool where this rbd image resides. - An rbd image name is unique within its pool. - -pool_id - - The unique identifier for the rbd image's pool. This is - a permanent attribute of the pool. A pool's id will never - change. + The pool where this rbd image resides. The pool-name pair is unique + per rados system. size diff --git a/trunk/Documentation/ABI/testing/sysfs-devices-edac b/trunk/Documentation/ABI/testing/sysfs-devices-edac deleted file mode 100644 index 30ee78aaed75..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-devices-edac +++ /dev/null @@ -1,140 +0,0 @@ -What: /sys/devices/system/edac/mc/mc*/reset_counters -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This write-only control file will zero all the statistical - counters for UE and CE errors on the given memory controller. - Zeroing the counters will also reset the timer indicating how - long since the last counter were reset. This is useful for - computing errors/time. Since the counters are always reset - at driver initialization time, no module/kernel parameter - is available. - -What: /sys/devices/system/edac/mc/mc*/seconds_since_reset -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays how many seconds have elapsed - since the last counter reset. This can be used with the error - counters to measure error rates. - -What: /sys/devices/system/edac/mc/mc*/mc_name -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays the type of memory controller - that is being utilized. - -What: /sys/devices/system/edac/mc/mc*/size_mb -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays, in count of megabytes, of memory - that this memory controller manages. - -What: /sys/devices/system/edac/mc/mc*/ue_count -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays the total count of uncorrectable - errors that have occurred on this memory controller. If - panic_on_ue is set, this counter will not have a chance to - increment, since EDAC will panic the system - -What: /sys/devices/system/edac/mc/mc*/ue_noinfo_count -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays the number of UEs that have - occurred on this memory controller with no information as to - which DIMM slot is having errors. - -What: /sys/devices/system/edac/mc/mc*/ce_count -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays the total count of correctable - errors that have occurred on this memory controller. This - count is very important to examine. CEs provide early - indications that a DIMM is beginning to fail. This count - field should be monitored for non-zero values and report - such information to the system administrator. - -What: /sys/devices/system/edac/mc/mc*/ce_noinfo_count -Date: January 2006 -Contact: linux-edac@vger.kernel.org -Description: This attribute file displays the number of CEs that - have occurred on this memory controller wherewith no - information as to which DIMM slot is having errors. Memory is - handicapped, but operational, yet no information is available - to indicate which slot the failing memory is in. This count - field should be also be monitored for non-zero values. - -What: /sys/devices/system/edac/mc/mc*/sdram_scrub_rate -Date: February 2007 -Contact: linux-edac@vger.kernel.org -Description: Read/Write attribute file that controls memory scrubbing. - The scrubbing rate used by the memory controller is set by - writing a minimum bandwidth in bytes/sec to the attribute file. - The rate will be translated to an internal value that gives at - least the specified rate. - Reading the file will return the actual scrubbing rate employed. - If configuration fails or memory scrubbing is not implemented, - the value of the attribute file will be -1. - -What: /sys/devices/system/edac/mc/mc*/max_location -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This attribute file displays the information about the last - available memory slot in this memory controller. It is used by - userspace tools in order to display the memory filling layout. - -What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/size -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This attribute file will display the size of dimm or rank. - For dimm*/size, this is the size, in MB of the DIMM memory - stick. For rank*/size, this is the size, in MB for one rank - of the DIMM memory stick. On single rank memories (1R), this - is also the total size of the dimm. On dual rank (2R) memories, - this is half the size of the total DIMM memories. - -What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_dev_type -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This attribute file will display what type of DRAM device is - being utilized on this DIMM (x1, x2, x4, x8, ...). - -What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_edac_mode -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This attribute file will display what type of Error detection - and correction is being utilized. For example: S4ECD4ED would - mean a Chipkill with x4 DRAM. - -What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_label -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This control file allows this DIMM to have a label assigned - to it. With this label in the module, when errors occur - the output can provide the DIMM label in the system log. - This becomes vital for panic events to isolate the - cause of the UE event. - DIMM Labels must be assigned after booting, with information - that correctly identifies the physical slot with its - silk screen label. This information is currently very - motherboard specific and determination of this information - must occur in userland at this time. - -What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_location -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This attribute file will display the location (csrow/channel, - branch/channel/slot or channel/slot) of the dimm or rank. - -What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_mem_type -Date: April 2012 -Contact: Mauro Carvalho Chehab - linux-edac@vger.kernel.org -Description: This attribute file will display what type of memory is - currently on this csrow. Normally, either buffered or - unbuffered memory (for example, Unbuffered-DDR3). diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-asus-wmi b/trunk/Documentation/ABI/testing/sysfs-platform-asus-wmi index 019e1e29370e..2e7df91620de 100644 --- a/trunk/Documentation/ABI/testing/sysfs-platform-asus-wmi +++ b/trunk/Documentation/ABI/testing/sysfs-platform-asus-wmi @@ -29,10 +29,3 @@ KernelVersion: 2.6.39 Contact: "Corentin Chary" Description: Control the card touchpad. 1 means on, 0 means off. - -What: /sys/devices/platform//lid_resume -Date: May 2012 -KernelVersion: 3.5 -Contact: "AceLan Kao" -Description: - Resume on lid open. 1 means on, 0 means off. diff --git a/trunk/Documentation/DMA-attributes.txt b/trunk/Documentation/DMA-attributes.txt index f50309081ac7..5c72eed89563 100644 --- a/trunk/Documentation/DMA-attributes.txt +++ b/trunk/Documentation/DMA-attributes.txt @@ -49,45 +49,3 @@ DMA_ATTR_NON_CONSISTENT lets the platform to choose to return either consistent or non-consistent memory as it sees fit. By using this API, you are guaranteeing to the platform that you have all the correct and necessary sync points for this memory in the driver. - -DMA_ATTR_NO_KERNEL_MAPPING --------------------------- - -DMA_ATTR_NO_KERNEL_MAPPING lets the platform to avoid creating a kernel -virtual mapping for the allocated buffer. On some architectures creating -such mapping is non-trivial task and consumes very limited resources -(like kernel virtual address space or dma consistent address space). -Buffers allocated with this attribute can be only passed to user space -by calling dma_mmap_attrs(). By using this API, you are guaranteeing -that you won't dereference the pointer returned by dma_alloc_attr(). You -can threat it as a cookie that must be passed to dma_mmap_attrs() and -dma_free_attrs(). Make sure that both of these also get this attribute -set on each call. - -Since it is optional for platforms to implement -DMA_ATTR_NO_KERNEL_MAPPING, those that do not will simply ignore the -attribute and exhibit default behavior. - -DMA_ATTR_SKIP_CPU_SYNC ----------------------- - -By default dma_map_{single,page,sg} functions family transfer a given -buffer from CPU domain to device domain. Some advanced use cases might -require sharing a buffer between more than one device. This requires -having a mapping created separately for each device and is usually -performed by calling dma_map_{single,page,sg} function more than once -for the given buffer with device pointer to each device taking part in -the buffer sharing. The first call transfers a buffer from 'CPU' domain -to 'device' domain, what synchronizes CPU caches for the given region -(usually it means that the cache has been flushed or invalidated -depending on the dma direction). However, next calls to -dma_map_{single,page,sg}() for other devices will perform exactly the -same sychronization operation on the CPU cache. CPU cache sychronization -might be a time consuming operation, especially if the buffers are -large, so it is highly recommended to avoid it if possible. -DMA_ATTR_SKIP_CPU_SYNC allows platform code to skip synchronization of -the CPU cache for the given buffer assuming that it has been already -transferred to 'device' domain. This attribute can be also used for -dma_unmap_{single,page,sg} functions family to force buffer to stay in -device domain after releasing a mapping for it. Use this attribute with -care! diff --git a/trunk/Documentation/DocBook/media/v4l/biblio.xml b/trunk/Documentation/DocBook/media/v4l/biblio.xml index 1078e45f189f..7c49facecd25 100644 --- a/trunk/Documentation/DocBook/media/v4l/biblio.xml +++ b/trunk/Documentation/DocBook/media/v4l/biblio.xml @@ -194,7 +194,7 @@ in the frequency range from 87,5 to 108,0 MHz National Radio Systems Committee (http://www.nrscstandards.org) - NRSC-4: United States RBDS Standard + NTSC-4: United States RBDS Standard diff --git a/trunk/Documentation/DocBook/media/v4l/common.xml b/trunk/Documentation/DocBook/media/v4l/common.xml index b91d25313b63..4101aeb56540 100644 --- a/trunk/Documentation/DocBook/media/v4l/common.xml +++ b/trunk/Documentation/DocBook/media/v4l/common.xml @@ -464,14 +464,14 @@ The type field of the respective tuner field contains the index number of the tuner. - Radio input devices have exactly one tuner with index zero, no + Radio devices have exactly one tuner with index zero, no video inputs. To query and change tuner properties applications use the &VIDIOC-G-TUNER; and &VIDIOC-S-TUNER; ioctl, respectively. The &v4l2-tuner; returned by VIDIOC_G_TUNER also contains signal status information applicable when the tuner of the -current video or radio input is queried. Note that +current video input, or a radio tuner is queried. Note that VIDIOC_S_TUNER does not switch the current tuner, when there is more than one at all. The tuner is solely determined by the current video input. Drivers must support both ioctls and set the @@ -491,17 +491,8 @@ the modulator. The type field of the respective &v4l2-output; returned by the &VIDIOC-ENUMOUTPUT; ioctl is set to V4L2_OUTPUT_TYPE_MODULATOR and its modulator field contains the index number -of the modulator. - - Radio output devices have exactly one modulator with index -zero, no video outputs. - - A video or radio device cannot support both a tuner and a -modulator. Two separate device nodes will have to be used for such -hardware, one that supports the tuner functionality and one that supports -the modulator functionality. The reason is a limitation with the -&VIDIOC-S-FREQUENCY; ioctl where you cannot specify whether the frequency -is for a tuner or a modulator. +of the modulator. This specification does not define radio output +devices. To query and change modulator properties applications use the &VIDIOC-G-MODULATOR; and &VIDIOC-S-MODULATOR; ioctl. Note that diff --git a/trunk/Documentation/DocBook/media/v4l/compat.xml b/trunk/Documentation/DocBook/media/v4l/compat.xml index 97b895151bb0..ea42ef824948 100644 --- a/trunk/Documentation/DocBook/media/v4l/compat.xml +++ b/trunk/Documentation/DocBook/media/v4l/compat.xml @@ -2377,11 +2377,10 @@ that used it. It was originally scheduled for removal in 2.6.35. V4L2_CTRL_FLAG_VOLATILE was added to signal volatile controls to userspace. - Add selection API for extended control over cropping - and composing. Does not affect the compatibility of current - drivers and applications. See selection API for - details. + Add selection API for extended control over cropping and +composing. Does not affect the compatibility of current drivers and +applications. See selection API for +details. @@ -2459,18 +2458,6 @@ that used it. It was originally scheduled for removal in 2.6.35. -
- V4L2 in Linux 3.5 - - - Replaced input in - v4l2_buffer by - reserved2 and removed - V4L2_BUF_FLAG_INPUT. - - -
-
Relation of V4L2 to other Linux multimedia APIs diff --git a/trunk/Documentation/DocBook/media/v4l/dev-subdev.xml b/trunk/Documentation/DocBook/media/v4l/dev-subdev.xml index a3d9dd093268..4afcbbec5eda 100644 --- a/trunk/Documentation/DocBook/media/v4l/dev-subdev.xml +++ b/trunk/Documentation/DocBook/media/v4l/dev-subdev.xml @@ -276,7 +276,7 @@
-
+
Selections: cropping, scaling and composition Many sub-devices support cropping frames on their input or output @@ -290,8 +290,8 @@ size. Both the coordinates and sizes are expressed in pixels. As for pad formats, drivers store try and active - rectangles for the selection targets . + rectangles for the selection targets of ACTUAL type . On sink pads, cropping is applied relative to the current pad format. The pad format represents the image size as @@ -308,7 +308,7 @@ Scaling support is optional. When supported by a subdev, the crop rectangle on the subdev's sink pad is scaled to the size configured using the &VIDIOC-SUBDEV-S-SELECTION; IOCTL - using V4L2_SEL_TGT_COMPOSE + using V4L2_SUBDEV_SEL_COMPOSE_ACTUAL selection target on the same pad. If the subdev supports scaling but not composing, the top and left values are not used and must always be set to zero. @@ -323,32 +323,32 @@ The drivers should always use the closest possible rectangle the user requests on all selection targets, unless specifically told otherwise. - V4L2_SEL_FLAG_GE and - V4L2_SEL_FLAG_LE flags may be + V4L2_SUBDEV_SEL_FLAG_SIZE_GE and + V4L2_SUBDEV_SEL_FLAG_SIZE_LE flags may be used to round the image size either up or down. + linkend="v4l2-subdev-selection-flags">
Types of selection targets
- Actual targets + ACTUAL targets - Actual targets (without a postfix) reflect the actual - hardware configuration at any point of time. There is a BOUNDS - target corresponding to every actual target. + ACTUAL targets reflect the actual hardware configuration + at any point of time. There is a BOUNDS target + corresponding to every ACTUAL.
BOUNDS targets - BOUNDS targets is the smallest rectangle that contains all - valid actual rectangles. It may not be possible to set the actual - rectangle as large as the BOUNDS rectangle, however. This may be - because e.g. a sensor's pixel array is not rectangular but - cross-shaped or round. The maximum size may also be smaller than the - BOUNDS rectangle. + BOUNDS targets is the smallest rectangle that contains + all valid ACTUAL rectangles. It may not be possible to set the + ACTUAL rectangle as large as the BOUNDS rectangle, however. + This may be because e.g. a sensor's pixel array is not + rectangular but cross-shaped or round. The maximum size may + also be smaller than the BOUNDS rectangle.
@@ -362,7 +362,7 @@ performed by the user: the changes made will be propagated to any subsequent stages. If this behaviour is not desired, the user must set - V4L2_SEL_FLAG_KEEP_CONFIG flag. This + V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG flag. This flag causes no propagation of the changes are allowed in any circumstances. This may also cause the accessed rectangle to be adjusted by the driver, depending on the properties of the diff --git a/trunk/Documentation/DocBook/media/v4l/io.xml b/trunk/Documentation/DocBook/media/v4l/io.xml index 1885cc0755cb..fd6aca2922b6 100644 --- a/trunk/Documentation/DocBook/media/v4l/io.xml +++ b/trunk/Documentation/DocBook/media/v4l/io.xml @@ -683,12 +683,14 @@ memory, set by the application. See for details. __u32 - reserved2 + input - A place holder for future extensions and custom -(driver defined) buffer types -V4L2_BUF_TYPE_PRIVATE and higher. Applications -should set this to 0. + Some video capture drivers support rapid and +synchronous video input changes, a function useful for example in +video surveillance applications. For this purpose applications set the +V4L2_BUF_FLAG_INPUT flag, and this field to the +number of a video input as in &v4l2-input; field +index. __u32 @@ -919,6 +921,13 @@ previous key frame. The timecode field is valid. Drivers set or clear this flag when the VIDIOC_DQBUF ioctl is called. + + + V4L2_BUF_FLAG_INPUT + 0x0200 + The input field is valid. +Applications set or clear this flag before calling the +VIDIOC_QBUF ioctl. V4L2_BUF_FLAG_PREPARED diff --git a/trunk/Documentation/DocBook/media/v4l/selection-api.xml b/trunk/Documentation/DocBook/media/v4l/selection-api.xml index e7ed5077834d..b299e4779354 100644 --- a/trunk/Documentation/DocBook/media/v4l/selection-api.xml +++ b/trunk/Documentation/DocBook/media/v4l/selection-api.xml @@ -53,10 +53,10 @@ cropping and composing rectangles have the same size. -
+For complete list of the available selection targets see table - See for more - information. +
@@ -74,7 +74,7 @@ cropping/composing rectangles may have to be aligned, and both the source and the sink may have arbitrary upper and lower size limits. Therefore, as usual, drivers are expected to adjust the requested parameters and return the actual values selected. An application can control the rounding behaviour using constraint flags . +linkend="v4l2-sel-flags"> constraint flags .
@@ -91,7 +91,7 @@ top/left corner at position (0,0) . The rectangle's coordinates are expressed in pixels. The top left corner, width and height of the source rectangle, that is -the area actually sampled, is given by the V4L2_SEL_TGT_CROP +the area actually sampled, is given by the V4L2_SEL_TGT_CROP_ACTIVE target. It uses the same coordinate system as V4L2_SEL_TGT_CROP_BOUNDS . The active cropping area must lie completely inside the capture boundaries. The driver may further adjust the @@ -111,13 +111,13 @@ height are equal to the image size set by VIDIOC_S_FMT . The part of a buffer into which the image is inserted by the hardware is -controlled by the V4L2_SEL_TGT_COMPOSE target. +controlled by the V4L2_SEL_TGT_COMPOSE_ACTIVE target. The rectangle's coordinates are also expressed in the same coordinate system as the bounds rectangle. The composing rectangle must lie completely inside bounds rectangle. The driver must adjust the composing rectangle to fit to the bounding limits. Moreover, the driver can perform other adjustments according to hardware limitations. The application can control rounding behaviour using - constraint flags . + constraint flags . For capture devices the default composing rectangle is queried using V4L2_SEL_TGT_COMPOSE_DEFAULT . It is usually equal to the @@ -125,7 +125,7 @@ bounding rectangle. The part of a buffer that is modified by the hardware is given by V4L2_SEL_TGT_COMPOSE_PADDED . It contains all pixels -defined using V4L2_SEL_TGT_COMPOSE plus all +defined using V4L2_SEL_TGT_COMPOSE_ACTIVE plus all padding data modified by hardware during insertion process. All pixels outside this rectangle must not be changed by the hardware. The content of pixels that lie inside the padded area but outside active area is @@ -153,7 +153,7 @@ specified using VIDIOC_S_FMT ioctl. The top left corner, width and height of the source rectangle, that is the area from which image date are processed by the hardware, is given by the - V4L2_SEL_TGT_CROP . Its coordinates are expressed + V4L2_SEL_TGT_CROP_ACTIVE . Its coordinates are expressed in in the same coordinate system as the bounds rectangle. The active cropping area must lie completely inside the crop boundaries and the driver may further adjust the requested size and/or position according to hardware @@ -165,7 +165,7 @@ bounding rectangle. The part of a video signal or graphics display where the image is inserted by the hardware is controlled by -V4L2_SEL_TGT_COMPOSE target. The rectangle's coordinates +V4L2_SEL_TGT_COMPOSE_ACTIVE target. The rectangle's coordinates are expressed in pixels. The composing rectangle must lie completely inside the bounds rectangle. The driver must adjust the area to fit to the bounding limits. Moreover, the driver can perform other adjustments according to @@ -184,7 +184,7 @@ such a padded area is driver-dependent feature not covered by this document. Driver developers are encouraged to keep padded rectangle equal to active one. The padded target is accessed by the V4L2_SEL_TGT_COMPOSE_PADDED identifier. It must contain all pixels from the -V4L2_SEL_TGT_COMPOSE target. +V4L2_SEL_TGT_COMPOSE_ACTIVE target.
@@ -193,8 +193,8 @@ V4L2_SEL_TGT_COMPOSE target. Scaling control An application can detect if scaling is performed by comparing the width -and the height of rectangles obtained using V4L2_SEL_TGT_CROP - and V4L2_SEL_TGT_COMPOSE targets. If +and the height of rectangles obtained using V4L2_SEL_TGT_CROP_ACTIVE + and V4L2_SEL_TGT_COMPOSE_ACTIVE targets. If these are not equal then the scaling is applied. The application can compute the scaling ratios using these values. @@ -252,7 +252,7 @@ area) ret = ioctl(fd, &VIDIOC-G-SELECTION;, &sel); if (ret) exit(-1); - sel.target = V4L2_SEL_TGT_CROP; + sel.target = V4L2_SEL_TGT_CROP_ACTIVE; ret = ioctl(fd, &VIDIOC-S-SELECTION;, &sel); if (ret) exit(-1); @@ -281,7 +281,7 @@ area) r.left = sel.r.width / 4; r.top = sel.r.height / 4; sel.r = r; - sel.target = V4L2_SEL_TGT_COMPOSE; + sel.target = V4L2_SEL_TGT_COMPOSE_ACTIVE; sel.flags = V4L2_SEL_FLAG_LE; ret = ioctl(fd, &VIDIOC-S-SELECTION;, &sel); if (ret) @@ -298,11 +298,11 @@ V4L2_BUF_TYPE_VIDEO_OUTPUT for other devices &v4l2-selection; compose = { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT, - .target = V4L2_SEL_TGT_COMPOSE, + .target = V4L2_SEL_TGT_COMPOSE_ACTIVE, }; &v4l2-selection; crop = { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT, - .target = V4L2_SEL_TGT_CROP, + .target = V4L2_SEL_TGT_CROP_ACTIVE, }; double hscale, vscale; diff --git a/trunk/Documentation/DocBook/media/v4l/selections-common.xml b/trunk/Documentation/DocBook/media/v4l/selections-common.xml deleted file mode 100644 index 7502f784b8cc..000000000000 --- a/trunk/Documentation/DocBook/media/v4l/selections-common.xml +++ /dev/null @@ -1,164 +0,0 @@ -
- - Common selection definitions - - While the V4L2 selection - API and V4L2 subdev - selection APIs are very similar, there's one fundamental - difference between the two. On sub-device API, the selection - rectangle refers to the media bus format, and is bound to a - sub-device's pad. On the V4L2 interface the selection rectangles - refer to the in-memory pixel format. - - This section defines the common definitions of the - selection interfaces on the two APIs. - -
- - Selection targets - - The precise meaning of the selection targets may be - dependent on which of the two interfaces they are used. - - - Selection target definitions - - - - - - - &cs-def; - - - Target name - id - Definition - Valid for V4L2 - Valid for V4L2 subdev - - - - - V4L2_SEL_TGT_CROP - 0x0000 - Crop rectangle. Defines the cropped area. - Yes - Yes - - - V4L2_SEL_TGT_CROP_DEFAULT - 0x0001 - Suggested cropping rectangle that covers the "whole picture". - Yes - No - - - V4L2_SEL_TGT_CROP_BOUNDS - 0x0002 - Bounds of the crop rectangle. All valid crop - rectangles fit inside the crop bounds rectangle. - - Yes - Yes - - - V4L2_SEL_TGT_COMPOSE - 0x0100 - Compose rectangle. Used to configure scaling - and composition. - Yes - Yes - - - V4L2_SEL_TGT_COMPOSE_DEFAULT - 0x0101 - Suggested composition rectangle that covers the "whole picture". - Yes - No - - - V4L2_SEL_TGT_COMPOSE_BOUNDS - 0x0102 - Bounds of the compose rectangle. All valid compose - rectangles fit inside the compose bounds rectangle. - Yes - Yes - - - V4L2_SEL_TGT_COMPOSE_PADDED - 0x0103 - The active area and all padding pixels that are inserted or - modified by hardware. - Yes - No - - - -
- -
- -
- - Selection flags - - - Selection flag definitions - - - - - - - &cs-def; - - - Flag name - id - Definition - Valid for V4L2 - Valid for V4L2 subdev - - - - - V4L2_SEL_FLAG_GE - (1 << 0) - Suggest the driver it should choose greater or - equal rectangle (in size) than was requested. Albeit the - driver may choose a lesser size, it will only do so due to - hardware limitations. Without this flag (and - V4L2_SEL_FLAG_LE) the - behaviour is to choose the closest possible - rectangle. - Yes - Yes - - - V4L2_SEL_FLAG_LE - (1 << 1) - Suggest the driver it - should choose lesser or equal rectangle (in size) than was - requested. Albeit the driver may choose a greater size, it - will only do so due to hardware limitations. - Yes - Yes - - - V4L2_SEL_FLAG_KEEP_CONFIG - (1 << 2) - The configuration must not be propagated to any - further processing steps. If this flag is not given, the - configuration is propagated inside the subdevice to all - further processing steps. - No - Yes - - - -
- -
- -
diff --git a/trunk/Documentation/DocBook/media/v4l/v4l2.xml b/trunk/Documentation/DocBook/media/v4l/v4l2.xml index 36bafc48e03b..008c2d73a484 100644 --- a/trunk/Documentation/DocBook/media/v4l/v4l2.xml +++ b/trunk/Documentation/DocBook/media/v4l/v4l2.xml @@ -589,11 +589,6 @@ and discussions on the V4L mailing list. &sub-write; - - Common definitions for V4L2 and V4L2 subdev interfaces - &sub-selections-common; - - Video For Linux Two Header File &sub-videodev2-h; diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml index 5e73b1c8d095..a2474ecb574a 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml @@ -97,13 +97,7 @@ information. __u32 count - The number of buffers requested or granted. If count == 0, then - VIDIOC_CREATE_BUFS will set index - to the current number of created buffers, and it will check the validity of - memory and format.type. - If those are invalid -1 is returned and errno is set to &EINVAL;, - otherwise VIDIOC_CREATE_BUFS returns 0. It will - never set errno to &EBUSY; in this particular case. + The number of buffers requested or granted. __u32 diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml index 40e58a42eb26..69c178a4d205 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml @@ -135,12 +135,6 @@ bounds or the value in the type field is wrong. - - EBUSY - - A hardware seek is in progress. - - diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-selection.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-selection.xml index f76d8a6d9b92..bb04eff75f45 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-selection.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-selection.xml @@ -65,9 +65,9 @@ Do not use multiplanar buffers. Use V4L2_BUF_TYPE_VIDEO_CAPTURE . Use V4L2_BUF_TYPE_VIDEO_OUTPUT instead of V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE . The next step is setting the value of &v4l2-selection; target field -to V4L2_SEL_TGT_CROP ( -V4L2_SEL_TGT_COMPOSE ). Please refer to table or for additional +to V4L2_SEL_TGT_CROP_ACTIVE ( +V4L2_SEL_TGT_COMPOSE_ACTIVE ). Please refer to table or for additional targets. The flags and reserved fields of &v4l2-selection; are ignored and they must be filled with zeros. The driver fills the rest of the structure or @@ -86,9 +86,9 @@ use multiplanar buffers. Use V4L2_BUF_TYPE_VIDEO_CAPTURE . Use V4L2_BUF_TYPE_VIDEO_OUTPUT instead of V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE . The next step is setting the value of &v4l2-selection; target to -V4L2_SEL_TGT_CROP ( -V4L2_SEL_TGT_COMPOSE ). Please refer to table or for additional +V4L2_SEL_TGT_CROP_ACTIVE ( +V4L2_SEL_TGT_COMPOSE_ACTIVE ). Please refer to table or for additional targets. The &v4l2-rect; r rectangle need to be set to the desired active area. Field &v4l2-selection; reserved is ignored and must be filled with zeros. The driver may adjust @@ -154,8 +154,74 @@ exist no rectangle that satisfies the constraints. - Selection targets and flags are documented in . + + + Selection targets. + + &cs-def; + + + V4L2_SEL_TGT_CROP_ACTIVE + 0x0000 + The area that is currently cropped by hardware. + + + V4L2_SEL_TGT_CROP_DEFAULT + 0x0001 + Suggested cropping rectangle that covers the "whole picture". + + + V4L2_SEL_TGT_CROP_BOUNDS + 0x0002 + Limits for the cropping rectangle. + + + V4L2_SEL_TGT_COMPOSE_ACTIVE + 0x0100 + The area to which data is composed by hardware. + + + V4L2_SEL_TGT_COMPOSE_DEFAULT + 0x0101 + Suggested composing rectangle that covers the "whole picture". + + + V4L2_SEL_TGT_COMPOSE_BOUNDS + 0x0102 + Limits for the composing rectangle. + + + V4L2_SEL_TGT_COMPOSE_PADDED + 0x0103 + The active area and all padding pixels that are inserted or modified by hardware. + + + +
+ + + + + Selection constraint flags + + &cs-def; + + + V4L2_SEL_FLAG_GE + 0x00000001 + Indicates that the adjusted rectangle must contain the original + &v4l2-selection; r rectangle. + + + V4L2_SEL_FLAG_LE + 0x00000002 + Indicates that the adjusted rectangle must be inside the original + &v4l2-rect; r rectangle. + + + +
+
@@ -186,14 +252,14 @@ exist no rectangle that satisfies the constraints. __u32 target - Used to select between cropping + Used to select between cropping and composing rectangles. __u32 flags Flags controlling the selection rectangle adjustments, refer to - selection flags. + selection flags. &v4l2-rect; diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml index 95d5371c1709..62a1aa200a36 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml @@ -275,18 +275,6 @@ can or must be switched. (B/G PAL tuners for example are typically not see the description of ioctl &VIDIOC-ENUMINPUT; for details. Only V4L2_TUNER_ANALOG_TV tuners can have this capability. - - V4L2_TUNER_CAP_HWSEEK_BOUNDED - 0x0004 - If set, then this tuner supports the hardware seek functionality - where the seek stops when it reaches the end of the frequency range. - - - V4L2_TUNER_CAP_HWSEEK_WRAP - 0x0008 - If set, then this tuner supports the hardware seek functionality - where the seek wraps around when it reaches the end of the frequency range. - V4L2_TUNER_CAP_STEREO 0x0010 diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml index 77ff5be0809d..9caa49af580f 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml @@ -71,9 +71,12 @@ initialize the bytesused, field and timestamp fields, see for details. -Applications must also set flags to 0. -The reserved2 and -reserved fields must be set to 0. When using +Applications must also set flags to 0. If a driver +supports capturing from specific video inputs and you want to specify a video +input, then flags should be set to +V4L2_BUF_FLAG_INPUT and the field +input must be initialized to the desired input. +The reserved field must be set to 0. When using the multi-planar API, the m.planes field must contain a userspace pointer to a filled-in array of &v4l2-plane; and the length diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml index f4db44d0d95a..407dfceb71f0 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml @@ -58,9 +58,6 @@ To do this applications initialize the tuner, call the VIDIOC_S_HW_FREQ_SEEK ioctl with a pointer to this structure. - If an error is returned, then the original frequency will - be restored. - This ioctl is supported if the V4L2_CAP_HW_FREQ_SEEK capability is set. @@ -90,10 +87,7 @@ field and the &v4l2-tuner; index field. __u32 wrap_around - If non-zero, wrap around when at the end of the frequency range, else stop seeking. - The &v4l2-tuner; capability field will tell you what the - hardware supports. - + If non-zero, wrap around when at the end of the frequency range, else stop seeking. __u32 @@ -124,15 +118,9 @@ wrong. - ENODATA - - The hardware seek found no channels. - - - - EBUSY + EAGAIN - Another hardware seek is already in progress. + The ioctl timed-out. Try again. diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml index f33cc814a01d..208e9f0da3f3 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml @@ -72,10 +72,10 @@
Types of selection targets - There are two types of selection targets: actual and bounds. The - actual targets are the targets which configure the hardware. The BOUNDS - target will return a rectangle that contain all possible actual - rectangles. + There are two types of selection targets: actual and bounds. + The ACTUAL targets are the targets which configure the hardware. + The BOUNDS target will return a rectangle that contain all + possible ACTUAL rectangles.
@@ -87,8 +87,71 @@ EINVAL.
- Selection targets and flags are documented in . +
+ V4L2 subdev selection targets + + &cs-def; + + + V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL + 0x0000 + Actual crop. Defines the cropping + performed by the processing step. + + + V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS + 0x0002 + Bounds of the crop rectangle. + + + V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL + 0x0100 + Actual compose rectangle. Used to configure scaling + on sink pads and composition on source pads. + + + V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS + 0x0102 + Bounds of the compose rectangle. + + + +
+ + + V4L2 subdev selection flags + + &cs-def; + + + V4L2_SUBDEV_SEL_FLAG_SIZE_GE + (1 << 0) Suggest the driver it + should choose greater or equal rectangle (in size) than + was requested. Albeit the driver may choose a lesser size, + it will only do so due to hardware limitations. Without + this flag (and + V4L2_SUBDEV_SEL_FLAG_SIZE_LE) the + behaviour is to choose the closest possible + rectangle. + + + V4L2_SUBDEV_SEL_FLAG_SIZE_LE + (1 << 1) Suggest the driver it + should choose lesser or equal rectangle (in size) than was + requested. Albeit the driver may choose a greater size, it + will only do so due to hardware limitations. + + + V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG + (1 << 2) + The configuration should not be propagated to any + further processing steps. If this flag is not given, the + configuration is propagated inside the subdevice to all + further processing steps. + + + +
struct <structname>v4l2_subdev_selection</structname> @@ -110,13 +173,13 @@ __u32targetTarget selection rectangle. See - . + .. __u32 flags Flags. See - . + . &v4l2-rect; diff --git a/trunk/Documentation/device-mapper/striped.txt b/trunk/Documentation/device-mapper/striped.txt index 45f3b91ea4c3..f34d3236b9da 100644 --- a/trunk/Documentation/device-mapper/striped.txt +++ b/trunk/Documentation/device-mapper/striped.txt @@ -9,14 +9,15 @@ devices in parallel. Parameters: [ ]+ : Number of underlying devices. - : Size of each chunk of data. Must be at least as - large as the system's PAGE_SIZE. + : Size of each chunk of data. Must be a power-of-2 and at + least as large as the system's PAGE_SIZE. : Full pathname to the underlying block-device, or a "major:minor" device-number. : Starting sector within the device. One or more underlying devices can be specified. The striped device size must -be a multiple of the chunk size multiplied by the number of underlying devices. +be a multiple of the chunk size and a multiple of the number of underlying +devices. Example scripts diff --git a/trunk/Documentation/device-mapper/thin-provisioning.txt b/trunk/Documentation/device-mapper/thin-provisioning.txt index 30b8b83bd333..f5cfc62b7ad3 100644 --- a/trunk/Documentation/device-mapper/thin-provisioning.txt +++ b/trunk/Documentation/device-mapper/thin-provisioning.txt @@ -231,9 +231,6 @@ i) Constructor no_discard_passdown: Don't pass discards down to the underlying data device, but just remove the mapping. - read_only: Don't allow any changes to be made to the pool - metadata. - Data block size must be between 64KB (128 sectors) and 1GB (2097152 sectors) inclusive. @@ -242,7 +239,7 @@ ii) Status / / - [no_]discard_passdown ro|rw + transaction id: A 64-bit number used by userspace to help synchronise with metadata @@ -260,21 +257,6 @@ ii) Status held root. This feature is not yet implemented so '-' is always returned. - discard_passdown|no_discard_passdown - Whether or not discards are actually being passed down to the - underlying device. When this is enabled when loading the table, - it can get disabled if the underlying device doesn't support it. - - ro|rw - If the pool encounters certain types of device failures it will - drop into a read-only metadata mode in which no changes to - the pool metadata (like allocating new blocks) are permitted. - - In serious cases where even a read-only mode is deemed unsafe - no further I/O will be permitted and the status will just - contain the string 'Fail'. The userspace recovery tools - should then be used. - iii) Messages create_thin @@ -347,7 +329,3 @@ regain some space then send the 'trim' message to the pool. ii) Status - - If the pool has encountered device errors and failed, the status - will just contain the string 'Fail'. The userspace recovery - tools should then be used. diff --git a/trunk/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt b/trunk/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt deleted file mode 100644 index 94e642a33db0..000000000000 --- a/trunk/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt +++ /dev/null @@ -1,15 +0,0 @@ -Calxeda Highbank L2 cache ECC - -Properties: -- compatible : Should be "calxeda,hb-sregs-l2-ecc" -- reg : Address and size for ECC error interrupt clear registers. -- interrupts : Should be single bit error interrupt, then double bit error - interrupt. - -Example: - - sregs@fff3c200 { - compatible = "calxeda,hb-sregs-l2-ecc"; - reg = <0xfff3c200 0x100>; - interrupts = <0 71 4 0 72 4>; - }; diff --git a/trunk/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt b/trunk/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt deleted file mode 100644 index f770ac0893d4..000000000000 --- a/trunk/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt +++ /dev/null @@ -1,14 +0,0 @@ -Calxeda DDR memory controller - -Properties: -- compatible : Should be "calxeda,hb-ddr-ctrl" -- reg : Address and size for DDR controller registers. -- interrupts : Interrupt for DDR controller. - -Example: - - memory-controller@fff00000 { - compatible = "calxeda,hb-ddr-ctrl"; - reg = <0xfff00000 0x1000>; - interrupts = <0 91 4>; - }; diff --git a/trunk/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt b/trunk/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt deleted file mode 100644 index 93986a5a8018..000000000000 --- a/trunk/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt +++ /dev/null @@ -1,30 +0,0 @@ -* Compact Flash - -The Cavium Compact Flash device is connected to the Octeon Boot Bus, -and is thus a child of the Boot Bus device. It can read and write -industry standard compact flash devices. - -Properties: -- compatible: "cavium,ebt3000-compact-flash"; - - Compatibility with many Cavium evaluation boards. - -- reg: The base address of the the CF chip select banks. Depending on - the device configuration, there may be one or two banks. - -- cavium,bus-width: The width of the connection to the CF devices. Valid - values are 8 and 16. - -- cavium,true-ide: Optional, if present the CF connection is in True IDE mode. - -- cavium,dma-engine-handle: Optional, a phandle for the DMA Engine connected - to this device. - -Example: - compact-flash@5,0 { - compatible = "cavium,ebt3000-compact-flash"; - reg = <5 0 0x10000>, <6 0 0x10000>; - cavium,bus-width = <16>; - cavium,true-ide; - cavium,dma-engine-handle = <&dma0>; - }; diff --git a/trunk/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt b/trunk/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt deleted file mode 100644 index 9d6dcd3fe7f9..000000000000 --- a/trunk/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt +++ /dev/null @@ -1,49 +0,0 @@ -* General Purpose Input Output (GPIO) bus. - -Properties: -- compatible: "cavium,octeon-3860-gpio" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The base address of the GPIO unit's register bank. - -- gpio-controller: This is a GPIO controller. - -- #gpio-cells: Must be <2>. The first cell is the GPIO pin. - -- interrupt-controller: The GPIO controller is also an interrupt - controller, many of its pins may be configured as an interrupt - source. - -- #interrupt-cells: Must be <2>. The first cell is the GPIO pin - connected to the interrupt source. The second cell is the interrupt - triggering protocol and may have one of four values: - 1 - edge triggered on the rising edge. - 2 - edge triggered on the falling edge - 4 - level triggered active high. - 8 - level triggered active low. - -- interrupts: Interrupt routing for each pin. - -Example: - - gpio-controller@1070000000800 { - #gpio-cells = <2>; - compatible = "cavium,octeon-3860-gpio"; - reg = <0x10700 0x00000800 0x0 0x100>; - gpio-controller; - /* Interrupts are specified by two parts: - * 1) GPIO pin number (0..15) - * 2) Triggering (1 - edge rising - * 2 - edge falling - * 4 - level active high - * 8 - level active low) - */ - interrupt-controller; - #interrupt-cells = <2>; - /* The GPIO pin connect to 16 consecutive CUI bits */ - interrupts = <0 16>, <0 17>, <0 18>, <0 19>, - <0 20>, <0 21>, <0 22>, <0 23>, - <0 24>, <0 25>, <0 26>, <0 27>, - <0 28>, <0 29>, <0 30>, <0 31>; - }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/gpio-i2c.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio_i2c.txt similarity index 100% rename from trunk/Documentation/devicetree/bindings/i2c/gpio-i2c.txt rename to trunk/Documentation/devicetree/bindings/gpio/gpio_i2c.txt diff --git a/trunk/Documentation/devicetree/bindings/i2c/cavium-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/cavium-i2c.txt deleted file mode 100644 index dced82ebe31d..000000000000 --- a/trunk/Documentation/devicetree/bindings/i2c/cavium-i2c.txt +++ /dev/null @@ -1,34 +0,0 @@ -* Two Wire Serial Interface (TWSI) / I2C - -- compatible: "cavium,octeon-3860-twsi" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The base address of the TWSI/I2C bus controller register bank. - -- #address-cells: Must be <1>. - -- #size-cells: Must be <0>. I2C addresses have no size component. - -- interrupts: A single interrupt specifier. - -- clock-frequency: The I2C bus clock rate in Hz. - -Example: - twsi0: i2c@1180000001000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "cavium,octeon-3860-twsi"; - reg = <0x11800 0x00001000 0x0 0x200>; - interrupts = <0 45>; - clock-frequency = <100000>; - - rtc@68 { - compatible = "dallas,ds1337"; - reg = <0x68>; - }; - tmp@4c { - compatible = "ti,tmp421"; - reg = <0x4c>; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt index 30ac3a0557f7..1bfc02de1b0c 100644 --- a/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt +++ b/trunk/Documentation/devicetree/bindings/i2c/i2c-mxs.txt @@ -4,8 +4,6 @@ Required properties: - compatible: Should be "fsl,-i2c" - reg: Should contain registers location and length - interrupts: Should contain ERROR and DMA interrupts -- clock-frequency: Desired I2C bus clock frequency in Hz. - Only 100000Hz and 400000Hz modes are supported. Examples: @@ -15,5 +13,4 @@ i2c0: i2c@80058000 { compatible = "fsl,imx28-i2c"; reg = <0x80058000 2000>; interrupts = <111 68>; - clock-frequency = <100000>; }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/i2c-ocores.txt b/trunk/Documentation/devicetree/bindings/i2c/i2c-ocores.txt deleted file mode 100644 index c15781f4dc8c..000000000000 --- a/trunk/Documentation/devicetree/bindings/i2c/i2c-ocores.txt +++ /dev/null @@ -1,33 +0,0 @@ -Device tree configuration for i2c-ocores - -Required properties: -- compatible : "opencores,i2c-ocores" -- reg : bus address start and address range size of device -- interrupts : interrupt number -- clock-frequency : frequency of bus clock in Hz -- #address-cells : should be <1> -- #size-cells : should be <0> - -Optional properties: -- reg-shift : device register offsets are shifted by this value -- reg-io-width : io register width in bytes (1, 2 or 4) -- regstep : deprecated, use reg-shift above - -Example: - - i2c0: ocores@a0000000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "opencores,i2c-ocores"; - reg = <0xa0000000 0x8>; - interrupts = <10>; - clock-frequency = <20000000>; - - reg-shift = <0>; /* 8 bit registers */ - reg-io-width = <1>; /* 8 bit read/write */ - - dummy@60 { - compatible = "dummy"; - reg = <0x60>; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt index 0f7945019f6f..b891ee218354 100644 --- a/trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt +++ b/trunk/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt @@ -1,4 +1,4 @@ -* Marvell MMP I2C controller +* I2C Required properties : @@ -32,20 +32,3 @@ Examples: interrupts = <58>; }; -* Marvell MV64XXX I2C controller - -Required properties : - - - reg : Offset and length of the register set for the device - - compatible : Should be "marvell,mv64xxx-i2c" - - interrupts : The interrupt number - - clock-frequency : Desired I2C bus clock frequency in Hz. - -Examples: - - i2c@11000 { - compatible = "marvell,mv64xxx-i2c"; - reg = <0x11000 0x20>; - interrupts = <29>; - clock-frequency = <100000>; - }; diff --git a/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt b/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt deleted file mode 100644 index 69e757a657a0..000000000000 --- a/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt +++ /dev/null @@ -1,123 +0,0 @@ -* AB8500 Multi-Functional Device (MFD) - -Required parent device properties: -- compatible : contains "stericsson,ab8500"; -- interrupts : contains the IRQ line for the AB8500 -- interrupt-controller : describes the AB8500 as an Interrupt Controller (has its own domain) -- #interrupt-cells : should be 2, for 2-cell format - - The first cell is the AB8500 local IRQ number - - The second cell is used to specify optional parameters - - bits[3:0] trigger type and level flags: - 1 = low-to-high edge triggered - 2 = high-to-low edge triggered - 4 = active high level-sensitive - 8 = active low level-sensitive - -Optional parent device properties: -- reg : contains the PRCMU mailbox address for the AB8500 i2c port - -The AB8500 consists of a large and varied group of sub-devices: - -Device IRQ Names Supply Names Description ------- --------- ------------ ----------- -ab8500-bm : : : Battery Manager -ab8500-btemp : : : Battery Temperature -ab8500-charger : : : Battery Charger -ab8500-fg : : : Fuel Gauge -ab8500-gpadc : HW_CONV_END : vddadc : Analogue to Digital Converter - SW_CONV_END : : -ab8500-gpio : : : GPIO Controller -ab8500-ponkey : ONKEY_DBF : : Power-on Key - ONKEY_DBR : : -ab8500-pwm : : : Pulse Width Modulator -ab8500-regulator : : : Regulators -ab8500-rtc : 60S : : Real Time Clock - : ALARM : : -ab8500-sysctrl : : : System Control -ab8500-usb : ID_WAKEUP_R : vddulpivio18 : Universal Serial Bus - : ID_WAKEUP_F : v-ape : - : VBUS_DET_F : musb_1v8 : - : VBUS_DET_R : : - : USB_LINK_STATUS : : - : USB_ADP_PROBE_PLUG : : - : USB_ADP_PROBE_UNPLUG : : - -Required child device properties: -- compatible : "stericsson,ab8500-[bm|btemp|charger|fg|gpadc|gpio|ponkey| - pwm|regulator|rtc|sysctrl|usb]"; - -Optional child device properties: -- interrupts : contains the device IRQ(s) using the 2-cell format (see above) -- interrupt-names : contains names of IRQ resource in the order in which they were - supplied in the interrupts property -- -supply : contains a phandle to the regulator supply node in Device Tree - -ab8500@5 { - compatible = "stericsson,ab8500"; - reg = <5>; /* mailbox 5 is i2c */ - interrupts = <0 40 0x4>; - interrupt-controller; - #interrupt-cells = <2>; - - ab8500-rtc { - compatible = "stericsson,ab8500-rtc"; - interrupts = <17 0x4 - 18 0x4>; - interrupt-names = "60S", "ALARM"; - }; - - ab8500-gpadc { - compatible = "stericsson,ab8500-gpadc"; - interrupts = <32 0x4 - 39 0x4>; - interrupt-names = "HW_CONV_END", "SW_CONV_END"; - vddadc-supply = <&ab8500_ldo_tvout_reg>; - }; - - ab8500-usb { - compatible = "stericsson,ab8500-usb"; - interrupts = < 90 0x4 - 96 0x4 - 14 0x4 - 15 0x4 - 79 0x4 - 74 0x4 - 75 0x4>; - interrupt-names = "ID_WAKEUP_R", - "ID_WAKEUP_F", - "VBUS_DET_F", - "VBUS_DET_R", - "USB_LINK_STATUS", - "USB_ADP_PROBE_PLUG", - "USB_ADP_PROBE_UNPLUG"; - vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; - v-ape-supply = <&db8500_vape_reg>; - musb_1v8-supply = <&db8500_vsmps2_reg>; - }; - - ab8500-ponkey { - compatible = "stericsson,ab8500-ponkey"; - interrupts = <6 0x4 - 7 0x4>; - interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; - }; - - ab8500-sysctrl { - compatible = "stericsson,ab8500-sysctrl"; - }; - - ab8500-pwm { - compatible = "stericsson,ab8500-pwm"; - }; - - ab8500-regulators { - compatible = "stericsson,ab8500-regulator"; - - ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { - /* - * See: Documentation/devicetree/bindings/regulator/regulator.txt - * for more information on regulators - */ - }; - }; -}; diff --git a/trunk/Documentation/devicetree/bindings/mfd/max77686.txt b/trunk/Documentation/devicetree/bindings/mfd/max77686.txt deleted file mode 100644 index c6a3469d3436..000000000000 --- a/trunk/Documentation/devicetree/bindings/mfd/max77686.txt +++ /dev/null @@ -1,59 +0,0 @@ -Maxim MAX77686 multi-function device - -MAX77686 is a Mulitifunction device with PMIC, RTC and Charger on chip. It is -interfaced to host controller using i2c interface. PMIC and Charger submodules -are addressed using same i2c slave address whereas RTC submodule uses -different i2c slave address,presently for which we are statically creating i2c -client while probing.This document describes the binding for mfd device and -PMIC submodule. - -Required properties: -- compatible : Must be "maxim,max77686"; -- reg : Specifies the i2c slave address of PMIC block. -- interrupts : This i2c device has an IRQ line connected to the main SoC. -- interrupt-parent : The parent interrupt controller. - -Optional node: -- voltage-regulators : The regulators of max77686 have to be instantiated - under subnode named "voltage-regulators" using the following format. - - regulator_name { - regulator-compatible = LDOn/BUCKn - standard regulator constraints.... - }; - refer Documentation/devicetree/bindings/regulator/regulator.txt - - The regulator-compatible property of regulator should initialized with string -to get matched with their hardware counterparts as follow: - - -LDOn : for LDOs, where n can lie in range 1 to 26. - example: LDO1, LDO2, LDO26. - -BUCKn : for BUCKs, where n can lie in range 1 to 9. - example: BUCK1, BUCK5, BUCK9. - -Example: - - max77686@09 { - compatible = "maxim,max77686"; - interrupt-parent = <&wakeup_eint>; - interrupts = <26 0>; - reg = <0x09>; - - voltage-regulators { - ldo11_reg { - regulator-compatible = "LDO11"; - regulator-name = "vdd_ldo11"; - regulator-min-microvolt = <1900000>; - regulator-max-microvolt = <1900000>; - regulator-always-on; - }; - - buck1_reg { - regulator-compatible = "BUCK1"; - regulator-name = "vdd_mif"; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <1300000>; - regulator-always-on; - regulator-boot-on; - }; - } diff --git a/trunk/Documentation/devicetree/bindings/mfd/tps65910.txt b/trunk/Documentation/devicetree/bindings/mfd/tps65910.txt index db03599ae4dc..d2802d4717bc 100644 --- a/trunk/Documentation/devicetree/bindings/mfd/tps65910.txt +++ b/trunk/Documentation/devicetree/bindings/mfd/tps65910.txt @@ -81,7 +81,7 @@ Example: ti,vmbch-threshold = 0; ti,vmbch2-threshold = 0; - ti,en-ck32k-xtal; + ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>; vcc1-supply = <®_parent>; diff --git a/trunk/Documentation/devicetree/bindings/mfd/twl6040.txt b/trunk/Documentation/devicetree/bindings/mfd/twl6040.txt index c855240f3a0e..bc67c6f424aa 100644 --- a/trunk/Documentation/devicetree/bindings/mfd/twl6040.txt +++ b/trunk/Documentation/devicetree/bindings/mfd/twl6040.txt @@ -6,7 +6,7 @@ They are connected ot the host processor via i2c for commands, McPDM for audio data and commands. Required properties: -- compatible : "ti,twl6040" for twl6040, "ti,twl6041" for twl6041 +- compatible : Must be "ti,twl6040"; - reg: must be 0x4b for i2c address - interrupts: twl6040 has one interrupt line connecteded to the main SoC - interrupt-parent: The parent interrupt controller diff --git a/trunk/Documentation/devicetree/bindings/mips/cavium/bootbus.txt b/trunk/Documentation/devicetree/bindings/mips/cavium/bootbus.txt deleted file mode 100644 index 6581478225a2..000000000000 --- a/trunk/Documentation/devicetree/bindings/mips/cavium/bootbus.txt +++ /dev/null @@ -1,126 +0,0 @@ -* Boot Bus - -The Octeon Boot Bus is a configurable parallel bus with 8 chip -selects. Each chip select is independently configurable. - -Properties: -- compatible: "cavium,octeon-3860-bootbus" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The base address of the Boot Bus' register bank. - -- #address-cells: Must be <2>. The first cell is the chip select - within the bootbus. The second cell is the offset from the chip select. - -- #size-cells: Must be <1>. - -- ranges: There must be one one triplet of (child-bus-address, - parent-bus-address, length) for each active chip select. If the - length element for any triplet is zero, the chip select is disabled, - making it inactive. - -The configuration parameters for each chip select are stored in child -nodes. - -Configuration Properties: -- compatible: "cavium,octeon-3860-bootbus-config" - -- cavium,cs-index: A single cell indicating the chip select that - corresponds to this configuration. - -- cavium,t-adr: A cell specifying the ADR timing (in nS). - -- cavium,t-ce: A cell specifying the CE timing (in nS). - -- cavium,t-oe: A cell specifying the OE timing (in nS). - -- cavium,t-we: A cell specifying the WE timing (in nS). - -- cavium,t-rd-hld: A cell specifying the RD_HLD timing (in nS). - -- cavium,t-wr-hld: A cell specifying the WR_HLD timing (in nS). - -- cavium,t-pause: A cell specifying the PAUSE timing (in nS). - -- cavium,t-wait: A cell specifying the WAIT timing (in nS). - -- cavium,t-page: A cell specifying the PAGE timing (in nS). - -- cavium,t-rd-dly: A cell specifying the RD_DLY timing (in nS). - -- cavium,pages: A cell specifying the PAGES parameter (0 = 8 bytes, 1 - = 2 bytes, 2 = 4 bytes, 3 = 8 bytes). - -- cavium,wait-mode: Optional. If present, wait mode (WAITM) is selected. - -- cavium,page-mode: Optional. If present, page mode (PAGEM) is selected. - -- cavium,bus-width: A cell specifying the WIDTH parameter (in bits) of - the bus for this chip select. - -- cavium,ale-mode: Optional. If present, ALE mode is selected. - -- cavium,sam-mode: Optional. If present, SAM mode is selected. - -- cavium,or-mode: Optional. If present, OR mode is selected. - -Example: - bootbus: bootbus@1180000000000 { - compatible = "cavium,octeon-3860-bootbus"; - reg = <0x11800 0x00000000 0x0 0x200>; - /* The chip select number and offset */ - #address-cells = <2>; - /* The size of the chip select region */ - #size-cells = <1>; - ranges = <0 0 0x0 0x1f400000 0xc00000>, - <1 0 0x10000 0x30000000 0>, - <2 0 0x10000 0x40000000 0>, - <3 0 0x10000 0x50000000 0>, - <4 0 0x0 0x1d020000 0x10000>, - <5 0 0x0 0x1d040000 0x10000>, - <6 0 0x0 0x1d050000 0x10000>, - <7 0 0x10000 0x90000000 0>; - - cavium,cs-config@0 { - compatible = "cavium,octeon-3860-bootbus-config"; - cavium,cs-index = <0>; - cavium,t-adr = <20>; - cavium,t-ce = <60>; - cavium,t-oe = <60>; - cavium,t-we = <45>; - cavium,t-rd-hld = <35>; - cavium,t-wr-hld = <45>; - cavium,t-pause = <0>; - cavium,t-wait = <0>; - cavium,t-page = <35>; - cavium,t-rd-dly = <0>; - - cavium,pages = <0>; - cavium,bus-width = <8>; - }; - . - . - . - cavium,cs-config@6 { - compatible = "cavium,octeon-3860-bootbus-config"; - cavium,cs-index = <6>; - cavium,t-adr = <5>; - cavium,t-ce = <300>; - cavium,t-oe = <270>; - cavium,t-we = <150>; - cavium,t-rd-hld = <100>; - cavium,t-wr-hld = <70>; - cavium,t-pause = <0>; - cavium,t-wait = <0>; - cavium,t-page = <320>; - cavium,t-rd-dly = <0>; - - cavium,pages = <0>; - cavium,wait-mode; - cavium,bus-width = <16>; - }; - . - . - . - }; diff --git a/trunk/Documentation/devicetree/bindings/mips/cavium/ciu.txt b/trunk/Documentation/devicetree/bindings/mips/cavium/ciu.txt deleted file mode 100644 index 2c2d0746b43d..000000000000 --- a/trunk/Documentation/devicetree/bindings/mips/cavium/ciu.txt +++ /dev/null @@ -1,26 +0,0 @@ -* Central Interrupt Unit - -Properties: -- compatible: "cavium,octeon-3860-ciu" - - Compatibility with all cn3XXX, cn5XXX and cn63XX SOCs. - -- interrupt-controller: This is an interrupt controller. - -- reg: The base address of the CIU's register bank. - -- #interrupt-cells: Must be <2>. The first cell is the bank within - the CIU and may have a value of 0 or 1. The second cell is the bit - within the bank and may have a value between 0 and 63. - -Example: - interrupt-controller@1070000000000 { - compatible = "cavium,octeon-3860-ciu"; - interrupt-controller; - /* Interrupts are specified by two parts: - * 1) Controller register (0 or 1) - * 2) Bit within the register (0..63) - */ - #interrupt-cells = <2>; - reg = <0x10700 0x00000000 0x0 0x7000>; - }; diff --git a/trunk/Documentation/devicetree/bindings/mips/cavium/ciu2.txt b/trunk/Documentation/devicetree/bindings/mips/cavium/ciu2.txt deleted file mode 100644 index 0ec7ba8bbbcb..000000000000 --- a/trunk/Documentation/devicetree/bindings/mips/cavium/ciu2.txt +++ /dev/null @@ -1,27 +0,0 @@ -* Central Interrupt Unit - -Properties: -- compatible: "cavium,octeon-6880-ciu2" - - Compatibility with 68XX SOCs. - -- interrupt-controller: This is an interrupt controller. - -- reg: The base address of the CIU's register bank. - -- #interrupt-cells: Must be <2>. The first cell is the bank within - the CIU and may have a value between 0 and 63. The second cell is - the bit within the bank and may also have a value between 0 and 63. - -Example: - interrupt-controller@1070100000000 { - compatible = "cavium,octeon-6880-ciu2"; - interrupt-controller; - /* Interrupts are specified by two parts: - * 1) Controller register (0..63) - * 2) Bit within the register (0..63) - */ - #address-cells = <0>; - #interrupt-cells = <2>; - reg = <0x10701 0x00000000 0x0 0x4000000>; - }; diff --git a/trunk/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt b/trunk/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt deleted file mode 100644 index cb4291e3b1d1..000000000000 --- a/trunk/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt +++ /dev/null @@ -1,21 +0,0 @@ -* DMA Engine. - -The Octeon DMA Engine transfers between the Boot Bus and main memory. -The DMA Engine will be refered to by phandle by any device that is -connected to it. - -Properties: -- compatible: "cavium,octeon-5750-bootbus-dma" - - Compatibility with all cn52XX, cn56XX and cn6XXX SOCs. - -- reg: The base address of the DMA Engine's register bank. - -- interrupts: A single interrupt specifier. - -Example: - dma0: dma-engine@1180000000100 { - compatible = "cavium,octeon-5750-bootbus-dma"; - reg = <0x11800 0x00000100 0x0 0x8>; - interrupts = <0 63>; - }; diff --git a/trunk/Documentation/devicetree/bindings/mips/cavium/uctl.txt b/trunk/Documentation/devicetree/bindings/mips/cavium/uctl.txt deleted file mode 100644 index aa66b9b8d801..000000000000 --- a/trunk/Documentation/devicetree/bindings/mips/cavium/uctl.txt +++ /dev/null @@ -1,46 +0,0 @@ -* UCTL USB controller glue - -Properties: -- compatible: "cavium,octeon-6335-uctl" - - Compatibility with all cn6XXX SOCs. - -- reg: The base address of the UCTL register bank. - -- #address-cells: Must be <2>. - -- #size-cells: Must be <2>. - -- ranges: Empty to signify direct mapping of the children. - -- refclk-frequency: A single cell containing the reference clock - frequency in Hz. - -- refclk-type: A string describing the reference clock connection - either "crystal" or "external". - -Example: - uctl@118006f000000 { - compatible = "cavium,octeon-6335-uctl"; - reg = <0x11800 0x6f000000 0x0 0x100>; - ranges; /* Direct mapping */ - #address-cells = <2>; - #size-cells = <2>; - /* 12MHz, 24MHz and 48MHz allowed */ - refclk-frequency = <24000000>; - /* Either "crystal" or "external" */ - refclk-type = "crystal"; - - ehci@16f0000000000 { - compatible = "cavium,octeon-6335-ehci","usb-ehci"; - reg = <0x16f00 0x00000000 0x0 0x100>; - interrupts = <0 56>; - big-endian-regs; - }; - ohci@16f0000000400 { - compatible = "cavium,octeon-6335-ohci","usb-ohci"; - reg = <0x16f00 0x00000400 0x0 0x100>; - interrupts = <0 56>; - big-endian-regs; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/net/cavium-mdio.txt b/trunk/Documentation/devicetree/bindings/net/cavium-mdio.txt deleted file mode 100644 index 04cb7491d232..000000000000 --- a/trunk/Documentation/devicetree/bindings/net/cavium-mdio.txt +++ /dev/null @@ -1,27 +0,0 @@ -* System Management Interface (SMI) / MDIO - -Properties: -- compatible: "cavium,octeon-3860-mdio" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The base address of the MDIO bus controller register bank. - -- #address-cells: Must be <1>. - -- #size-cells: Must be <0>. MDIO addresses have no size component. - -Typically an MDIO bus might have several children. - -Example: - mdio@1180000001800 { - compatible = "cavium,octeon-3860-mdio"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x11800 0x00001800 0x0 0x40>; - - ethernet-phy@0 { - ... - reg = <0>; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/net/cavium-mix.txt b/trunk/Documentation/devicetree/bindings/net/cavium-mix.txt deleted file mode 100644 index 5da628db68bf..000000000000 --- a/trunk/Documentation/devicetree/bindings/net/cavium-mix.txt +++ /dev/null @@ -1,39 +0,0 @@ -* MIX Ethernet controller. - -Properties: -- compatible: "cavium,octeon-5750-mix" - - Compatibility with all cn5XXX and cn6XXX SOCs populated with MIX - devices. - -- reg: The base addresses of four separate register banks. The first - bank contains the MIX registers. The second bank the corresponding - AGL registers. The third bank are the AGL registers shared by all - MIX devices present. The fourth bank is the AGL_PRT_CTL shared by - all MIX devices present. - -- cell-index: A single cell specifying which portion of the shared - register banks corresponds to this MIX device. - -- interrupts: Two interrupt specifiers. The first is the MIX - interrupt routing and the second the routing for the AGL interrupts. - -- mac-address: Optional, the MAC address to assign to the device. - -- local-mac-address: Optional, the MAC address to assign to the device - if mac-address is not specified. - -- phy-handle: Optional, a phandle for the PHY device connected to this device. - -Example: - ethernet@1070000100800 { - compatible = "cavium,octeon-5750-mix"; - reg = <0x10700 0x00100800 0x0 0x100>, /* MIX */ - <0x11800 0xE0000800 0x0 0x300>, /* AGL */ - <0x11800 0xE0000400 0x0 0x400>, /* AGL_SHARED */ - <0x11800 0xE0002008 0x0 0x8>; /* AGL_PRT_CTL */ - cell-index = <1>; - interrupts = <1 18>, < 1 46>; - local-mac-address = [ 00 0f b7 10 63 54 ]; - phy-handle = <&phy1>; - }; diff --git a/trunk/Documentation/devicetree/bindings/net/cavium-pip.txt b/trunk/Documentation/devicetree/bindings/net/cavium-pip.txt deleted file mode 100644 index d4c53ba04b3b..000000000000 --- a/trunk/Documentation/devicetree/bindings/net/cavium-pip.txt +++ /dev/null @@ -1,98 +0,0 @@ -* PIP Ethernet nexus. - -The PIP Ethernet nexus can control several data packet input/output -devices. The devices have a two level grouping scheme. There may be -several interfaces, and each interface may have several ports. These -ports might be an individual Ethernet PHY. - - -Properties for the PIP nexus: -- compatible: "cavium,octeon-3860-pip" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The base address of the PIP's register bank. - -- #address-cells: Must be <1>. - -- #size-cells: Must be <0>. - -Properties for PIP interfaces which is a child the PIP nexus: -- compatible: "cavium,octeon-3860-pip-interface" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The interface number. - -- #address-cells: Must be <1>. - -- #size-cells: Must be <0>. - -Properties for PIP port which is a child the PIP interface: -- compatible: "cavium,octeon-3860-pip-port" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The port number within the interface group. - -- mac-address: Optional, the MAC address to assign to the device. - -- local-mac-address: Optional, the MAC address to assign to the device - if mac-address is not specified. - -- phy-handle: Optional, a phandle for the PHY device connected to this device. - -Example: - - pip@11800a0000000 { - compatible = "cavium,octeon-3860-pip"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x11800 0xa0000000 0x0 0x2000>; - - interface@0 { - compatible = "cavium,octeon-3860-pip-interface"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; /* interface */ - - ethernet@0 { - compatible = "cavium,octeon-3860-pip-port"; - reg = <0x0>; /* Port */ - local-mac-address = [ 00 0f b7 10 63 60 ]; - phy-handle = <&phy2>; - }; - ethernet@1 { - compatible = "cavium,octeon-3860-pip-port"; - reg = <0x1>; /* Port */ - local-mac-address = [ 00 0f b7 10 63 61 ]; - phy-handle = <&phy3>; - }; - ethernet@2 { - compatible = "cavium,octeon-3860-pip-port"; - reg = <0x2>; /* Port */ - local-mac-address = [ 00 0f b7 10 63 62 ]; - phy-handle = <&phy4>; - }; - ethernet@3 { - compatible = "cavium,octeon-3860-pip-port"; - reg = <0x3>; /* Port */ - local-mac-address = [ 00 0f b7 10 63 63 ]; - phy-handle = <&phy5>; - }; - }; - - interface@1 { - compatible = "cavium,octeon-3860-pip-interface"; - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; /* interface */ - - ethernet@0 { - compatible = "cavium,octeon-3860-pip-port"; - reg = <0x0>; /* Port */ - local-mac-address = [ 00 0f b7 10 63 64 ]; - phy-handle = <&phy6>; - }; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt deleted file mode 100644 index cfe1db3bb6e9..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt +++ /dev/null @@ -1,12 +0,0 @@ -LPC32XX PWM controller - -Required properties: -- compatible: should be "nxp,lpc3220-pwm" -- reg: physical base address and length of the controller's registers - -Examples: - -pwm@0x4005C000 { - compatible = "nxp,lpc3220-pwm"; - reg = <0x4005C000 0x8>; -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt deleted file mode 100644 index b16f4a57d111..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/mxs-pwm.txt +++ /dev/null @@ -1,17 +0,0 @@ -Freescale MXS PWM controller - -Required properties: -- compatible: should be "fsl,imx23-pwm" -- reg: physical base address and length of the controller's registers -- #pwm-cells: should be 2. The first cell specifies the per-chip index - of the PWM to use and the second cell is the duty cycle in nanoseconds. -- fsl,pwm-number: the number of PWM devices - -Example: - -pwm: pwm@80064000 { - compatible = "fsl,imx28-pwm", "fsl,imx23-pwm"; - reg = <0x80064000 2000>; - #pwm-cells = <2>; - fsl,pwm-number = <8>; -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt deleted file mode 100644 index bbbeedb4ec05..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt +++ /dev/null @@ -1,18 +0,0 @@ -Tegra SoC PWFM controller - -Required properties: -- compatible: should be one of: - - "nvidia,tegra20-pwm" - - "nvidia,tegra30-pwm" -- reg: physical base address and length of the controller's registers -- #pwm-cells: On Tegra the number of cells used to specify a PWM is 2. The - first cell specifies the per-chip index of the PWM to use and the second - cell is the duty cycle in nanoseconds. - -Example: - - pwm: pwm@7000a000 { - compatible = "nvidia,tegra20-pwm"; - reg = <0x7000a000 0x100>; - #pwm-cells = <2>; - }; diff --git a/trunk/Documentation/devicetree/bindings/pwm/pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/pwm.txt deleted file mode 100644 index 73ec962bfe8c..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/pwm.txt +++ /dev/null @@ -1,57 +0,0 @@ -Specifying PWM information for devices -====================================== - -1) PWM user nodes ------------------ - -PWM users should specify a list of PWM devices that they want to use -with a property containing a 'pwm-list': - - pwm-list ::= [pwm-list] - single-pwm ::= - pwm-phandle : phandle to PWM controller node - pwm-specifier : array of #pwm-cells specifying the given PWM - (controller specific) - -PWM properties should be named "pwms". The exact meaning of each pwms -property must be documented in the device tree binding for each device. -An optional property "pwm-names" may contain a list of strings to label -each of the PWM devices listed in the "pwms" property. If no "pwm-names" -property is given, the name of the user node will be used as fallback. - -Drivers for devices that use more than a single PWM device can use the -"pwm-names" property to map the name of the PWM device requested by the -pwm_get() call to an index into the list given by the "pwms" property. - -The following example could be used to describe a PWM-based backlight -device: - - pwm: pwm { - #pwm-cells = <2>; - }; - - [...] - - bl: backlight { - pwms = <&pwm 0 5000000>; - pwm-names = "backlight"; - }; - -pwm-specifier typically encodes the chip-relative PWM number and the PWM -period in nanoseconds. Note that in the example above, specifying the -"pwm-names" is redundant because the name "backlight" would be used as -fallback anyway. - -2) PWM controller nodes ------------------------ - -PWM controller nodes must specify the number of cells used for the -specifier using the '#pwm-cells' property. - -An example PWM controller might look like this: - - pwm: pwm@7000a000 { - compatible = "nvidia,tegra20-pwm"; - reg = <0x7000a000 0x100>; - #pwm-cells = <2>; - }; diff --git a/trunk/Documentation/devicetree/bindings/serial/cavium-uart.txt b/trunk/Documentation/devicetree/bindings/serial/cavium-uart.txt deleted file mode 100644 index 87a6c375cd44..000000000000 --- a/trunk/Documentation/devicetree/bindings/serial/cavium-uart.txt +++ /dev/null @@ -1,19 +0,0 @@ -* Universal Asynchronous Receiver/Transmitter (UART) - -- compatible: "cavium,octeon-3860-uart" - - Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs. - -- reg: The base address of the UART register bank. - -- interrupts: A single interrupt specifier. - -- current-speed: Optional, the current bit rate in bits per second. - -Example: - uart1: serial@1180000000c00 { - compatible = "cavium,octeon-3860-uart","ns16550"; - reg = <0x11800 0x00000c00 0x0 0x400>; - current-speed = <115200>; - interrupts = <0 35>; - }; diff --git a/trunk/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt b/trunk/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt deleted file mode 100644 index 1e4fc727f3b1..000000000000 --- a/trunk/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt +++ /dev/null @@ -1,28 +0,0 @@ -pwm-backlight bindings - -Required properties: - - compatible: "pwm-backlight" - - pwms: OF device-tree PWM specification (see PWM binding[0]) - - brightness-levels: Array of distinct brightness levels. Typically these - are in the range from 0 to 255, but any range starting at 0 will do. - The actual brightness level (PWM duty cycle) will be interpolated - from these values. 0 means a 0% duty cycle (darkest/off), while the - last value in the array represents a 100% duty cycle (brightest). - - default-brightness-level: the default brightness level (index into the - array defined by the "brightness-levels" property) - -Optional properties: - - pwm-names: a list of names for the PWM devices specified in the - "pwms" property (see PWM binding[0]) - -[0]: Documentation/devicetree/bindings/pwm/pwm.txt - -Example: - - backlight { - compatible = "pwm-backlight"; - pwms = <&pwm 0 5000000>; - - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - }; diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff index 39462cf35cd4..b4a898f43c37 100644 --- a/trunk/Documentation/dontdiff +++ b/trunk/Documentation/dontdiff @@ -150,6 +150,7 @@ keywords.c ksym.c* ksym.h* kxgettext +lkc_defs.h lex.c lex.*.c linux diff --git a/trunk/Documentation/dvb/get_dvb_firmware b/trunk/Documentation/dvb/get_dvb_firmware index 12d3952e83d5..fbb241174486 100755 --- a/trunk/Documentation/dvb/get_dvb_firmware +++ b/trunk/Documentation/dvb/get_dvb_firmware @@ -29,7 +29,7 @@ use IO::Handle; "af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395", "lme2510c_s7395_old", "drxk", "drxk_terratec_h5", "drxk_hauppauge_hvr930c", "tda10071", "it9135", "it9137", - "drxk_pctv", "drxk_terratec_htc_stick", "sms1xxx_hcw"); + "drxk_pctv"); # Check args syntax() if (scalar(@ARGV) != 1); @@ -676,24 +676,6 @@ sub drxk_terratec_h5 { "$fwfile" } -sub drxk_terratec_htc_stick { - my $url = "http://ftp.terratec.de/Receiver/Cinergy_HTC_Stick/Updates/"; - my $zipfile = "Cinergy_HTC_Stick_Drv_5.09.1202.00_XP_Vista_7.exe"; - my $hash = "6722a2442a05423b781721fbc069ed5e"; - my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 0); - my $drvfile = "Cinergy HTC Stick/BDA Driver 5.09.1202.00/Windows 32 Bit/emOEM.sys"; - my $fwfile = "dvb-usb-terratec-htc-stick-drxk.fw"; - - checkstandard(); - - wgetfile($zipfile, $url . $zipfile); - verify($zipfile, $hash); - unzip($zipfile, $tmpdir); - extract("$tmpdir/$drvfile", 0x4e5c0, 42692, "$fwfile"); - - "$fwfile" -} - sub it9135 { my $sourcefile = "dvb-usb-it9135.zip"; my $url = "http://www.ite.com.tw/uploads/firmware/v3.6.0.0/$sourcefile"; @@ -766,28 +748,6 @@ sub drxk_pctv { "$fwfile"; } -sub sms1xxx_hcw { - my $url = "http://steventoth.net/linux/sms1xxx/"; - my %files = ( - 'sms1xxx-hcw-55xxx-dvbt-01.fw' => "afb6f9fb9a71d64392e8564ef9577e5a", - 'sms1xxx-hcw-55xxx-dvbt-02.fw' => "b44807098ba26e52cbedeadc052ba58f", - 'sms1xxx-hcw-55xxx-isdbt-02.fw' => "dae934eeea85225acbd63ce6cfe1c9e4", - ); - - checkstandard(); - - my $allfiles; - foreach my $fwfile (keys %files) { - wgetfile($fwfile, "$url/$fwfile"); - verify($fwfile, $files{$fwfile}); - $allfiles .= " $fwfile"; - } - - $allfiles =~ s/^\s//; - - $allfiles; -} - # --------------------------------------------------------------- # Utilities diff --git a/trunk/Documentation/edac.txt b/trunk/Documentation/edac.txt index 56c7e936430f..03df2b020332 100644 --- a/trunk/Documentation/edac.txt +++ b/trunk/Documentation/edac.txt @@ -232,20 +232,116 @@ EDAC control and attribute files. In 'mcX' directories are EDAC control and attribute files for -this 'X' instance of the memory controllers. +this 'X' instance of the memory controllers: + + +Counter reset control file: + + 'reset_counters' + + This write-only control file will zero all the statistical counters + for UE and CE errors. Zeroing the counters will also reset the timer + indicating how long since the last counter zero. This is useful + for computing errors/time. Since the counters are always reset at + driver initialization time, no module/kernel parameter is available. + + RUN TIME: echo "anything" >/sys/devices/system/edac/mc/mc0/counter_reset + + This resets the counters on memory controller 0 + + +Seconds since last counter reset control file: + + 'seconds_since_reset' + + This attribute file displays how many seconds have elapsed since the + last counter reset. This can be used with the error counters to + measure error rates. + + + +Memory Controller name attribute file: + + 'mc_name' + + This attribute file displays the type of memory controller + that is being utilized. + + +Total memory managed by this memory controller attribute file: + + 'size_mb' + + This attribute file displays, in count of megabytes, of memory + that this instance of memory controller manages. + + +Total Uncorrectable Errors count attribute file: + + 'ue_count' + + This attribute file displays the total count of uncorrectable + errors that have occurred on this memory controller. If panic_on_ue + is set this counter will not have a chance to increment, + since EDAC will panic the system. + + +Total UE count that had no information attribute fileY: + + 'ue_noinfo_count' + + This attribute file displays the number of UEs that have occurred + with no information as to which DIMM slot is having errors. + + +Total Correctable Errors count attribute file: + + 'ce_count' + + This attribute file displays the total count of correctable + errors that have occurred on this memory controller. This + count is very important to examine. CEs provide early + indications that a DIMM is beginning to fail. This count + field should be monitored for non-zero values and report + such information to the system administrator. + + +Total Correctable Errors count attribute file: + + 'ce_noinfo_count' + + This attribute file displays the number of CEs that + have occurred wherewith no information as to which DIMM slot + is having errors. Memory is handicapped, but operational, + yet no information is available to indicate which slot + the failing memory is in. This count field should be also + be monitored for non-zero values. + +Device Symlink: + + 'device' + + Symlink to the memory controller device. + +Sdram memory scrubbing rate: + + 'sdram_scrub_rate' + + Read/Write attribute file that controls memory scrubbing. The scrubbing + rate is set by writing a minimum bandwidth in bytes/sec to the attribute + file. The rate will be translated to an internal value that gives at + least the specified rate. + + Reading the file will return the actual scrubbing rate employed. + + If configuration fails or memory scrubbing is not implemented, accessing + that attribute will fail. -For a description of the sysfs API, please see: - Documentation/ABI/testing/sysfs/devices-edac ============================================================================ 'csrowX' DIRECTORIES -When CONFIG_EDAC_LEGACY_SYSFS is enabled, the sysfs will contain the -csrowX directories. As this API doesn't work properly for Rambus, FB-DIMMs -and modern Intel Memory Controllers, this is being deprecated in favor -of dimmX directories. - In the 'csrowX' directories are EDAC control and attribute files for this 'X' instance of csrow: diff --git a/trunk/Documentation/fault-injection/fault-injection.txt b/trunk/Documentation/fault-injection/fault-injection.txt index 4cf1a2a6bd72..ba4be8b77093 100644 --- a/trunk/Documentation/fault-injection/fault-injection.txt +++ b/trunk/Documentation/fault-injection/fault-injection.txt @@ -240,30 +240,3 @@ trap "echo 0 > /sys/kernel/debug/$FAILTYPE/probability" SIGINT SIGTERM EXIT echo "Injecting errors into the module $module... (interrupt to stop)" sleep 1000000 -Tool to run command with failslab or fail_page_alloc ----------------------------------------------------- -In order to make it easier to accomplish the tasks mentioned above, we can use -tools/testing/fault-injection/failcmd.sh. Please run a command -"./tools/testing/fault-injection/failcmd.sh --help" for more information and -see the following examples. - -Examples: - -Run a command "make -C tools/testing/selftests/ run_tests" with injecting slab -allocation failure. - - # ./tools/testing/fault-injection/failcmd.sh \ - -- make -C tools/testing/selftests/ run_tests - -Same as above except to specify 100 times failures at most instead of one time -at most by default. - - # ./tools/testing/fault-injection/failcmd.sh --times=100 \ - -- make -C tools/testing/selftests/ run_tests - -Same as above except to inject page allocation failure instead of slab -allocation failure. - - # env FAILCMD_TYPE=fail_page_alloc \ - ./tools/testing/fault-injection/failcmd.sh --times=100 \ - -- make -C tools/testing/selftests/ run_tests diff --git a/trunk/Documentation/fault-injection/notifier-error-inject.txt b/trunk/Documentation/fault-injection/notifier-error-inject.txt deleted file mode 100644 index c83526c364e5..000000000000 --- a/trunk/Documentation/fault-injection/notifier-error-inject.txt +++ /dev/null @@ -1,99 +0,0 @@ -Notifier error injection -======================== - -Notifier error injection provides the ability to inject artifical errors to -specified notifier chain callbacks. It is useful to test the error handling of -notifier call chain failures which is rarely executed. There are kernel -modules that can be used to test the following notifiers. - - * CPU notifier - * PM notifier - * Memory hotplug notifier - * powerpc pSeries reconfig notifier - -CPU notifier error injection module ------------------------------------ -This feature can be used to test the error handling of the CPU notifiers by -injecting artifical errors to CPU notifier chain callbacks. - -If the notifier call chain should be failed with some events notified, write -the error code to debugfs interface -/sys/kernel/debug/notifier-error-inject/cpu/actions//error - -Possible CPU notifier events to be failed are: - - * CPU_UP_PREPARE - * CPU_UP_PREPARE_FROZEN - * CPU_DOWN_PREPARE - * CPU_DOWN_PREPARE_FROZEN - -Example1: Inject CPU offline error (-1 == -EPERM) - - # cd /sys/kernel/debug/notifier-error-inject/cpu - # echo -1 > actions/CPU_DOWN_PREPARE/error - # echo 0 > /sys/devices/system/cpu/cpu1/online - bash: echo: write error: Operation not permitted - -Example2: inject CPU online error (-2 == -ENOENT) - - # echo -2 > actions/CPU_UP_PREPARE/error - # echo 1 > /sys/devices/system/cpu/cpu1/online - bash: echo: write error: No such file or directory - -PM notifier error injection module ----------------------------------- -This feature is controlled through debugfs interface -/sys/kernel/debug/notifier-error-inject/pm/actions//error - -Possible PM notifier events to be failed are: - - * PM_HIBERNATION_PREPARE - * PM_SUSPEND_PREPARE - * PM_RESTORE_PREPARE - -Example: Inject PM suspend error (-12 = -ENOMEM) - - # cd /sys/kernel/debug/notifier-error-inject/pm/ - # echo -12 > actions/PM_SUSPEND_PREPARE/error - # echo mem > /sys/power/state - bash: echo: write error: Cannot allocate memory - -Memory hotplug notifier error injection module ----------------------------------------------- -This feature is controlled through debugfs interface -/sys/kernel/debug/notifier-error-inject/memory/actions//error - -Possible memory notifier events to be failed are: - - * MEM_GOING_ONLINE - * MEM_GOING_OFFLINE - -Example: Inject memory hotplug offline error (-12 == -ENOMEM) - - # cd /sys/kernel/debug/notifier-error-inject/memory - # echo -12 > actions/MEM_GOING_OFFLINE/error - # echo offline > /sys/devices/system/memory/memoryXXX/state - bash: echo: write error: Cannot allocate memory - -powerpc pSeries reconfig notifier error injection module --------------------------------------------------------- -This feature is controlled through debugfs interface -/sys/kernel/debug/notifier-error-inject/pSeries-reconfig/actions//error - -Possible pSeries reconfig notifier events to be failed are: - - * PSERIES_RECONFIG_ADD - * PSERIES_RECONFIG_REMOVE - * PSERIES_DRCONF_MEM_ADD - * PSERIES_DRCONF_MEM_REMOVE - -For more usage examples ------------------------ -There are tools/testing/selftests using the notifier error injection features -for CPU and memory notifiers. - - * tools/testing/selftests/cpu-hotplug/on-off-test.sh - * tools/testing/selftests/memory-hotplug/on-off-test.sh - -These scripts first do simple online and offline tests and then do fault -injection tests if notifier error injection module is available. diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index e9237fb71950..76112dac7659 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -600,21 +600,3 @@ When: June 2013 Why: Unsupported/unmaintained/unused since 2.6 ---------------------------- - -What: V4L2 selections API target rectangle and flags unification, the - following definitions will be removed: V4L2_SEL_TGT_CROP_ACTIVE, - V4L2_SEL_TGT_COMPOSE_ACTIVE, V4L2_SUBDEV_SEL_*, V4L2_SUBDEV_SEL_FLAG_* - in favor of common V4L2_SEL_TGT_* and V4L2_SEL_FLAG_* definitions. - For more details see include/linux/v4l2-common.h. -When: 3.8 -Why: The regular V4L2 selections and the subdev selection API originally - defined distinct names for the target rectangles and flags - V4L2_SEL_* - and V4L2_SUBDEV_SEL_*. Although, it turned out that the meaning of these - target rectangles is virtually identical and the APIs were consolidated - to use single set of names - V4L2_SEL_*. This didn't involve any ABI - changes. Alias definitions were created for the original ones to avoid - any instabilities in the user space interface. After few cycles these - backward compatibility definitions will be removed. -Who: Sylwester Nawrocki - ----------------------------- diff --git a/trunk/Documentation/input/edt-ft5x06.txt b/trunk/Documentation/input/edt-ft5x06.txt deleted file mode 100644 index 2032f0b7a8fa..000000000000 --- a/trunk/Documentation/input/edt-ft5x06.txt +++ /dev/null @@ -1,54 +0,0 @@ -EDT ft5x06 based Polytouch devices ----------------------------------- - -The edt-ft5x06 driver is useful for the EDT "Polytouch" family of capacitive -touch screens. Note that it is *not* suitable for other devices based on the -focaltec ft5x06 devices, since they contain vendor-specific firmware. In -particular this driver is not suitable for the Nook tablet. - -It has been tested with the following devices: - * EP0350M06 - * EP0430M06 - * EP0570M06 - * EP0700M06 - -The driver allows configuration of the touch screen via a set of sysfs files: - -/sys/class/input/eventX/device/device/threshold: - allows setting the "click"-threshold in the range from 20 to 80. - -/sys/class/input/eventX/device/device/gain: - allows setting the sensitivity in the range from 0 to 31. Note that - lower values indicate higher sensitivity. - -/sys/class/input/eventX/device/device/offset: - allows setting the edge compensation in the range from 0 to 31. - -/sys/class/input/eventX/device/device/report_rate: - allows setting the report rate in the range from 3 to 14. - - -For debugging purposes the driver provides a few files in the debug -filesystem (if available in the kernel). In /sys/kernel/debug/edt_ft5x06 -you'll find the following files: - -num_x, num_y: - (readonly) contains the number of sensor fields in X- and - Y-direction. - -mode: - allows switching the sensor between "factory mode" and "operation - mode" by writing "1" or "0" to it. In factory mode (1) it is - possible to get the raw data from the sensor. Note that in factory - mode regular events don't get delivered and the options described - above are unavailable. - -raw_data: - contains num_x * num_y big endian 16 bit values describing the raw - values for each sensor field. Note that each read() call on this - files triggers a new readout. It is recommended to provide a buffer - big enough to contain num_x * num_y * 2 bytes. - -Note that reading raw_data gives a I/O error when the device is not in factory -mode. The same happens when reading/writing to the parameter files when the -device is not in regular operation mode. diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index ad7e2e5088c1..c2619ef44a72 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -526,7 +526,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. coherent_pool=nn[KMG] [ARM,KNL] Sets the size of memory pool for coherent, atomic dma - allocations, by default set to 256K. + allocations if Contiguous Memory Allocator (CMA) is used. code_bytes [X86] How many bytes of object code to print in an oops report. diff --git a/trunk/Documentation/power/power_supply_class.txt b/trunk/Documentation/power/power_supply_class.txt index 2f0ddc15b5ac..211831d4095f 100644 --- a/trunk/Documentation/power/power_supply_class.txt +++ b/trunk/Documentation/power/power_supply_class.txt @@ -112,24 +112,14 @@ CHARGE_COUNTER - the current charge counter (in µAh). This could easily be negative; there is no empty or full value. It is only useful for relative, time-based measurements. -CONSTANT_CHARGE_CURRENT - constant charge current programmed by charger. - -CONSTANT_CHARGE_VOLTAGE - constant charge voltage programmed by charger. - ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. CAPACITY - capacity in percents. -CAPACITY_ALERT_MIN - minimum capacity alert value in percents. -CAPACITY_ALERT_MAX - maximum capacity alert value in percents. CAPACITY_LEVEL - capacity level. This corresponds to POWER_SUPPLY_CAPACITY_LEVEL_*. TEMP - temperature of the power supply. -TEMP_ALERT_MIN - minimum battery temperature alert value in milli centigrade. -TEMP_ALERT_MAX - maximum battery temperature alert value in milli centigrade. TEMP_AMBIENT - ambient temperature. -TEMP_AMBIENT_ALERT_MIN - minimum ambient temperature alert value in milli centigrade. -TEMP_AMBIENT_ALERT_MAX - maximum ambient temperature alert value in milli centigrade. TIME_TO_EMPTY - seconds left for battery to be considered empty (i.e. while battery powers a load) diff --git a/trunk/Documentation/printk-formats.txt b/trunk/Documentation/printk-formats.txt index 7561d7ed8e11..5df176ed59b8 100644 --- a/trunk/Documentation/printk-formats.txt +++ b/trunk/Documentation/printk-formats.txt @@ -53,20 +53,9 @@ Struct Resources: For printing struct resources. The 'R' and 'r' specifiers result in a printed resource with ('R') or without ('r') a decoded flags member. -Raw buffer as a hex string: - %*ph 00 01 02 ... 3f - %*phC 00:01:02: ... :3f - %*phD 00-01-02- ... -3f - %*phN 000102 ... 3f - - For printing a small buffers (up to 64 bytes long) as a hex string with - certain separator. For the larger buffers consider to use - print_hex_dump(). - MAC/FDDI addresses: %pM 00:01:02:03:04:05 - %pMR 05:04:03:02:01:00 %pMF 00-01-02-03-04-05 %pm 000102030405 @@ -78,10 +67,6 @@ MAC/FDDI addresses: the 'M' specifier to use dash ('-') separators instead of the default separator. - For Bluetooth addresses the 'R' specifier shall be used after the 'M' - specifier to use reversed byte order suitable for visual interpretation - of Bluetooth addresses which are in the little endian order. - IPv4 addresses: %pI4 1.2.3.4 diff --git a/trunk/Documentation/pwm.txt b/trunk/Documentation/pwm.txt deleted file mode 100644 index 554290ebab94..000000000000 --- a/trunk/Documentation/pwm.txt +++ /dev/null @@ -1,76 +0,0 @@ -Pulse Width Modulation (PWM) interface - -This provides an overview about the Linux PWM interface - -PWMs are commonly used for controlling LEDs, fans or vibrators in -cell phones. PWMs with a fixed purpose have no need implementing -the Linux PWM API (although they could). However, PWMs are often -found as discrete devices on SoCs which have no fixed purpose. It's -up to the board designer to connect them to LEDs or fans. To provide -this kind of flexibility the generic PWM API exists. - -Identifying PWMs ----------------- - -Users of the legacy PWM API use unique IDs to refer to PWM devices. - -Instead of referring to a PWM device via its unique ID, board setup code -should instead register a static mapping that can be used to match PWM -consumers to providers, as given in the following example: - - static struct pwm_lookup board_pwm_lookup[] = { - PWM_LOOKUP("tegra-pwm", 0, "pwm-backlight", NULL), - }; - - static void __init board_init(void) - { - ... - pwm_add_table(board_pwm_lookup, ARRAY_SIZE(board_pwm_lookup)); - ... - } - -Using PWMs ----------- - -Legacy users can request a PWM device using pwm_request() and free it -after usage with pwm_free(). - -New users should use the pwm_get() function and pass to it the consumer -device or a consumer name. pwm_put() is used to free the PWM device. - -After being requested a PWM has to be configured using: - -int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns); - -To start/stop toggling the PWM output use pwm_enable()/pwm_disable(). - -Implementing a PWM driver -------------------------- - -Currently there are two ways to implement pwm drivers. Traditionally -there only has been the barebone API meaning that each driver has -to implement the pwm_*() functions itself. This means that it's impossible -to have multiple PWM drivers in the system. For this reason it's mandatory -for new drivers to use the generic PWM framework. - -A new PWM controller/chip can be added using pwmchip_add() and removed -again with pwmchip_remove(). pwmchip_add() takes a filled in struct -pwm_chip as argument which provides a description of the PWM chip, the -number of PWM devices provider by the chip and the chip-specific -implementation of the supported PWM operations to the framework. - -Locking -------- - -The PWM core list manipulations are protected by a mutex, so pwm_request() -and pwm_free() may not be called from an atomic context. Currently the -PWM core does not enforce any locking to pwm_enable(), pwm_disable() and -pwm_config(), so the calling context is currently driver specific. This -is an issue derived from the former barebone API and should be fixed soon. - -Helpers -------- - -Currently a PWM can only be configured with period_ns and duty_ns. For several -use cases freq_hz and duty_percent might be better. Instead of calculating -this in your driver please consider adding appropriate helpers to the framework. diff --git a/trunk/Documentation/sysctl/fs.txt b/trunk/Documentation/sysctl/fs.txt index 8c235b6e4246..13d6166d7a27 100644 --- a/trunk/Documentation/sysctl/fs.txt +++ b/trunk/Documentation/sysctl/fs.txt @@ -163,22 +163,16 @@ This value can be used to query and set the core dump mode for setuid or otherwise protected/tainted binaries. The modes are 0 - (default) - traditional behaviour. Any process which has changed - privilege levels or is execute only will not be dumped. + privilege levels or is execute only will not be dumped 1 - (debug) - all processes dump core when possible. The core dump is owned by the current user and no security is applied. This is intended for system debugging situations only. Ptrace is unchecked. - This is insecure as it allows regular users to examine the memory - contents of privileged processes. 2 - (suidsafe) - any binary which normally would not be dumped is dumped - anyway, but only if the "core_pattern" kernel sysctl is set to - either a pipe handler or a fully qualified path. (For more details - on this limitation, see CVE-2006-2451.) This mode is appropriate - when administrators are attempting to debug problems in a normal - environment, and either have a core dump pipe handler that knows - to treat privileged core dumps with care, or specific directory - defined for catching core dumps. If a core dump happens without - a pipe handler or fully qualifid path, a message will be emitted - to syslog warning about the lack of a correct setting. + readable by root only. This allows the end user to remove + such a dump but not access it directly. For security reasons + core dumps in this mode will not overwrite one another or + other files. This mode is appropriate when administrators are + attempting to debug problems in a normal environment. ============================================================== diff --git a/trunk/Documentation/video4linux/v4l2-framework.txt b/trunk/Documentation/video4linux/v4l2-framework.txt index 89318be6c1d2..1f5905270050 100644 --- a/trunk/Documentation/video4linux/v4l2-framework.txt +++ b/trunk/Documentation/video4linux/v4l2-framework.txt @@ -594,15 +594,6 @@ You should also set these fields: unlocked_ioctl file operation is called this lock will be taken by the core and released afterwards. See the next section for more details. -- queue: a pointer to the struct vb2_queue associated with this device node. - If queue is non-NULL, and queue->lock is non-NULL, then queue->lock is - used for the queuing ioctls (VIDIOC_REQBUFS, CREATE_BUFS, QBUF, DQBUF, - QUERYBUF, PREPARE_BUF, STREAMON and STREAMOFF) instead of the lock above. - That way the vb2 queuing framework does not have to wait for other ioctls. - This queue pointer is also used by the vb2 helper functions to check for - queuing ownership (i.e. is the filehandle calling it allowed to do the - operation). - - prio: keeps track of the priorities. Used to implement VIDIOC_G/S_PRIORITY. If left to NULL, then it will use the struct v4l2_prio_state in v4l2_device. If you want to have a separate priority state per (group of) device node(s), @@ -656,43 +647,47 @@ manually set the struct media_entity type and name fields. A reference to the entity will be automatically acquired/released when the video device is opened/closed. -ioctls and locking ------------------- +v4l2_file_operations and locking +-------------------------------- + +You can set a pointer to a mutex_lock in struct video_device. Usually this +will be either a top-level mutex or a mutex per device node. By default this +lock will be used for unlocked_ioctl, but you can disable locking for +selected ioctls by calling: -The V4L core provides optional locking services. The main service is the -lock field in struct video_device, which is a pointer to a mutex. If you set -this pointer, then that will be used by unlocked_ioctl to serialize all ioctls. + void v4l2_disable_ioctl_locking(struct video_device *vdev, unsigned int cmd); -If you are using the videobuf2 framework, then there is a second lock that you -can set: video_device->queue->lock. If set, then this lock will be used instead -of video_device->lock to serialize all queuing ioctls (see the previous section -for the full list of those ioctls). +E.g.: v4l2_disable_ioctl_locking(vdev, VIDIOC_DQBUF); -The advantage of using a different lock for the queuing ioctls is that for some -drivers (particularly USB drivers) certain commands such as setting controls -can take a long time, so you want to use a separate lock for the buffer queuing -ioctls. That way your VIDIOC_DQBUF doesn't stall because the driver is busy -changing the e.g. exposure of the webcam. +You have to call this before you register the video_device. -Of course, you can always do all the locking yourself by leaving both lock -pointers at NULL. +Particularly with USB drivers where certain commands such as setting controls +can take a long time you may want to do your own locking for the buffer queuing +ioctls. -If you use the old videobuf then you must pass the video_device lock to the -videobuf queue initialize function: if videobuf has to wait for a frame to -arrive, then it will temporarily unlock the lock and relock it afterwards. If -your driver also waits in the code, then you should do the same to allow other -processes to access the device node while the first process is waiting for -something. +If you want still finer-grained locking then you have to set mutex_lock to NULL +and do you own locking completely. + +It is up to the driver developer to decide which method to use. However, if +your driver has high-latency operations (for example, changing the exposure +of a USB webcam might take a long time), then you might be better off with +doing your own locking if you want to allow the user to do other things with +the device while waiting for the high-latency command to finish. + +If a lock is specified then all ioctl commands will be serialized on that +lock. If you use videobuf then you must pass the same lock to the videobuf +queue initialize function: if videobuf has to wait for a frame to arrive, then +it will temporarily unlock the lock and relock it afterwards. If your driver +also waits in the code, then you should do the same to allow other processes +to access the device node while the first process is waiting for something. In the case of videobuf2 you will need to implement the wait_prepare and -wait_finish callbacks to unlock/lock if applicable. If you use the queue->lock -pointer, then you can use the helper functions vb2_ops_wait_prepare/finish. - -The implementation of a hotplug disconnect should also take the lock from -video_device before calling v4l2_device_disconnect. If you are also using -video_device->queue->lock, then you have to first lock video_device->queue->lock -followed by video_device->lock. That way you can be sure no ioctl is running -when you call v4l2_device_disconnect. +wait_finish callbacks to unlock/lock if applicable. In particular, if you use +the lock in struct video_device then you must unlock/lock this mutex in +wait_prepare and wait_finish. + +The implementation of a hotplug disconnect should also take the lock before +calling v4l2_device_disconnect. video_device registration ------------------------- diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5b44872b64ec..bd451649f13a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1789,16 +1789,15 @@ F: arch/powerpc/oprofile/*cell* F: arch/powerpc/platforms/cell/ CEPH DISTRIBUTED FILE SYSTEM CLIENT -M: Sage Weil +M: Sage Weil L: ceph-devel@vger.kernel.org -W: http://ceph.com/ +W: http://ceph.newdream.net/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git S: Supported F: Documentation/filesystems/ceph.txt F: fs/ceph F: net/ceph F: include/linux/ceph -F: include/linux/crush CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: L: linux-usb@vger.kernel.org @@ -2751,7 +2750,6 @@ M: Jingoo Han L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/exynos/exynos_dp* -F: include/video/exynos_dp* EXYNOS MIPI DISPLAY DRIVERS M: Inki Dae @@ -3157,7 +3155,8 @@ S: Maintained F: drivers/media/video/gspca/t613.c GSPCA USB WEBCAM DRIVER -M: Hans de Goede +M: Jean-Francois Moine +W: http://moinejf.free.fr L: linux-media@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained @@ -5527,18 +5526,6 @@ S: Maintained F: Documentation/video4linux/README.pvrusb2 F: drivers/media/video/pvrusb2/ -PWM SUBSYSTEM -M: Thierry Reding -L: linux-kernel@vger.kernel.org -S: Maintained -W: http://gitorious.org/linux-pwm -T: git git://gitorious.org/linux-pwm/linux-pwm.git -F: Documentation/pwm.txt -F: Documentation/devicetree/bindings/pwm/ -F: include/linux/pwm.h -F: include/linux/of_pwm.h -F: drivers/pwm/ - PXA2xx/PXA3xx SUPPORT M: Eric Miao M: Russell King @@ -5640,12 +5627,10 @@ S: Supported F: arch/hexagon/ RADOS BLOCK DEVICE (RBD) -M: Yehuda Sadeh -M: Sage Weil -M: Alex Elder +F: include/linux/qnxtypes.h +M: Yehuda Sadeh +M: Sage Weil M: ceph-devel@vger.kernel.org -W: http://ceph.com/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git S: Supported F: drivers/block/rbd.c F: drivers/block/rbd_types.h @@ -5915,16 +5900,6 @@ L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/video/s3c-fb.c -SAMSUNG MULTIFUNCTION DEVICE DRIVERS -M: Sangbeom Kim -L: linux-kernel@vger.kernel.org -S: Supported -F: drivers/mfd/sec*.c -F: drivers/regulator/s2m*.c -F: drivers/regulator/s5m*.c -F: drivers/rtc/rtc-sec.c -F: include/linux/mfd/samsung/ - SERIAL DRIVERS M: Alan Cox L: linux-serial@vger.kernel.org diff --git a/trunk/Makefile b/trunk/Makefile index 8e4c0a7d402b..4bb09e1b1230 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -535,11 +535,11 @@ PHONY += include/config/auto.conf include/config/auto.conf: $(Q)test -e include/generated/autoconf.h -a -e $@ || ( \ - echo >&2; \ - echo >&2 " ERROR: Kernel configuration is invalid."; \ - echo >&2 " include/generated/autoconf.h or $@ are missing.";\ - echo >&2 " Run 'make oldconfig && make prepare' on kernel src to fix it."; \ - echo >&2 ; \ + echo; \ + echo " ERROR: Kernel configuration is invalid."; \ + echo " include/generated/autoconf.h or $@ are missing.";\ + echo " Run 'make oldconfig && make prepare' on kernel src to fix it."; \ + echo; \ /bin/false) endif # KBUILD_EXTMOD @@ -796,8 +796,8 @@ prepare3: include/config/kernel.release ifneq ($(KBUILD_SRC),) @$(kecho) ' Using $(srctree) as source for kernel' $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \ - echo >&2 " $(srctree) is not clean, please run 'make mrproper'"; \ - echo >&2 " in the '$(srctree)' directory.";\ + echo " $(srctree) is not clean, please run 'make mrproper'"; \ + echo " in the '$(srctree)' directory.";\ /bin/false; \ fi; endif @@ -971,11 +971,11 @@ else # CONFIG_MODULES # --------------------------------------------------------------------------- modules modules_install: FORCE - @echo >&2 - @echo >&2 "The present kernel configuration has modules disabled." - @echo >&2 "Type 'make config' and enable loadable module support." - @echo >&2 "Then build a kernel with module support enabled." - @echo >&2 + @echo + @echo "The present kernel configuration has modules disabled." + @echo "Type 'make config' and enable loadable module support." + @echo "Then build a kernel with module support enabled." + @echo @exit 1 endif # CONFIG_MODULES diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 72f2fa189cc5..8c3d957fa8e2 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -248,14 +248,7 @@ config HAVE_CMPXCHG_LOCAL config HAVE_CMPXCHG_DOUBLE bool -config ARCH_WANT_IPC_PARSE_VERSION - bool - -config ARCH_WANT_COMPAT_IPC_PARSE_VERSION - bool - config ARCH_WANT_OLD_COMPAT_IPC - select ARCH_WANT_COMPAT_IPC_PARSE_VERSION bool config HAVE_ARCH_SECCOMP_FILTER diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index d5b9b5e645cc..3de74c9f9610 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/arch/alpha/Kconfig @@ -14,7 +14,6 @@ config ALPHA select AUTO_IRQ_AFFINITY if SMP select GENERIC_IRQ_SHOW select ARCH_WANT_OPTIONAL_GPIOLIB - select ARCH_WANT_IPC_PARSE_VERSION select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_SMP_IDLE_THREAD select GENERIC_CMOS_UPDATE diff --git a/trunk/arch/alpha/include/asm/unistd.h b/trunk/arch/alpha/include/asm/unistd.h index 633b23b0664a..d1f23b722df4 100644 --- a/trunk/arch/alpha/include/asm/unistd.h +++ b/trunk/arch/alpha/include/asm/unistd.h @@ -470,6 +470,7 @@ #define NR_SYSCALLS 504 +#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME diff --git a/trunk/arch/alpha/kernel/smc37c669.c b/trunk/arch/alpha/kernel/smc37c669.c index c803fc76ae4f..0435921d41c6 100644 --- a/trunk/arch/alpha/kernel/smc37c669.c +++ b/trunk/arch/alpha/kernel/smc37c669.c @@ -933,6 +933,18 @@ void SMC37c669_display_device_info( * *-- */ +#if 0 +/* $INCLUDE_OPTIONS$ */ +#include "cp$inc:platform_io.h" +/* $INCLUDE_OPTIONS_END$ */ +#include "cp$src:common.h" +#include "cp$inc:prototypes.h" +#include "cp$src:kernel_def.h" +#include "cp$src:msg_def.h" +#include "cp$src:smcc669_def.h" +/* Platform-specific includes */ +#include "cp$src:platform.h" +#endif #ifndef TRUE #define TRUE 1 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 7980873525b2..fbdd8533c05d 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -11,7 +11,6 @@ config ARM select RTC_LIB select SYS_SUPPORTS_APM_EMULATION select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI) - select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select HAVE_OPROFILE if (HAVE_PERF_EVENTS) select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL select HAVE_ARCH_KGDB @@ -39,7 +38,6 @@ config ARM select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_IRQ_PROBE - select ARCH_WANT_IPC_PARSE_VERSION select HARDIRQS_SW_RESEND select CPU_PM if (SUSPEND || CPU_IDLE) select GENERIC_PCI_IOMAP @@ -1011,6 +1009,7 @@ config ARCH_VT8500 select ARCH_HAS_CPUFREQ select GENERIC_CLOCKEVENTS select ARCH_REQUIRE_GPIOLIB + select HAVE_PWM help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. diff --git a/trunk/arch/arm/boot/dts/highbank.dts b/trunk/arch/arm/boot/dts/highbank.dts index 9fecf1ae777b..2e1cfa00c25b 100644 --- a/trunk/arch/arm/boot/dts/highbank.dts +++ b/trunk/arch/arm/boot/dts/highbank.dts @@ -130,12 +130,6 @@ clocks = <&eclk>; }; - memory-controller@fff00000 { - compatible = "calxeda,hb-ddr-ctrl"; - reg = <0xfff00000 0x1000>; - interrupts = <0 91 4>; - }; - ipc@fff20000 { compatible = "arm,pl320", "arm,primecell"; reg = <0xfff20000 0x1000>; @@ -281,12 +275,6 @@ }; }; - sregs@fff3c200 { - compatible = "calxeda,hb-sregs-l2-ecc"; - reg = <0xfff3c200 0x100>; - interrupts = <0 71 4 0 72 4>; - }; - dma@fff3d000 { compatible = "arm,pl330", "arm,primecell"; reg = <0xfff3d000 0x1000>; diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index 787efac68da8..915db89e3644 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -660,7 +660,6 @@ compatible = "fsl,imx28-i2c"; reg = <0x80058000 2000>; interrupts = <111 68>; - clock-frequency = <100000>; status = "disabled"; }; @@ -670,7 +669,6 @@ compatible = "fsl,imx28-i2c"; reg = <0x8005a000 2000>; interrupts = <110 69>; - clock-frequency = <100000>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/r8a7740.dtsi b/trunk/arch/arm/boot/dts/r8a7740.dtsi deleted file mode 100644 index 798fa35c0005..000000000000 --- a/trunk/arch/arm/boot/dts/r8a7740.dtsi +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Device Tree Source for the r8a7740 SoC - * - * Copyright (C) 2012 Renesas Solutions Corp. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -/include/ "skeleton.dtsi" - -/ { - compatible = "renesas,r8a7740"; - - cpus { - cpu@0 { - compatible = "arm,cortex-a9"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/sh7377.dtsi b/trunk/arch/arm/boot/dts/sh7377.dtsi deleted file mode 100644 index 767ee0796daa..000000000000 --- a/trunk/arch/arm/boot/dts/sh7377.dtsi +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Device Tree Source for the sh7377 SoC - * - * Copyright (C) 2012 Renesas Solutions Corp. - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ - -/include/ "skeleton.dtsi" - -/ { - compatible = "renesas,sh7377"; - - cpus { - cpu@0 { - compatible = "arm,cortex-a8"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index 405d1673904e..9f1921634eb7 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -123,12 +123,6 @@ status = "disabled"; }; - pwm { - compatible = "nvidia,tegra20-pwm"; - reg = <0x7000a000 0x100>; - #pwm-cells = <2>; - }; - i2c@7000c000 { compatible = "nvidia,tegra20-i2c"; reg = <0x7000c000 0x100>; diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi index 3e4334d14efb..da740191771f 100644 --- a/trunk/arch/arm/boot/dts/tegra30.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30.dtsi @@ -117,12 +117,6 @@ status = "disabled"; }; - pwm { - compatible = "nvidia,tegra30-pwm", "nvidia,tegra20-pwm"; - reg = <0x7000a000 0x100>; - #pwm-cells = <2>; - }; - i2c@7000c000 { compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; reg = <0x7000c000 0x100>; diff --git a/trunk/arch/arm/common/dmabounce.c b/trunk/arch/arm/common/dmabounce.c index 1143c4d5c567..aa07f5938f05 100644 --- a/trunk/arch/arm/common/dmabounce.c +++ b/trunk/arch/arm/common/dmabounce.c @@ -452,7 +452,6 @@ static struct dma_map_ops dmabounce_ops = { .alloc = arm_dma_alloc, .free = arm_dma_free, .mmap = arm_dma_mmap, - .get_sgtable = arm_dma_get_sgtable, .map_page = dmabounce_map_page, .unmap_page = dmabounce_unmap_page, .sync_single_for_cpu = dmabounce_sync_for_cpu, diff --git a/trunk/arch/arm/configs/armadillo800eva_defconfig b/trunk/arch/arm/configs/armadillo800eva_defconfig index 7d8718468e0d..ddc9fe6a78ac 100644 --- a/trunk/arch/arm/configs/armadillo800eva_defconfig +++ b/trunk/arch/arm/configs/armadillo800eva_defconfig @@ -5,7 +5,10 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 # CONFIG_UTS_NS is not set # CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set # CONFIG_PID_NS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SLAB=y CONFIG_MODULES=y @@ -18,7 +21,7 @@ CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_R8A7740=y CONFIG_MACH_ARMADILLO800EVA=y # CONFIG_SH_TIMER_TMU is not set -CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMB is not set CONFIG_CPU_BPREDICT_DISABLE=y # CONFIG_CACHE_L2X0 is not set CONFIG_ARM_ERRATA_430973=y @@ -36,7 +39,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096" CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y -CONFIG_VFP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_SUSPEND is not set CONFIG_NET=y @@ -87,32 +89,26 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_I2C=y CONFIG_I2C_SH_MOBILE=y # CONFIG_HWMON is not set -CONFIG_MEDIA_SUPPORT=y -CONFIG_VIDEO_DEV=y -# CONFIG_RC_CORE is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -# CONFIG_V4L_USB_DRIVERS is not set -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_SOC_CAMERA=y -CONFIG_SOC_CAMERA_MT9T112=y -CONFIG_VIDEO_SH_MOBILE_CEU=y -# CONFIG_RADIO_ADAPTERS is not set CONFIG_FB=y +CONFIG_FB_MODE_HELPERS=y CONFIG_FB_SH_MOBILE_LCDC=y -CONFIG_FB_SH_MOBILE_HDMI=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_SOUND=y +CONFIG_SND=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set # CONFIG_SND_DRIVERS is not set # CONFIG_SND_ARM is not set +CONFIG_SND_SOC=y CONFIG_SND_SOC_SH4_FSI=y # CONFIG_HID_SUPPORT is not set CONFIG_USB=y +# CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=y @@ -120,8 +116,6 @@ CONFIG_USB_ETH=m CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y -CONFIG_DMADEVICES=y -CONFIG_SH_DMAE=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_DNOTIFY is not set @@ -130,6 +124,7 @@ CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y +CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_NFS_V4_1=y diff --git a/trunk/arch/arm/configs/kzm9d_defconfig b/trunk/arch/arm/configs/kzm9d_defconfig deleted file mode 100644 index 26146ffea1a5..000000000000 --- a/trunk/arch/arm/configs/kzm9d_defconfig +++ /dev/null @@ -1,89 +0,0 @@ -# CONFIG_ARM_PATCH_PHYS_VIRT is not set -CONFIG_EXPERIMENTAL=y -CONFIG_SYSVIPC=y -CONFIG_NO_HZ=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_EMBEDDED=y -CONFIG_SLAB=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set -CONFIG_ARCH_SHMOBILE=y -CONFIG_ARCH_EMEV2=y -CONFIG_MACH_KZM9D=y -CONFIG_MEMORY_START=0x40000000 -CONFIG_MEMORY_SIZE=0x10000000 -# CONFIG_SH_TIMER_TMU is not set -# CONFIG_SWP_EMULATE is not set -# CONFIG_CACHE_L2X0 is not set -CONFIG_SMP=y -CONFIG_NR_CPUS=2 -CONFIG_HOTPLUG_CPU=y -# CONFIG_LOCAL_TIMERS is not set -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -# CONFIG_CROSS_MEMORY_ATTACH is not set -CONFIG_FORCE_MAX_ZONEORDER=13 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y -CONFIG_CMDLINE="console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096" -CONFIG_CMDLINE_FORCE=y -CONFIG_VFP=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -# CONFIG_SUSPEND is not set -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set -# CONFIG_INET_DIAG is not set -# CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -# CONFIG_BLK_DEV is not set -CONFIG_NETDEVICES=y -# CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CIRRUS is not set -# CONFIG_NET_VENDOR_FARADAY 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_SEEQ is not set -CONFIG_SMSC911X=y -# CONFIG_NET_VENDOR_STMICRO is not set -# CONFIG_NET_VENDOR_WIZNET is not set -# CONFIG_WLAN is not set -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_EM=y -# CONFIG_HW_RANDOM is not set -CONFIG_GPIOLIB=y -CONFIG_GPIO_EM=y -# CONFIG_HWMON is not set -# CONFIG_HID_SUPPORT is not set -# CONFIG_USB_SUPPORT is not set -# CONFIG_IOMMU_SUPPORT is not set -# CONFIG_DNOTIFY is not set -CONFIG_TMPFS=y -# CONFIG_MISC_FILESYSTEMS is not set -CONFIG_NFS_FS=y -CONFIG_ROOT_NFS=y -# CONFIG_FTRACE is not set diff --git a/trunk/arch/arm/configs/kzm9g_defconfig b/trunk/arch/arm/configs/kzm9g_defconfig index 2388c8610627..e3ebc20ed0a7 100644 --- a/trunk/arch/arm/configs/kzm9g_defconfig +++ b/trunk/arch/arm/configs/kzm9g_defconfig @@ -100,12 +100,7 @@ CONFIG_SND_SOC_SH4_FSI=y CONFIG_USB=y CONFIG_USB_DEVICEFS=y CONFIG_USB_R8A66597_HCD=y -CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y -CONFIG_USB_RENESAS_USBHS_UDC=y -CONFIG_USB_ETH=m -CONFIG_USB_MASS_STORAGE=m CONFIG_MMC=y # CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_SDHI=y @@ -113,13 +108,12 @@ CONFIG_MMC_SH_MMCIF=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_RS5C372=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y CONFIG_ASYNC_TX_DMA=y CONFIG_STAGING=y # CONFIG_DNOTIFY is not set -CONFIG_INOTIFY_USER=y +# CONFIG_INOTIFY_USER is not set CONFIG_VFAT_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set diff --git a/trunk/arch/arm/configs/tegra_defconfig b/trunk/arch/arm/configs/tegra_defconfig index db2245353f0f..4be9c1e80ee6 100644 --- a/trunk/arch/arm/configs/tegra_defconfig +++ b/trunk/arch/arm/configs/tegra_defconfig @@ -106,7 +106,6 @@ CONFIG_I2C_TEGRA=y CONFIG_SPI=y CONFIG_SPI_TEGRA=y CONFIG_GPIO_TPS65910=y -CONFIG_GPIO_TPS6586X=y CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_SBS=y CONFIG_SENSORS_LM90=y diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index 2ae842df4551..bbef15d04890 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -186,6 +186,17 @@ extern int arm_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, struct dma_attrs *attrs); +#define dma_mmap_coherent(d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, NULL) + +static inline int dma_mmap_attrs(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, dma_addr_t dma_addr, + size_t size, struct dma_attrs *attrs) +{ + struct dma_map_ops *ops = get_dma_ops(dev); + BUG_ON(!ops); + return ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs); +} + static inline void *dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { @@ -202,12 +213,20 @@ static inline void dma_free_writecombine(struct device *dev, size_t size, return dma_free_attrs(dev, size, cpu_addr, dma_handle, &attrs); } +static inline int dma_mmap_writecombine(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, dma_addr_t dma_addr, size_t size) +{ + DEFINE_DMA_ATTRS(attrs); + dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); + return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, &attrs); +} + /* * This can be called during boot to increase the size of the consistent * DMA region above it's default value of 2MB. It must be called before the * memory allocator is initialised, i.e. before any core_initcall. */ -static inline void init_consistent_dma_size(unsigned long size) { } +extern void __init init_consistent_dma_size(unsigned long size); /* * For SA-1111, IXP425, and ADI systems the dma-mapping functions are "magic" @@ -261,9 +280,6 @@ extern void arm_dma_sync_sg_for_cpu(struct device *, struct scatterlist *, int, enum dma_data_direction); extern void arm_dma_sync_sg_for_device(struct device *, struct scatterlist *, int, enum dma_data_direction); -extern int arm_dma_get_sgtable(struct device *dev, struct sg_table *sgt, - void *cpu_addr, dma_addr_t dma_addr, size_t size, - struct dma_attrs *attrs); #endif /* __KERNEL__ */ #endif diff --git a/trunk/arch/arm/include/asm/unistd.h b/trunk/arch/arm/include/asm/unistd.h index 0cab47d4a83f..512cd1473454 100644 --- a/trunk/arch/arm/include/asm/unistd.h +++ b/trunk/arch/arm/include/asm/unistd.h @@ -446,6 +446,7 @@ #ifdef __KERNEL__ +#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_GETHOSTNAME #define __ARCH_WANT_SYS_PAUSE diff --git a/trunk/arch/arm/lib/io-acorn.S b/trunk/arch/arm/lib/io-acorn.S index 69719bad674d..1b197ea7aab3 100644 --- a/trunk/arch/arm/lib/io-acorn.S +++ b/trunk/arch/arm/lib/io-acorn.S @@ -11,14 +11,13 @@ * */ #include -#include #include .text .align .Liosl_warning: - .ascii KERN_WARNING "insl/outsl not implemented, called from %08lX\0" + .ascii "<4>insl/outsl not implemented, called from %08lX\0" .align /* diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4.c b/trunk/arch/arm/mach-exynos/clock-exynos4.c index 2f51293c1875..26fe9de35ecb 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4.c @@ -619,6 +619,10 @@ static struct clk exynos4_init_clocks_off[] = { .devname = "samsung-ac97", .enable = exynos4_clk_ip_peril_ctrl, .ctrlbit = (1 << 27), + }, { + .name = "fimg2d", + .enable = exynos4_clk_ip_image_ctrl, + .ctrlbit = (1 << 0), }, { .name = "mfc", .devname = "s5p-mfc", @@ -815,21 +819,47 @@ static struct clk *exynos4_clkset_mout_g2d0_list[] = { [1] = &exynos4_clk_sclk_apll.clk, }; -struct clksrc_sources exynos4_clkset_mout_g2d0 = { +static struct clksrc_sources exynos4_clkset_mout_g2d0 = { .sources = exynos4_clkset_mout_g2d0_list, .nr_sources = ARRAY_SIZE(exynos4_clkset_mout_g2d0_list), }; +static struct clksrc_clk exynos4_clk_mout_g2d0 = { + .clk = { + .name = "mout_g2d0", + }, + .sources = &exynos4_clkset_mout_g2d0, + .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 0, .size = 1 }, +}; + static struct clk *exynos4_clkset_mout_g2d1_list[] = { [0] = &exynos4_clk_mout_epll.clk, [1] = &exynos4_clk_sclk_vpll.clk, }; -struct clksrc_sources exynos4_clkset_mout_g2d1 = { +static struct clksrc_sources exynos4_clkset_mout_g2d1 = { .sources = exynos4_clkset_mout_g2d1_list, .nr_sources = ARRAY_SIZE(exynos4_clkset_mout_g2d1_list), }; +static struct clksrc_clk exynos4_clk_mout_g2d1 = { + .clk = { + .name = "mout_g2d1", + }, + .sources = &exynos4_clkset_mout_g2d1, + .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 4, .size = 1 }, +}; + +static struct clk *exynos4_clkset_mout_g2d_list[] = { + [0] = &exynos4_clk_mout_g2d0.clk, + [1] = &exynos4_clk_mout_g2d1.clk, +}; + +static struct clksrc_sources exynos4_clkset_mout_g2d = { + .sources = exynos4_clkset_mout_g2d_list, + .nr_sources = ARRAY_SIZE(exynos4_clkset_mout_g2d_list), +}; + static struct clk *exynos4_clkset_mout_mfc0_list[] = { [0] = &exynos4_clk_mout_mpll.clk, [1] = &exynos4_clk_sclk_apll.clk, @@ -1094,6 +1124,13 @@ static struct clksrc_clk exynos4_clksrcs[] = { .sources = &exynos4_clkset_group, .reg_src = { .reg = EXYNOS4_CLKSRC_LCD0, .shift = 0, .size = 4 }, .reg_div = { .reg = EXYNOS4_CLKDIV_LCD0, .shift = 0, .size = 4 }, + }, { + .clk = { + .name = "sclk_fimg2d", + }, + .sources = &exynos4_clkset_mout_g2d, + .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 8, .size = 1 }, + .reg_div = { .reg = EXYNOS4_CLKDIV_IMAGE, .shift = 0, .size = 4 }, }, { .clk = { .name = "sclk_mfc", diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4.h b/trunk/arch/arm/mach-exynos/clock-exynos4.h index bd12d5f8b63d..28a119701182 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4.h +++ b/trunk/arch/arm/mach-exynos/clock-exynos4.h @@ -23,9 +23,6 @@ extern struct clksrc_sources exynos4_clkset_group; extern struct clk *exynos4_clkset_aclk_top_list[]; extern struct clk *exynos4_clkset_group_list[]; -extern struct clksrc_sources exynos4_clkset_mout_g2d0; -extern struct clksrc_sources exynos4_clkset_mout_g2d1; - extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable); extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable); extern int exynos4_clk_ip_lcd1_ctrl(struct clk *clk, int enable); diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4210.c b/trunk/arch/arm/mach-exynos/clock-exynos4210.c index fed4c26e9dad..b8689ff60baf 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4210.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4210.c @@ -48,32 +48,6 @@ static struct clksrc_clk *sysclks[] = { /* nothing here yet */ }; -static struct clksrc_clk exynos4210_clk_mout_g2d0 = { - .clk = { - .name = "mout_g2d0", - }, - .sources = &exynos4_clkset_mout_g2d0, - .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 0, .size = 1 }, -}; - -static struct clksrc_clk exynos4210_clk_mout_g2d1 = { - .clk = { - .name = "mout_g2d1", - }, - .sources = &exynos4_clkset_mout_g2d1, - .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 4, .size = 1 }, -}; - -static struct clk *exynos4210_clkset_mout_g2d_list[] = { - [0] = &exynos4210_clk_mout_g2d0.clk, - [1] = &exynos4210_clk_mout_g2d1.clk, -}; - -static struct clksrc_sources exynos4210_clkset_mout_g2d = { - .sources = exynos4210_clkset_mout_g2d_list, - .nr_sources = ARRAY_SIZE(exynos4210_clkset_mout_g2d_list), -}; - static int exynos4_clksrc_mask_lcd1_ctrl(struct clk *clk, int enable) { return s5p_gatectrl(EXYNOS4210_CLKSRC_MASK_LCD1, clk, enable); @@ -100,13 +74,6 @@ static struct clksrc_clk clksrcs[] = { .sources = &exynos4_clkset_group, .reg_src = { .reg = EXYNOS4210_CLKSRC_LCD1, .shift = 0, .size = 4 }, .reg_div = { .reg = EXYNOS4210_CLKDIV_LCD1, .shift = 0, .size = 4 }, - }, { - .clk = { - .name = "sclk_fimg2d", - }, - .sources = &exynos4210_clkset_mout_g2d, - .reg_src = { .reg = EXYNOS4_CLKSRC_IMAGE, .shift = 8, .size = 1 }, - .reg_div = { .reg = EXYNOS4_CLKDIV_IMAGE, .shift = 0, .size = 4 }, }, }; @@ -138,10 +105,6 @@ static struct clk init_clocks_off[] = { .devname = SYSMMU_CLOCK_DEVNAME(fimd1, 11), .enable = exynos4_clk_ip_lcd1_ctrl, .ctrlbit = (1 << 4), - }, { - .name = "fimg2d", - .enable = exynos4_clk_ip_image_ctrl, - .ctrlbit = (1 << 0), }, }; diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4212.c b/trunk/arch/arm/mach-exynos/clock-exynos4212.c index 8fba0b5fb8ab..da397d21bbcf 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4212.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4212.c @@ -68,45 +68,12 @@ static struct clksrc_clk clk_mout_mpll_user = { .reg_src = { .reg = EXYNOS4_CLKSRC_CPU, .shift = 24, .size = 1 }, }; -static struct clksrc_clk exynos4x12_clk_mout_g2d0 = { - .clk = { - .name = "mout_g2d0", - }, - .sources = &exynos4_clkset_mout_g2d0, - .reg_src = { .reg = EXYNOS4_CLKSRC_DMC, .shift = 20, .size = 1 }, -}; - -static struct clksrc_clk exynos4x12_clk_mout_g2d1 = { - .clk = { - .name = "mout_g2d1", - }, - .sources = &exynos4_clkset_mout_g2d1, - .reg_src = { .reg = EXYNOS4_CLKSRC_DMC, .shift = 24, .size = 1 }, -}; - -static struct clk *exynos4x12_clkset_mout_g2d_list[] = { - [0] = &exynos4x12_clk_mout_g2d0.clk, - [1] = &exynos4x12_clk_mout_g2d1.clk, -}; - -static struct clksrc_sources exynos4x12_clkset_mout_g2d = { - .sources = exynos4x12_clkset_mout_g2d_list, - .nr_sources = ARRAY_SIZE(exynos4x12_clkset_mout_g2d_list), -}; - static struct clksrc_clk *sysclks[] = { &clk_mout_mpll_user, }; static struct clksrc_clk clksrcs[] = { - { - .clk = { - .name = "sclk_fimg2d", - }, - .sources = &exynos4x12_clkset_mout_g2d, - .reg_src = { .reg = EXYNOS4_CLKSRC_DMC, .shift = 28, .size = 1 }, - .reg_div = { .reg = EXYNOS4_CLKDIV_DMC1, .shift = 0, .size = 4 }, - }, + /* nothing here yet */ }; static struct clk init_clocks_off[] = { @@ -135,11 +102,7 @@ static struct clk init_clocks_off[] = { .devname = "exynos-fimc-lite.1", .enable = exynos4212_clk_ip_isp0_ctrl, .ctrlbit = (1 << 3), - }, { - .name = "fimg2d", - .enable = exynos4_clk_ip_dmc_ctrl, - .ctrlbit = (1 << 23), - }, + } }; #ifdef CONFIG_PM_SLEEP diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c index ea785fcaf6c3..f98a83a81ce7 100644 --- a/trunk/arch/arm/mach-exynos/mach-nuri.c +++ b/trunk/arch/arm/mach-exynos/mach-nuri.c @@ -1066,8 +1066,12 @@ static struct platform_device nuri_max8903_device = { static void __init nuri_power_init(void) { int gpio; + int irq_base = IRQ_GPIO_END + 1; int ta_en = 0; + nuri_max8997_pdata.irq_base = irq_base; + irq_base += MAX8997_IRQ_NR; + gpio = EXYNOS4_GPX0(7); gpio_request(gpio, "AP_PMIC_IRQ"); s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf)); diff --git a/trunk/arch/arm/mach-exynos/mach-origen.c b/trunk/arch/arm/mach-exynos/mach-origen.c index 5ca80307d6d7..5a12dc26f496 100644 --- a/trunk/arch/arm/mach-exynos/mach-origen.c +++ b/trunk/arch/arm/mach-exynos/mach-origen.c @@ -426,6 +426,7 @@ static struct max8997_platform_data __initdata origen_max8997_pdata = { .buck1_gpiodvs = false, .buck2_gpiodvs = false, .buck5_gpiodvs = false, + .irq_base = IRQ_GPIO_END + 1, .ignore_gpiodvs_side_effect = true, .buck125_default_idx = 0x0, diff --git a/trunk/arch/arm/mach-netx/fb.c b/trunk/arch/arm/mach-netx/fb.c index d122ee6ab991..2cdf6ef69bee 100644 --- a/trunk/arch/arm/mach-netx/fb.c +++ b/trunk/arch/arm/mach-netx/fb.c @@ -69,6 +69,29 @@ void netx_clcd_remove(struct clcd_fb *fb) fb->fb.screen_base, fb->fb.fix.smem_start); } +void clk_disable(struct clk *clk) +{ +} + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + return 0; +} + +int clk_enable(struct clk *clk) +{ + return 0; +} + +struct clk *clk_get(struct device *dev, const char *id) +{ + return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT); +} + +void clk_put(struct clk *clk) +{ +} + static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL); int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel) diff --git a/trunk/arch/arm/mach-pxa/eseries.h b/trunk/arch/arm/mach-pxa/eseries.h new file mode 100644 index 000000000000..b96949dd5adb --- /dev/null +++ b/trunk/arch/arm/mach-pxa/eseries.h @@ -0,0 +1,14 @@ +void __init eseries_fixup(struct tag *tags, char **cmdline, struct meminfo *mi); + +extern struct pxa2xx_udc_mach_info e7xx_udc_mach_info; +extern struct pxaficp_platform_data e7xx_ficp_platform_data; +extern int e7xx_irda_init(void); + +extern int eseries_tmio_enable(struct platform_device *dev); +extern int eseries_tmio_disable(struct platform_device *dev); +extern int eseries_tmio_suspend(struct platform_device *dev); +extern int eseries_tmio_resume(struct platform_device *dev); +extern void eseries_get_tmio_gpios(void); +extern struct resource eseries_tmio_resources[]; +extern struct platform_device e300_tc6387xb_device; + diff --git a/trunk/arch/arm/mach-pxa/hx4700.c b/trunk/arch/arm/mach-pxa/hx4700.c index e6311988add2..d3de84b0dcbe 100644 --- a/trunk/arch/arm/mach-pxa/hx4700.c +++ b/trunk/arch/arm/mach-pxa/hx4700.c @@ -296,11 +296,27 @@ static struct asic3_led asic3_leds[ASIC3_NUM_LEDS] = { static struct resource asic3_resources[] = { /* GPIO part */ - [0] = DEFINE_RES_MEM(ASIC3_PHYS, ASIC3_MAP_SIZE_16BIT), - [1] = DEFINE_RES_IRQ(PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ)), + [0] = { + .start = ASIC3_PHYS, + .end = ASIC3_PHYS + ASIC3_MAP_SIZE_16BIT - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ), + .end = PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ), + .flags = IORESOURCE_IRQ, + }, /* SD part */ - [2] = DEFINE_RES_MEM(ASIC3_SD_PHYS, ASIC3_MAP_SIZE_16BIT), - [3] = DEFINE_RES_IRQ(PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ)), + [2] = { + .start = ASIC3_SD_PHYS, + .end = ASIC3_SD_PHYS + ASIC3_MAP_SIZE_16BIT - 1, + .flags = IORESOURCE_MEM, + }, + [3] = { + .start = PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ), + .end = PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ), + .flags = IORESOURCE_IRQ, + }, }; static struct asic3_platform_data asic3_platform_data = { @@ -327,7 +343,11 @@ static struct platform_device asic3 = { */ static struct resource egpio_resources[] = { - [0] = DEFINE_RES_MEM(PXA_CS5_PHYS, 0x4), + [0] = { + .start = PXA_CS5_PHYS, + .end = PXA_CS5_PHYS + 0x4 - 1, + .flags = IORESOURCE_MEM, + }, }; static struct htc_egpio_chip egpio_chips[] = { @@ -517,7 +537,11 @@ static struct w100fb_mach_info w3220_info = { }; static struct resource w3220_resources[] = { - [0] = DEFINE_RES_MEM(ATI_W3220_PHYS, SZ_16M), + [0] = { + .start = ATI_W3220_PHYS, + .end = ATI_W3220_PHYS + 0x00ffffff, + .flags = IORESOURCE_MEM, + }, }; static struct platform_device w3220 = { @@ -659,12 +683,20 @@ static struct pda_power_pdata power_supply_info = { }; static struct resource power_supply_resources[] = { - [0] = DEFINE_RES_NAMED(PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN), 1, "ac", - IORESOURCE_IRQ | - IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE), - [1] = DEFINE_RES_NAMED(PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT), 1, "usb", - IORESOURCE_IRQ | - IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE), + [0] = { + .name = "ac", + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | + IORESOURCE_IRQ_LOWEDGE, + .start = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN), + .end = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN), + }, + [1] = { + .name = "usb", + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE | + IORESOURCE_IRQ_LOWEDGE, + .start = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT), + .end = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT), + }, }; static struct platform_device power_supply = { diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/trunk/arch/arm/mach-s3c64xx/include/mach/pm-core.h index c0537f40a3d8..fcf3dcabb694 100644 --- a/trunk/arch/arm/mach-s3c64xx/include/mach/pm-core.h +++ b/trunk/arch/arm/mach-s3c64xx/include/mach/pm-core.h @@ -12,9 +12,6 @@ * published by the Free Software Foundation. */ -#ifndef __MACH_S3C64XX_PM_CORE_H -#define __MACH_S3C64XX_PM_CORE_H __FILE__ - #include static inline void s3c_pm_debug_init_uart(void) @@ -116,4 +113,3 @@ static inline void samsung_pm_saved_gpios(void) __raw_writel(S3C64XX_SLPEN_USE_xSLP, S3C64XX_SLPEN); } -#endif /* __MACH_S3C64XX_PM_CORE_H */ diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig index 4cacc2d22fbe..df33909205e2 100644 --- a/trunk/arch/arm/mach-shmobile/Kconfig +++ b/trunk/arch/arm/mach-shmobile/Kconfig @@ -19,7 +19,6 @@ config ARCH_SH7372 select CPU_V7 select SH_CLK_CPG select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_CPU_SUSPEND if PM || CPU_IDLE config ARCH_SH73A0 bool "SH-Mobile AG5 (R8A73A00)" @@ -59,7 +58,6 @@ config MACH_G4EVM bool "G4EVM board" depends on ARCH_SH7377 select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR config MACH_AP4EVB bool "AP4EVB board" @@ -67,7 +65,6 @@ config MACH_AP4EVB select ARCH_REQUIRE_GPIOLIB select SH_LCD_MIPI_DSI select SND_SOC_AK4642 if SND_SIMPLE_CARD - select REGULATOR_FIXED_VOLTAGE if REGULATOR choice prompt "AP4EVB LCD panel selection" @@ -86,7 +83,6 @@ config MACH_AG5EVM bool "AG5EVM board" select ARCH_REQUIRE_GPIOLIB select SH_LCD_MIPI_DSI - select REGULATOR_FIXED_VOLTAGE if REGULATOR depends on ARCH_SH73A0 config MACH_MACKEREL @@ -94,18 +90,15 @@ config MACH_MACKEREL depends on ARCH_SH7372 select ARCH_REQUIRE_GPIOLIB select SND_SOC_AK4642 if SND_SIMPLE_CARD - select REGULATOR_FIXED_VOLTAGE if REGULATOR config MACH_KOTA2 bool "KOTA2 board" select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR depends on ARCH_SH73A0 config MACH_BONITO bool "bonito board" select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR depends on ARCH_R8A7740 config MACH_ARMADILLO800EVA @@ -113,28 +106,22 @@ config MACH_ARMADILLO800EVA depends on ARCH_R8A7740 select ARCH_REQUIRE_GPIOLIB select USE_OF - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SND_SOC_WM8978 if SND_SIMPLE_CARD config MACH_MARZEN bool "MARZEN board" depends on ARCH_R8A7779 select ARCH_REQUIRE_GPIOLIB - select REGULATOR_FIXED_VOLTAGE if REGULATOR config MACH_KZM9D bool "KZM9D board" depends on ARCH_EMEV2 select USE_OF - select REGULATOR_FIXED_VOLTAGE if REGULATOR config MACH_KZM9G bool "KZM-A9-GT board" depends on ARCH_SH73A0 select ARCH_REQUIRE_GPIOLIB select USE_OF - select SND_SOC_AK4642 if SND_SIMPLE_CARD - select REGULATOR_FIXED_VOLTAGE if REGULATOR comment "SH-Mobile System Configuration" diff --git a/trunk/arch/arm/mach-shmobile/Makefile b/trunk/arch/arm/mach-shmobile/Makefile index 0df5ae6740c6..8aa1962c22a2 100644 --- a/trunk/arch/arm/mach-shmobile/Makefile +++ b/trunk/arch/arm/mach-shmobile/Makefile @@ -39,9 +39,7 @@ obj-$(CONFIG_ARCH_R8A7740) += entry-intc.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_ARCH_SHMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o -obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o # Board objects diff --git a/trunk/arch/arm/mach-shmobile/board-ag5evm.c b/trunk/arch/arm/mach-shmobile/board-ag5evm.c index d82c010fdfc6..5a6f22f05e99 100644 --- a/trunk/arch/arm/mach-shmobile/board-ag5evm.c +++ b/trunk/arch/arm/mach-shmobile/board-ag5evm.c @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include #include #include @@ -54,12 +52,6 @@ #include #include -/* Dummy supplies, where voltage doesn't matter */ -static struct regulator_consumer_supply dummy_supplies[] = { - REGULATOR_SUPPLY("vddvario", "smsc911x"), - REGULATOR_SUPPLY("vdd33a", "smsc911x"), -}; - static struct resource smsc9220_resources[] = { [0] = { .start = 0x14000000, @@ -150,13 +142,6 @@ static struct platform_device fsi_device = { .resource = fsi_resources, }; -/* Fixed 1.8V regulator to be used by MMCIF */ -static struct regulator_consumer_supply fixed1v8_power_consumers[] = -{ - REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"), - REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"), -}; - static struct resource sh_mmcif_resources[] = { [0] = { .name = "MMCIF", @@ -379,13 +364,6 @@ static struct platform_device mipidsi0_device = { }, }; -/* Fixed 2.8V regulators to be used by SDHI0 */ -static struct regulator_consumer_supply fixed2v8_power_consumers[] = -{ - REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), - REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"), -}; - /* SDHI0 */ static struct sh_mobile_sdhi_info sdhi0_info = { .dma_slave_tx = SHDMA_SLAVE_SDHI0_TX, @@ -430,57 +408,8 @@ static struct platform_device sdhi0_device = { }, }; -/* Fixed 3.3V regulator to be used by SDHI1 */ -static struct regulator_consumer_supply cn4_power_consumers[] = +void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) { - REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"), - REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"), -}; - -static struct regulator_init_data cn4_power_init_data = { - .constraints = { - .valid_ops_mask = REGULATOR_CHANGE_STATUS, - }, - .num_consumer_supplies = ARRAY_SIZE(cn4_power_consumers), - .consumer_supplies = cn4_power_consumers, -}; - -static struct fixed_voltage_config cn4_power_info = { - .supply_name = "CN4 SD/MMC Vdd", - .microvolts = 3300000, - .gpio = GPIO_PORT114, - .enable_high = 1, - .init_data = &cn4_power_init_data, -}; - -static struct platform_device cn4_power = { - .name = "reg-fixed-voltage", - .id = 2, - .dev = { - .platform_data = &cn4_power_info, - }, -}; - -static void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state) -{ - static int power_gpio = -EINVAL; - - if (power_gpio < 0) { - int ret = gpio_request(GPIO_PORT114, "sdhi1_power"); - if (!ret) { - power_gpio = GPIO_PORT114; - gpio_direction_output(power_gpio, 0); - } - } - - /* - * If requesting the GPIO above failed, it means, that the regulator got - * probed and grabbed the GPIO, but we don't know, whether the sdhi - * driver already uses the regulator. If it doesn't, we have to toggle - * the GPIO ourselves, even though it is now owned by the fixed - * regulator driver. We have to live with the race in case the driver - * gets unloaded and the GPIO freed between these two steps. - */ gpio_set_value(GPIO_PORT114, state); } @@ -526,7 +455,6 @@ static struct platform_device sdhi1_device = { }; static struct platform_device *ag5evm_devices[] __initdata = { - &cn4_power, ð_device, &keysc_device, &fsi_device, @@ -540,12 +468,6 @@ static struct platform_device *ag5evm_devices[] __initdata = { static void __init ag5evm_init(void) { - regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers, - ARRAY_SIZE(fixed1v8_power_consumers), 1800000); - regulator_register_always_on(1, "fixed-2.8V", fixed2v8_power_consumers, - ARRAY_SIZE(fixed2v8_power_consumers), 3300000); - regulator_register_fixed(3, dummy_supplies, ARRAY_SIZE(dummy_supplies)); - sh73a0_pinmux_init(); /* enable SCIFA2 */ @@ -640,6 +562,8 @@ static void __init ag5evm_init(void) gpio_request(GPIO_FN_SDHID1_2_PU, NULL); gpio_request(GPIO_FN_SDHID1_1_PU, NULL); gpio_request(GPIO_FN_SDHID1_0_PU, NULL); + gpio_request(GPIO_PORT114, "sdhi1_power"); + gpio_direction_output(GPIO_PORT114, 0); #ifdef CONFIG_CACHE_L2X0 /* Shared attribute override enable, 64K*8way */ diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index f172ca85905c..ace60246a5df 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -34,8 +34,6 @@ #include #include #include -#include -#include #include #include #include @@ -161,27 +159,6 @@ * CN12: 3.3v */ -/* Dummy supplies, where voltage doesn't matter */ -static struct regulator_consumer_supply fixed1v8_power_consumers[] = -{ - /* J22 default position: 1.8V */ - REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"), - REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"), - REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"), - REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"), -}; - -static struct regulator_consumer_supply fixed3v3_power_consumers[] = -{ - REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), - REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"), -}; - -static struct regulator_consumer_supply dummy_supplies[] = { - REGULATOR_SUPPLY("vddvario", "smsc911x"), - REGULATOR_SUPPLY("vdd33a", "smsc911x"), -}; - /* MTD */ static struct mtd_partition nor_flash_partitions[] = { { @@ -1161,6 +1138,21 @@ static void __init fsi_init_pm_clock(void) clk_put(fsia_ick); } +/* + * FIXME !! + * + * gpio_no_direction + * are quick_hack. + * + * current gpio frame work doesn't have + * the method to control only pull up/down/free. + * this function should be replaced by correct gpio function + */ +static void __init gpio_no_direction(u32 addr) +{ + __raw_writeb(0x00, addr); +} + /* TouchScreen */ #ifdef CONFIG_AP4EVB_QHD # define GPIO_TSC_IRQ GPIO_FN_IRQ28_123 @@ -1232,12 +1224,6 @@ static void __init ap4evb_init(void) u32 srcr4; struct clk *clk; - regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers, - ARRAY_SIZE(fixed1v8_power_consumers), 1800000); - regulator_register_always_on(1, "fixed-3.3V", fixed3v3_power_consumers, - ARRAY_SIZE(fixed3v3_power_consumers), 3300000); - regulator_register_fixed(2, dummy_supplies, ARRAY_SIZE(dummy_supplies)); - /* External clock source */ clk_set_rate(&sh7372_dv_clki_clk, 27000000); @@ -1316,8 +1302,8 @@ static void __init ap4evb_init(void) gpio_request(GPIO_PORT9, NULL); gpio_request(GPIO_PORT10, NULL); - gpio_direction_none(GPIO_PORT9CR); /* FSIAOBT needs no direction */ - gpio_direction_none(GPIO_PORT10CR); /* FSIAOLR needs no direction */ + gpio_no_direction(GPIO_PORT9CR); /* FSIAOBT needs no direction */ + gpio_no_direction(GPIO_PORT10CR); /* FSIAOLR needs no direction */ /* card detect pin for MMC slot (CN7) */ gpio_request(GPIO_PORT41, NULL); @@ -1461,14 +1447,14 @@ static void __init ap4evb_init(void) platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices)); - rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc1_device); - rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc_device); - rmobile_add_device_to_domain(&sh7372_pd_a4mp, &fsi_device); + sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc1_device); + sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device); + sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device); - rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sh_mmcif_device); - rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi0_device); - rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi1_device); - rmobile_add_device_to_domain(&sh7372_pd_a4r, &ceu_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device); + sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi1_device); + sh7372_add_device_to_domain(&sh7372_a4r, &ceu_device); hdmi_init_pm_clock(); fsi_init_pm_clock(); diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c index cf10f92856dc..9bd135531d76 100644 --- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include #include @@ -39,20 +37,14 @@ #include #include #include -#include -#include -#include -#include #include #include #include #include #include #include +#include #include