From 1ff245056a5550624085ec3a707bb6daafe10ebc Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 19 Dec 2012 16:07:13 +0000 Subject: [PATCH] --- yaml --- r: 347416 b: refs/heads/master c: 1ec94e75def550548725a0bd77312ed6c266687a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/ABI/testing/ima_policy | 3 +- .../devicetree/bindings/arm/davinci/nand.txt | 8 - .../devicetree/bindings/mtd/denali-nand.txt | 23 - .../devicetree/bindings/mtd/flctl-nand.txt | 49 - .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +- .../devicetree/bindings/mtd/m25p80.txt | 29 - .../devicetree/bindings/mtd/mtd-physmap.txt | 3 - .../devicetree/bindings/pwm/pwm-tiecap.txt | 23 - .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 23 - .../devicetree/bindings/pwm/pwm-tipwmss.txt | 31 - .../devicetree/bindings/pwm/pwm.txt | 17 +- .../devicetree/bindings/pwm/spear-pwm.txt | 18 - .../devicetree/bindings/pwm/ti,twl-pwm.txt | 17 - .../devicetree/bindings/pwm/ti,twl-pwmled.txt | 17 - .../devicetree/bindings/pwm/vt8500-pwm.txt | 17 - .../bindings/spi/nvidia,tegra20-sflash.txt | 2 +- .../bindings/spi/nvidia,tegra20-slink.txt | 2 +- .../devicetree/bindings/spi/spi_atmel.txt | 26 - trunk/Documentation/hwmon/it87 | 10 - trunk/Documentation/x86/boot.txt | 3 +- trunk/Documentation/xtensa/atomctl.txt | 44 - trunk/Makefile | 6 - trunk/arch/Kconfig | 19 - trunk/arch/arm/boot/dts/Makefile | 5 +- trunk/arch/arm/boot/dts/imx27-3ds.dts | 8 +- .../arm/boot/dts/imx27-phytec-phycore.dts | 13 +- trunk/arch/arm/boot/dts/imx27.dtsi | 11 +- trunk/arch/arm/boot/dts/omap2420-h4.dts | 2 +- trunk/arch/arm/boot/dts/spear13xx.dtsi | 14 +- trunk/arch/arm/boot/dts/spear300.dtsi | 8 +- trunk/arch/arm/boot/dts/spear310.dtsi | 8 +- trunk/arch/arm/boot/dts/spear320.dtsi | 8 +- trunk/arch/arm/boot/dts/spear600.dtsi | 8 +- trunk/arch/arm/boot/dts/sun4i-cubieboard.dts | 4 +- trunk/arch/arm/boot/dts/sun5i-olinuxino.dts | 4 +- trunk/arch/arm/configs/nhk8815_defconfig | 2 +- trunk/arch/arm/include/uapi/asm/unistd.h | 1 - trunk/arch/arm/kernel/calls.S | 1 - trunk/arch/arm/mach-davinci/board-da850-evm.c | 1 - .../arm/mach-ep93xx/include/mach/uncompress.h | 10 +- trunk/arch/arm/mach-exynos/common.h | 2 +- trunk/arch/arm/mach-imx/clk-imx51-imx53.c | 16 - trunk/arch/arm/mach-nomadik/board-nhk8815.c | 71 +- .../arch/arm/mach-nomadik/include/mach/fsmc.h | 29 + trunk/arch/arm/mach-omap2/Kconfig | 3 +- trunk/arch/arm/mach-omap2/board-3430sdp.c | 1 - trunk/arch/arm/mach-omap2/board-am3517evm.c | 1 - trunk/arch/arm/mach-omap2/board-cm-t35.c | 1 - trunk/arch/arm/mach-omap2/board-devkit8000.c | 1 - trunk/arch/arm/mach-omap2/board-h4.c | 83 +- trunk/arch/arm/mach-omap2/board-omap3evm.c | 1 - .../arch/arm/mach-omap2/board-omap3stalker.c | 1 - .../arm/mach-omap2/board-rx51-peripherals.c | 6 - trunk/arch/arm/mach-omap2/cclock44xx_data.c | 78 +- trunk/arch/arm/mach-omap2/clock.h | 10 - trunk/arch/arm/mach-omap2/clockdomain.c | 3 +- trunk/arch/arm/mach-omap2/common.c | 3 + trunk/arch/arm/mach-omap2/cpuidle34xx.c | 14 +- trunk/arch/arm/mach-omap2/cpuidle44xx.c | 28 +- trunk/arch/arm/mach-omap2/dpll3xxx.c | 46 +- trunk/arch/arm/mach-omap2/dpll44xx.c | 64 +- trunk/arch/arm/mach-omap2/mux.c | 10 +- trunk/arch/arm/mach-omap2/mux.h | 20 +- trunk/arch/arm/mach-omap2/mux34xx.c | 2 +- trunk/arch/arm/mach-omap2/serial.c | 3 +- trunk/arch/arm/mach-omap2/timer.c | 6 +- trunk/arch/arm/mach-omap2/usb-host.c | 4 - trunk/arch/arm/mach-tegra/common.c | 2 +- trunk/arch/arm/mach-tegra/tegra30_clocks.c | 4 +- trunk/arch/arm/mach-u300/core.c | 48 +- trunk/arch/arm/mach-ux500/devices-db8500.h | 1 - .../devices/platform-mx2-emma.c | 4 +- trunk/arch/arm/plat-omap/Makefile | 1 + trunk/arch/arm/plat-omap/debug-devices.c | 92 ++ .../plat-omap/include/plat/debug-devices.h | 2 + .../arm/plat-omap/include/plat/omap-serial.h} | 0 trunk/arch/cris/include/arch-v10/arch/Kbuild | 5 +- .../{uapi => }/arch-v10/arch/sv_addr.agh | 0 .../{uapi => }/arch-v10/arch/sv_addr_ag.h | 0 .../include/{uapi => }/arch-v10/arch/svinto.h | 0 .../include/{uapi => }/arch-v10/arch/user.h | 0 trunk/arch/cris/include/arch-v32/arch/Kbuild | 3 +- .../cris/include/arch-v32/arch/cryptocop.h | 116 ++- .../cris/include/arch-v32/arch/spinlock.h | 2 +- .../include/{uapi => }/arch-v32/arch/user.h | 0 trunk/arch/cris/include/asm/Kbuild | 5 + .../arch/cris/include/{uapi => }/asm/auxvec.h | 0 .../cris/include/{uapi => }/asm/bitsperlong.h | 0 .../cris/include/{uapi => }/asm/byteorder.h | 0 .../arch/cris/include/{uapi => }/asm/errno.h | 0 .../cris/include/{uapi => }/asm/ethernet.h | 0 .../cris/include/{uapi => }/asm/etraxgpio.h | 0 .../arch/cris/include/{uapi => }/asm/fcntl.h | 0 .../arch/cris/include/{uapi => }/asm/ioctl.h | 0 .../arch/cris/include/{uapi => }/asm/ioctls.h | 0 .../arch/cris/include/{uapi => }/asm/ipcbuf.h | 0 trunk/arch/cris/include/{uapi => }/asm/mman.h | 0 .../arch/cris/include/{uapi => }/asm/msgbuf.h | 0 .../arch/cris/include/{uapi => }/asm/param.h | 0 trunk/arch/cris/include/{uapi => }/asm/poll.h | 0 .../cris/include/{uapi => }/asm/posix_types.h | 0 trunk/arch/cris/include/asm/ptrace.h | 5 +- .../cris/include/{uapi => }/asm/resource.h | 0 .../arch/cris/include/{uapi => }/asm/rs485.h | 0 .../arch/cris/include/{uapi => }/asm/sembuf.h | 0 .../arch/cris/include/{uapi => }/asm/setup.h | 0 .../arch/cris/include/{uapi => }/asm/shmbuf.h | 0 .../cris/include/{uapi => }/asm/sigcontext.h | 0 .../cris/include/{uapi => }/asm/siginfo.h | 0 trunk/arch/cris/include/asm/signal.h | 121 ++- .../arch/cris/include/{uapi => }/asm/socket.h | 0 .../cris/include/{uapi => }/asm/sockios.h | 0 trunk/arch/cris/include/{uapi => }/asm/stat.h | 0 .../arch/cris/include/{uapi => }/asm/statfs.h | 0 trunk/arch/cris/include/asm/swab.h | 3 +- .../cris/include/{uapi => }/asm/sync_serial.h | 0 .../cris/include/{uapi => }/asm/termbits.h | 0 trunk/arch/cris/include/asm/termios.h | 43 +- trunk/arch/cris/include/asm/types.h | 5 +- trunk/arch/cris/include/asm/unistd.h | 342 ++++++- .../cris/include/uapi/arch-v10/arch/Kbuild | 4 - .../cris/include/uapi/arch-v32/arch/Kbuild | 2 - .../include/uapi/arch-v32/arch/cryptocop.h | 122 --- trunk/arch/cris/include/uapi/asm/Kbuild | 34 - trunk/arch/cris/include/uapi/asm/ptrace.h | 1 - trunk/arch/cris/include/uapi/asm/swab.h | 3 - trunk/arch/cris/kernel/asm-offsets.c | 6 +- trunk/arch/cris/kernel/module.c | 2 + trunk/arch/h8300/include/asm/Kbuild | 1 - trunk/arch/h8300/include/asm/param.h | 15 +- trunk/arch/h8300/include/asm/ptrace.h | 40 +- trunk/arch/h8300/include/asm/signal.h | 121 +-- trunk/arch/h8300/include/asm/termios.h | 44 +- trunk/arch/h8300/include/asm/types.h | 5 +- trunk/arch/h8300/include/asm/unistd.h | 328 +------ trunk/arch/h8300/include/uapi/asm/Kbuild | 31 + .../h8300/include/{ => uapi}/asm/auxvec.h | 0 .../include/{ => uapi}/asm/bitsperlong.h | 0 .../h8300/include/{ => uapi}/asm/byteorder.h | 0 .../arch/h8300/include/{ => uapi}/asm/errno.h | 0 .../arch/h8300/include/{ => uapi}/asm/fcntl.h | 0 .../arch/h8300/include/{ => uapi}/asm/ioctl.h | 0 .../h8300/include/{ => uapi}/asm/ioctls.h | 0 .../h8300/include/{ => uapi}/asm/ipcbuf.h | 0 .../h8300/include/{ => uapi}/asm/kvm_para.h | 0 .../arch/h8300/include/{ => uapi}/asm/mman.h | 0 .../h8300/include/{ => uapi}/asm/msgbuf.h | 0 trunk/arch/h8300/include/uapi/asm/param.h | 16 + .../arch/h8300/include/{ => uapi}/asm/poll.h | 0 .../include/{ => uapi}/asm/posix_types.h | 0 trunk/arch/h8300/include/uapi/asm/ptrace.h | 44 + .../h8300/include/{ => uapi}/asm/resource.h | 0 .../h8300/include/{ => uapi}/asm/sembuf.h | 0 .../arch/h8300/include/{ => uapi}/asm/setup.h | 0 .../h8300/include/{ => uapi}/asm/shmbuf.h | 0 .../h8300/include/{ => uapi}/asm/sigcontext.h | 0 .../h8300/include/{ => uapi}/asm/siginfo.h | 0 .../{cris => h8300}/include/uapi/asm/signal.h | 27 +- .../h8300/include/{ => uapi}/asm/socket.h | 0 .../h8300/include/{ => uapi}/asm/sockios.h | 0 .../arch/h8300/include/{ => uapi}/asm/stat.h | 0 .../h8300/include/{ => uapi}/asm/statfs.h | 0 .../arch/h8300/include/{ => uapi}/asm/swab.h | 0 .../h8300/include/{ => uapi}/asm/termbits.h | 0 .../include/uapi/asm/termios.h | 11 +- .../{cris => h8300}/include/uapi/asm/types.h | 0 .../{cris => h8300}/include/uapi/asm/unistd.h | 40 +- trunk/arch/parisc/kernel/module.c | 2 + trunk/arch/powerpc/include/asm/systbl.h | 1 - trunk/arch/powerpc/include/asm/unistd.h | 2 +- trunk/arch/powerpc/include/uapi/asm/unistd.h | 1 - trunk/arch/sparc/crypto/aes_asm.S | 20 +- trunk/arch/sparc/crypto/aes_glue.c | 31 +- trunk/arch/sparc/crypto/camellia_glue.c | 3 - trunk/arch/sparc/crypto/des_asm.S | 1 - trunk/arch/sparc/crypto/des_glue.c | 6 - trunk/arch/sparc/include/asm/hugetlb.h | 10 +- trunk/arch/sparc/include/asm/pgtable_64.h | 8 +- trunk/arch/sparc/kernel/module.c | 4 + trunk/arch/tile/kernel/module.c | 2 + trunk/arch/unicore32/kernel/module.c | 3 + trunk/arch/x86/kernel/cpu/proc.c | 7 +- trunk/arch/x86/kernel/irqinit.c | 40 + trunk/arch/x86/kernel/traps.c | 6 + trunk/arch/x86/syscalls/syscall_32.tbl | 1 - trunk/arch/x86/syscalls/syscall_64.tbl | 1 - trunk/arch/xtensa/Kconfig | 21 - trunk/arch/xtensa/Kconfig.debug | 22 +- trunk/arch/xtensa/Makefile | 20 +- trunk/arch/xtensa/boot/Makefile | 25 +- trunk/arch/xtensa/boot/boot-elf/Makefile | 26 +- trunk/arch/xtensa/boot/boot-redboot/Makefile | 26 +- trunk/arch/xtensa/boot/boot-uboot/Makefile | 14 - trunk/arch/xtensa/boot/dts/lx60.dts | 11 - trunk/arch/xtensa/boot/dts/ml605.dts | 11 - .../xtensa/boot/dts/xtfpga-flash-16m.dtsi | 26 - .../arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 18 - trunk/arch/xtensa/boot/dts/xtfpga.dtsi | 56 -- trunk/arch/xtensa/include/asm/atomic.h | 271 ++---- trunk/arch/xtensa/include/asm/barrier.h | 6 +- trunk/arch/xtensa/include/asm/bitops.h | 127 +-- trunk/arch/xtensa/include/asm/bootparam.h | 20 +- trunk/arch/xtensa/include/asm/cacheasm.h | 1 + trunk/arch/xtensa/include/asm/cacheflush.h | 3 +- trunk/arch/xtensa/include/asm/checksum.h | 19 +- trunk/arch/xtensa/include/asm/cmpxchg.h | 74 +- trunk/arch/xtensa/include/asm/current.h | 2 +- trunk/arch/xtensa/include/asm/delay.h | 7 +- trunk/arch/xtensa/include/asm/dma-mapping.h | 6 +- trunk/arch/xtensa/include/asm/elf.h | 10 +- trunk/arch/xtensa/include/asm/highmem.h | 1 + .../arch/xtensa/include/asm/initialize_mmu.h | 55 -- trunk/arch/xtensa/include/asm/mmu_context.h | 2 +- trunk/arch/xtensa/include/asm/nommu_context.h | 2 +- trunk/arch/xtensa/include/asm/page.h | 20 +- trunk/arch/xtensa/include/asm/pci-bridge.h | 2 +- trunk/arch/xtensa/include/asm/pci.h | 2 +- trunk/arch/xtensa/include/asm/pgalloc.h | 2 +- trunk/arch/xtensa/include/asm/pgtable.h | 8 +- trunk/arch/xtensa/include/asm/platform.h | 1 + trunk/arch/xtensa/include/asm/processor.h | 10 +- trunk/arch/xtensa/include/asm/prom.h | 6 - trunk/arch/xtensa/include/asm/ptrace.h | 4 +- trunk/arch/xtensa/include/asm/regs.h | 5 +- trunk/arch/xtensa/include/asm/spinlock.h | 188 +--- trunk/arch/xtensa/include/asm/syscall.h | 11 +- trunk/arch/xtensa/include/asm/traps.h | 23 - trunk/arch/xtensa/include/asm/uaccess.h | 43 +- trunk/arch/xtensa/kernel/Makefile | 8 +- trunk/arch/xtensa/kernel/align.S | 4 +- trunk/arch/xtensa/kernel/asm-offsets.c | 5 +- trunk/arch/xtensa/kernel/coprocessor.S | 25 +- trunk/arch/xtensa/kernel/entry.S | 67 +- trunk/arch/xtensa/kernel/head.S | 21 +- trunk/arch/xtensa/kernel/irq.c | 132 +-- trunk/arch/xtensa/kernel/module.c | 2 +- trunk/arch/xtensa/kernel/platform.c | 1 + trunk/arch/xtensa/kernel/process.c | 2 +- trunk/arch/xtensa/kernel/ptrace.c | 3 +- trunk/arch/xtensa/kernel/setup.c | 279 +----- trunk/arch/xtensa/kernel/signal.c | 8 +- trunk/arch/xtensa/kernel/syscall.c | 1 + trunk/arch/xtensa/kernel/time.c | 7 +- trunk/arch/xtensa/kernel/traps.c | 18 +- trunk/arch/xtensa/kernel/vectors.S | 67 +- trunk/arch/xtensa/lib/checksum.S | 15 +- trunk/arch/xtensa/lib/memcopy.S | 6 +- trunk/arch/xtensa/lib/pci-auto.c | 9 +- trunk/arch/xtensa/lib/strncpy_user.S | 4 +- trunk/arch/xtensa/lib/strnlen_user.S | 1 + trunk/arch/xtensa/lib/usercopy.S | 1 + trunk/arch/xtensa/mm/cache.c | 27 +- trunk/arch/xtensa/mm/fault.c | 1 + trunk/arch/xtensa/mm/init.c | 16 +- trunk/arch/xtensa/mm/misc.S | 51 +- trunk/arch/xtensa/mm/mmu.c | 2 +- trunk/arch/xtensa/mm/tlb.c | 9 +- .../platforms/iss/include/platform/serial.h | 15 - .../platforms/iss/include/platform/simcall.h | 7 +- trunk/arch/xtensa/platforms/xtfpga/Makefile | 9 - .../xtfpga/include/platform/hardware.h | 69 -- .../platforms/xtfpga/include/platform/lcd.h | 20 - .../xtfpga/include/platform/serial.h | 18 - trunk/arch/xtensa/platforms/xtfpga/lcd.c | 76 -- trunk/arch/xtensa/platforms/xtfpga/setup.c | 301 ------ trunk/arch/xtensa/variants/s6000/gpio.c | 4 +- trunk/drivers/amba/tegra-ahb.c | 2 - trunk/drivers/atm/solos-pci.c | 186 +--- trunk/drivers/base/dma-buf.c | 2 - trunk/drivers/bcma/driver_chipcommon_pmu.c | 3 +- trunk/drivers/char/random.c | 40 +- trunk/drivers/clk/clk-nomadik.c | 1 - trunk/drivers/gpio/Kconfig | 1 - trunk/drivers/gpio/gpio-ich.c | 1 - trunk/drivers/gpio/gpio-mvebu.c | 17 + trunk/drivers/gpu/drm/ttm/ttm_bo.c | 2 +- trunk/drivers/hwmon/hwmon-vid.c | 10 - trunk/drivers/hwmon/hwmon.c | 26 +- trunk/drivers/hwmon/it87.c | 918 +++++++++--------- trunk/drivers/hwmon/w83627ehf.c | 99 +- trunk/drivers/hwmon/w83627hf.c | 81 +- trunk/drivers/input/serio/i8042-x86ia64io.h | 9 - trunk/drivers/isdn/mISDN/dsp_core.c | 3 +- trunk/drivers/mfd/omap-usb-host.c | 3 +- trunk/drivers/mtd/ar7part.c | 7 +- trunk/drivers/mtd/bcm63xxpart.c | 32 +- trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 16 +- trunk/drivers/mtd/cmdlinepart.c | 91 +- trunk/drivers/mtd/devices/bcm47xxsflash.c | 4 +- trunk/drivers/mtd/devices/block2mtd.c | 4 +- trunk/drivers/mtd/devices/docg3.c | 2 +- trunk/drivers/mtd/devices/docprobe.c | 2 + trunk/drivers/mtd/devices/m25p80.c | 48 +- trunk/drivers/mtd/devices/mtd_dataflash.c | 14 +- trunk/drivers/mtd/devices/spear_smi.c | 23 +- trunk/drivers/mtd/devices/sst25l.c | 10 +- trunk/drivers/mtd/maps/Kconfig | 7 + trunk/drivers/mtd/maps/Makefile | 1 + trunk/drivers/mtd/maps/amd76xrom.c | 7 +- trunk/drivers/mtd/maps/autcpu12-nvram.c | 6 +- trunk/drivers/mtd/maps/bfin-async-flash.c | 9 +- trunk/drivers/mtd/maps/ck804xrom.c | 6 +- trunk/drivers/mtd/maps/esb2rom.c | 6 +- trunk/drivers/mtd/maps/fortunet.c | 277 ++++++ trunk/drivers/mtd/maps/gpio-addr-flash.c | 12 +- trunk/drivers/mtd/maps/ichxrom.c | 8 +- trunk/drivers/mtd/maps/intel_vr_nor.c | 18 +- trunk/drivers/mtd/maps/lantiq-flash.c | 8 +- trunk/drivers/mtd/maps/latch-addr-flash.c | 4 +- trunk/drivers/mtd/maps/pci.c | 6 +- trunk/drivers/mtd/maps/physmap_of.c | 19 +- trunk/drivers/mtd/maps/pismo.c | 18 +- trunk/drivers/mtd/maps/pxa2xx-flash.c | 6 +- trunk/drivers/mtd/maps/sa1100-flash.c | 6 +- trunk/drivers/mtd/maps/scb2_flash.c | 8 +- trunk/drivers/mtd/maps/sun_uflash.c | 6 +- trunk/drivers/mtd/maps/vmu-flash.c | 10 +- trunk/drivers/mtd/mtd_blkdevs.c | 51 +- trunk/drivers/mtd/mtdoops.c | 15 +- trunk/drivers/mtd/nand/Kconfig | 34 +- trunk/drivers/mtd/nand/Makefile | 4 +- trunk/drivers/mtd/nand/ams-delta.c | 6 +- trunk/drivers/mtd/nand/atmel_nand.c | 28 +- trunk/drivers/mtd/nand/au1550nd.c | 8 +- trunk/drivers/mtd/nand/bcm47xxnflash/Makefile | 4 - .../mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 22 - trunk/drivers/mtd/nand/bcm47xxnflash/main.c | 108 --- .../mtd/nand/bcm47xxnflash/ops_bcm4706.c | 413 -------- trunk/drivers/mtd/nand/bf5xx_nand.c | 8 +- trunk/drivers/mtd/nand/cafe_nand.c | 12 +- trunk/drivers/mtd/nand/cs553x_nand.c | 3 +- trunk/drivers/mtd/nand/davinci_nand.c | 13 +- trunk/drivers/mtd/nand/denali.c | 162 +++- trunk/drivers/mtd/nand/denali.h | 5 - trunk/drivers/mtd/nand/denali_dt.c | 167 ---- trunk/drivers/mtd/nand/denali_pci.c | 144 --- trunk/drivers/mtd/nand/diskonchip.c | 2 + trunk/drivers/mtd/nand/docg4.c | 73 +- trunk/drivers/mtd/nand/fsl_elbc_nand.c | 17 +- trunk/drivers/mtd/nand/fsl_ifc_nand.c | 6 +- trunk/drivers/mtd/nand/fsl_upm.c | 8 +- trunk/drivers/mtd/nand/fsmc_nand.c | 106 +- trunk/drivers/mtd/nand/gpio.c | 34 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 10 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 41 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 1 + trunk/drivers/mtd/nand/jz4740_nand.c | 14 +- trunk/drivers/mtd/nand/lpc32xx_mlc.c | 6 +- trunk/drivers/mtd/nand/lpc32xx_slc.c | 6 +- trunk/drivers/mtd/nand/mpc5121_nfc.c | 8 +- trunk/drivers/mtd/nand/mxc_nand.c | 12 +- trunk/drivers/mtd/nand/nand_base.c | 114 +-- trunk/drivers/mtd/nand/nandsim.c | 186 ++-- trunk/drivers/mtd/nand/ndfc.c | 6 +- trunk/drivers/mtd/nand/nomadik_nand.c | 235 +++++ trunk/drivers/mtd/nand/nuc900_nand.c | 6 +- trunk/drivers/mtd/nand/omap2.c | 2 +- trunk/drivers/mtd/nand/orion_nand.c | 4 +- trunk/drivers/mtd/nand/pasemi_nand.c | 4 +- trunk/drivers/mtd/nand/plat_nand.c | 6 +- trunk/drivers/mtd/nand/s3c2410.c | 7 +- trunk/drivers/mtd/nand/sh_flctl.c | 306 +----- trunk/drivers/mtd/nand/sharpsl.c | 6 +- trunk/drivers/mtd/nand/socrates_nand.c | 6 +- trunk/drivers/mtd/ofpart.c | 5 +- trunk/drivers/mtd/onenand/generic.c | 6 +- trunk/drivers/mtd/onenand/omap2.c | 6 +- trunk/drivers/mtd/onenand/samsung.c | 4 +- trunk/drivers/mtd/tests/mtd_nandbiterrs.c | 73 +- trunk/drivers/mtd/tests/mtd_nandecctest.c | 6 +- trunk/drivers/mtd/tests/mtd_oobtest.c | 171 ++-- trunk/drivers/mtd/tests/mtd_pagetest.c | 152 +-- trunk/drivers/mtd/tests/mtd_readtest.c | 44 +- trunk/drivers/mtd/tests/mtd_speedtest.c | 88 +- trunk/drivers/mtd/tests/mtd_stresstest.c | 44 +- trunk/drivers/mtd/tests/mtd_subpagetest.c | 124 +-- trunk/drivers/mtd/tests/mtd_torturetest.c | 73 +- trunk/drivers/net/bonding/bond_main.c | 2 + .../net/can/sja1000/sja1000_of_platform.c | 2 +- trunk/drivers/net/ethernet/emulex/benet/be.h | 2 +- .../net/ethernet/emulex/benet/be_cmds.c | 5 - .../net/ethernet/emulex/benet/be_main.c | 59 +- trunk/drivers/net/ethernet/freescale/Kconfig | 3 +- trunk/drivers/net/ethernet/micrel/ksz884x.c | 12 +- .../net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 5 + .../ethernet/qlogic/qlcnic/qlcnic_minidump.c | 3 +- trunk/drivers/net/ethernet/realtek/8139cp.c | 18 +- trunk/drivers/net/ethernet/smsc/smc91x.c | 4 +- trunk/drivers/net/ethernet/smsc/smsc911x.c | 4 +- .../net/ethernet/stmicro/stmmac/stmmac.h | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +- trunk/drivers/net/ethernet/ti/cpts.c | 2 + trunk/drivers/net/tun.c | 87 +- trunk/drivers/net/usb/cdc_ether.c | 45 +- trunk/drivers/net/usb/cdc_ncm.c | 10 +- trunk/drivers/net/usb/qmi_wwan.c | 15 - trunk/drivers/net/usb/usbnet.c | 25 +- trunk/drivers/net/wimax/i2400m/i2400m-usb.h | 3 - trunk/drivers/net/wimax/i2400m/usb.c | 6 - trunk/drivers/net/wireless/Makefile | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 8 - trunk/drivers/of/base.c | 2 +- trunk/drivers/power/charger-manager.c | 38 +- trunk/drivers/pwm/Kconfig | 39 +- trunk/drivers/pwm/Makefile | 5 +- trunk/drivers/pwm/core.c | 29 - trunk/drivers/pwm/pwm-imx.c | 2 +- trunk/drivers/pwm/pwm-lpc32xx.c | 23 +- trunk/drivers/pwm/pwm-samsung.c | 1 - trunk/drivers/pwm/pwm-spear.c | 276 ------ trunk/drivers/pwm/pwm-tiecap.c | 48 +- trunk/drivers/pwm/pwm-tiehrpwm.c | 62 +- trunk/drivers/pwm/pwm-tipwmss.c | 139 --- trunk/drivers/pwm/pwm-tipwmss.h | 39 - trunk/drivers/pwm/pwm-twl-led.c | 344 ------- trunk/drivers/pwm/pwm-twl.c | 359 ------- trunk/drivers/pwm/pwm-twl6030.c | 184 ++++ trunk/drivers/pwm/pwm-vt8500.c | 98 +- trunk/drivers/spi/spi-atmel.c | 17 +- trunk/drivers/spi/spi-s3c64xx.c | 10 +- trunk/drivers/spi/spi-sh-hspi.c | 2 +- trunk/drivers/spi/spi.c | 5 +- trunk/drivers/tty/serial/omap-serial.c | 3 +- trunk/fs/jffs2/nodemgmt.c | 6 +- trunk/include/linux/asn1.h | 2 - trunk/include/linux/bcma/bcma.h | 1 - trunk/include/linux/blkdev.h | 19 +- trunk/include/linux/compiler-gcc4.h | 12 - trunk/include/linux/compiler-intel.h | 7 - trunk/include/linux/compiler.h | 9 - trunk/include/linux/dma-buf.h | 99 ++ trunk/include/linux/ima.h | 6 - trunk/include/linux/moduleparam.h | 6 +- trunk/include/linux/mtd/blktrans.h | 4 +- trunk/include/linux/mtd/doc2000.h | 22 +- trunk/include/linux/mtd/fsmc.h | 3 + trunk/include/linux/mtd/gpmi-nand.h | 68 ++ trunk/include/linux/mtd/map.h | 4 +- trunk/include/linux/mtd/mtd.h | 2 +- trunk/include/linux/mtd/nand.h | 11 +- trunk/include/linux/mtd/sh_flctl.h | 14 +- trunk/include/linux/of_platform.h | 1 - .../linux/platform_data/mtd-nomadik-nand.h | 16 + trunk/include/linux/platform_data/usb-omap.h | 3 - trunk/include/linux/pwm.h | 3 - trunk/include/linux/security.h | 13 - trunk/include/linux/syscalls.h | 1 - trunk/include/linux/usb/usbnet.h | 3 - trunk/include/net/inet_connection_sock.h | 1 - trunk/include/net/ndisc.h | 7 - trunk/include/uapi/asm-generic/unistd.h | 4 +- trunk/include/uapi/linux/if_bridge.h | 3 - trunk/include/uapi/linux/module.h | 8 - trunk/include/uapi/linux/swab.h | 12 +- trunk/include/video/omap-panel-tfp410.h | 2 +- trunk/kernel/Makefile | 10 +- trunk/kernel/modsign_certificate.S | 19 - trunk/kernel/modsign_pubkey.c | 6 + trunk/kernel/module.c | 441 ++++----- trunk/kernel/posix-cpu-timers.c | 3 - trunk/kernel/sched/fair.c | 5 +- trunk/kernel/sys_ni.c | 1 - trunk/kernel/watchdog.c | 11 +- trunk/lib/asn1_decoder.c | 8 +- trunk/mm/ksm.c | 16 +- trunk/mm/vmscan.c | 12 +- trunk/net/atm/atm_sysfs.c | 40 +- trunk/net/bridge/br_mdb.c | 22 +- trunk/net/bridge/br_multicast.c | 13 +- trunk/net/bridge/br_netlink.c | 1 + trunk/net/bridge/br_private.h | 5 +- trunk/net/dccp/ipv4.c | 4 +- trunk/net/dccp/ipv6.c | 3 +- trunk/net/ipv4/inet_connection_sock.c | 16 - trunk/net/ipv4/tcp_ipv4.c | 6 +- trunk/net/ipv6/Makefile | 2 +- trunk/net/ipv6/addrconf.c | 3 +- trunk/net/ipv6/ndisc.c | 17 - trunk/net/ipv6/tcp_ipv6.c | 3 +- trunk/net/mac802154/ieee802154_dev.c | 4 +- trunk/net/netlink/af_netlink.c | 5 +- trunk/net/sctp/Kconfig | 27 +- trunk/net/sctp/probe.c | 3 +- trunk/net/sctp/protocol.c | 4 +- trunk/scripts/Makefile.modsign | 32 - trunk/security/capability.c | 6 - trunk/security/integrity/ima/ima.h | 2 +- trunk/security/integrity/ima/ima_api.c | 4 +- trunk/security/integrity/ima/ima_main.c | 21 - trunk/security/integrity/ima/ima_policy.c | 3 - trunk/security/security.c | 10 - trunk/security/selinux/nlmsgtab.c | 2 - 496 files changed, 4681 insertions(+), 9297 deletions(-) delete mode 100644 trunk/Documentation/devicetree/bindings/mtd/denali-nand.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mtd/flctl-nand.txt delete mode 100644 trunk/Documentation/devicetree/bindings/mtd/m25p80.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/spear-pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwmled.txt delete mode 100644 trunk/Documentation/devicetree/bindings/pwm/vt8500-pwm.txt delete mode 100644 trunk/Documentation/devicetree/bindings/spi/spi_atmel.txt delete mode 100644 trunk/Documentation/xtensa/atomctl.txt create mode 100644 trunk/arch/arm/mach-nomadik/include/mach/fsmc.h rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mx2-emma.c (94%) create mode 100644 trunk/arch/arm/plat-omap/debug-devices.c create mode 100644 trunk/arch/arm/plat-omap/include/plat/debug-devices.h rename trunk/{include/linux/platform_data/serial-omap.h => arch/arm/plat-omap/include/plat/omap-serial.h} (100%) rename trunk/arch/cris/include/{uapi => }/arch-v10/arch/sv_addr.agh (100%) rename trunk/arch/cris/include/{uapi => }/arch-v10/arch/sv_addr_ag.h (100%) rename trunk/arch/cris/include/{uapi => }/arch-v10/arch/svinto.h (100%) rename trunk/arch/cris/include/{uapi => }/arch-v10/arch/user.h (100%) rename trunk/arch/cris/include/{uapi => }/arch-v32/arch/user.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/auxvec.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/bitsperlong.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/byteorder.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/errno.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/ethernet.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/etraxgpio.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/fcntl.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/ioctl.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/ioctls.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/ipcbuf.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/mman.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/msgbuf.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/param.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/poll.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/posix_types.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/resource.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/rs485.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/sembuf.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/setup.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/shmbuf.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/sigcontext.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/siginfo.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/socket.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/sockios.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/stat.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/statfs.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/sync_serial.h (100%) rename trunk/arch/cris/include/{uapi => }/asm/termbits.h (100%) delete mode 100644 trunk/arch/cris/include/uapi/arch-v32/arch/cryptocop.h delete mode 100644 trunk/arch/cris/include/uapi/asm/ptrace.h delete mode 100644 trunk/arch/cris/include/uapi/asm/swab.h rename trunk/arch/h8300/include/{ => uapi}/asm/auxvec.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/bitsperlong.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/byteorder.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/errno.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/fcntl.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/ioctl.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/ioctls.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/ipcbuf.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/kvm_para.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/mman.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/msgbuf.h (100%) create mode 100644 trunk/arch/h8300/include/uapi/asm/param.h rename trunk/arch/h8300/include/{ => uapi}/asm/poll.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 trunk/arch/h8300/include/uapi/asm/ptrace.h rename trunk/arch/h8300/include/{ => uapi}/asm/resource.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/sembuf.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/setup.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/shmbuf.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/sigcontext.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/siginfo.h (100%) rename trunk/arch/{cris => h8300}/include/uapi/asm/signal.h (84%) rename trunk/arch/h8300/include/{ => uapi}/asm/socket.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/sockios.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/stat.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/statfs.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/swab.h (100%) rename trunk/arch/h8300/include/{ => uapi}/asm/termbits.h (100%) rename trunk/arch/{cris => h8300}/include/uapi/asm/termios.h (86%) rename trunk/arch/{cris => h8300}/include/uapi/asm/types.h (100%) rename trunk/arch/{cris => h8300}/include/uapi/asm/unistd.h (91%) delete mode 100644 trunk/arch/xtensa/boot/boot-uboot/Makefile delete mode 100644 trunk/arch/xtensa/boot/dts/lx60.dts delete mode 100644 trunk/arch/xtensa/boot/dts/ml605.dts delete mode 100644 trunk/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi delete mode 100644 trunk/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi delete mode 100644 trunk/arch/xtensa/boot/dts/xtfpga.dtsi delete mode 100644 trunk/arch/xtensa/include/asm/initialize_mmu.h delete mode 100644 trunk/arch/xtensa/include/asm/prom.h delete mode 100644 trunk/arch/xtensa/include/asm/traps.h delete mode 100644 trunk/arch/xtensa/platforms/xtfpga/Makefile delete mode 100644 trunk/arch/xtensa/platforms/xtfpga/include/platform/hardware.h delete mode 100644 trunk/arch/xtensa/platforms/xtfpga/include/platform/lcd.h delete mode 100644 trunk/arch/xtensa/platforms/xtfpga/include/platform/serial.h delete mode 100644 trunk/arch/xtensa/platforms/xtfpga/lcd.c delete mode 100644 trunk/arch/xtensa/platforms/xtfpga/setup.c create mode 100644 trunk/drivers/mtd/maps/fortunet.c delete mode 100644 trunk/drivers/mtd/nand/bcm47xxnflash/Makefile delete mode 100644 trunk/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h delete mode 100644 trunk/drivers/mtd/nand/bcm47xxnflash/main.c delete mode 100644 trunk/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c delete mode 100644 trunk/drivers/mtd/nand/denali_dt.c delete mode 100644 trunk/drivers/mtd/nand/denali_pci.c create mode 100644 trunk/drivers/mtd/nand/nomadik_nand.c delete mode 100644 trunk/drivers/pwm/pwm-spear.c delete mode 100644 trunk/drivers/pwm/pwm-tipwmss.c delete mode 100644 trunk/drivers/pwm/pwm-tipwmss.h delete mode 100644 trunk/drivers/pwm/pwm-twl-led.c delete mode 100644 trunk/drivers/pwm/pwm-twl.c create mode 100644 trunk/drivers/pwm/pwm-twl6030.c create mode 100644 trunk/include/linux/mtd/gpmi-nand.h create mode 100644 trunk/include/linux/platform_data/mtd-nomadik-nand.h delete mode 100644 trunk/include/uapi/linux/module.h delete mode 100644 trunk/kernel/modsign_certificate.S delete mode 100644 trunk/scripts/Makefile.modsign diff --git a/[refs] b/[refs] index 3caa331707f4..7b856ca6c76a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c5445015c8e37d4f79c16fa51be398c4cb0e46c +refs/heads/master: 1ec94e75def550548725a0bd77312ed6c266687a diff --git a/trunk/Documentation/ABI/testing/ima_policy b/trunk/Documentation/ABI/testing/ima_policy index ec0a38ef3145..986946613542 100644 --- a/trunk/Documentation/ABI/testing/ima_policy +++ b/trunk/Documentation/ABI/testing/ima_policy @@ -23,7 +23,7 @@ Description: lsm: [[subj_user=] [subj_role=] [subj_type=] [obj_user=] [obj_role=] [obj_type=]] - base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK][MODULE_CHECK] + base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK] mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC] fsmagic:= hex value uid:= decimal value @@ -53,7 +53,6 @@ Description: measure func=BPRM_CHECK measure func=FILE_MMAP mask=MAY_EXEC measure func=FILE_CHECK mask=MAY_READ uid=0 - measure func=MODULE_CHECK uid=0 appraise fowner=0 The default policy measures all executables in bprm_check, diff --git a/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt b/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt index 3545ea704b50..49fc7ada929a 100644 --- a/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt +++ b/trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt @@ -23,9 +23,6 @@ Recommended properties : - ti,davinci-nand-buswidth: buswidth 8 or 16 - ti,davinci-nand-use-bbt: use flash based bad block table support. -nand device bindings may contain additional sub-nodes describing -partitions of the address space. See partition.txt for more detail. - Example(da850 EVM ): nand_cs3@62000000 { compatible = "ti,davinci-nand"; @@ -38,9 +35,4 @@ nand_cs3@62000000 { ti,davinci-ecc-mode = "hw"; ti,davinci-ecc-bits = <4>; ti,davinci-nand-use-bbt; - - partition@180000 { - label = "ubifs"; - reg = <0x180000 0x7e80000>; - }; }; diff --git a/trunk/Documentation/devicetree/bindings/mtd/denali-nand.txt b/trunk/Documentation/devicetree/bindings/mtd/denali-nand.txt deleted file mode 100644 index b04d03a1d499..000000000000 --- a/trunk/Documentation/devicetree/bindings/mtd/denali-nand.txt +++ /dev/null @@ -1,23 +0,0 @@ -* Denali NAND controller - -Required properties: - - compatible : should be "denali,denali-nand-dt" - - reg : should contain registers location and length for data and reg. - - reg-names: Should contain the reg names "nand_data" and "denali_reg" - - interrupts : The interrupt number. - - dm-mask : DMA bit mask - -The device tree may optionally contain sub-nodes describing partitions of the -address space. See partition.txt for more detail. - -Examples: - -nand: nand@ff900000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "denali,denali-nand-dt"; - reg = <0xff900000 0x100000>, <0xffb80000 0x10000>; - reg-names = "nand_data", "denali_reg"; - interrupts = <0 144 4>; - dma-mask = <0xffffffff>; -}; diff --git a/trunk/Documentation/devicetree/bindings/mtd/flctl-nand.txt b/trunk/Documentation/devicetree/bindings/mtd/flctl-nand.txt deleted file mode 100644 index 427f46dc60ad..000000000000 --- a/trunk/Documentation/devicetree/bindings/mtd/flctl-nand.txt +++ /dev/null @@ -1,49 +0,0 @@ -FLCTL NAND controller - -Required properties: -- compatible : "renesas,shmobile-flctl-sh7372" -- reg : Address range of the FLCTL -- interrupts : flste IRQ number -- nand-bus-width : bus width to NAND chip - -Optional properties: -- dmas: DMA specifier(s) -- dma-names: name for each DMA specifier. Valid names are - "data_tx", "data_rx", "ecc_tx", "ecc_rx" - -The DMA fields are not used yet in the driver but are listed here for -completing the bindings. - -The device tree may optionally contain sub-nodes describing partitions of the -address space. See partition.txt for more detail. - -Example: - - flctl@e6a30000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "renesas,shmobile-flctl-sh7372"; - reg = <0xe6a30000 0x100>; - interrupts = <0x0d80>; - - nand-bus-width = <16>; - - dmas = <&dmac 1 /* data_tx */ - &dmac 2;> /* data_rx */ - dma-names = "data_tx", "data_rx"; - - system@0 { - label = "system"; - reg = <0x0 0x8000000>; - }; - - userdata@8000000 { - label = "userdata"; - reg = <0x8000000 0x10000000>; - }; - - cache@18000000 { - label = "cache"; - reg = <0x18000000 0x8000000>; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/mtd/fsmc-nand.txt b/trunk/Documentation/devicetree/bindings/mtd/fsmc-nand.txt index e3ea32e7de3e..e2c663b354d2 100644 --- a/trunk/Documentation/devicetree/bindings/mtd/fsmc-nand.txt +++ b/trunk/Documentation/devicetree/bindings/mtd/fsmc-nand.txt @@ -3,7 +3,9 @@ Required properties: - compatible : "st,spear600-fsmc-nand" - reg : Address range of the mtd chip -- reg-names: Should contain the reg names "fsmc_regs", "nand_data", "nand_addr" and "nand_cmd" +- reg-names: Should contain the reg names "fsmc_regs" and "nand_data" +- st,ale-off : Chip specific offset to ALE +- st,cle-off : Chip specific offset to CLE Optional properties: - bank-width : Width (in bytes) of the device. If not present, the width @@ -17,10 +19,10 @@ Example: #address-cells = <1>; #size-cells = <1>; reg = <0xd1800000 0x1000 /* FSMC Register */ - 0xd2000000 0x0010 /* NAND Base DATA */ - 0xd2020000 0x0010 /* NAND Base ADDR */ - 0xd2010000 0x0010>; /* NAND Base CMD */ - reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + 0xd2000000 0x4000>; /* NAND Base */ + reg-names = "fsmc_regs", "nand_data"; + st,ale-off = <0x20000>; + st,cle-off = <0x10000>; bank-width = <1>; nand-skip-bbtscan; diff --git a/trunk/Documentation/devicetree/bindings/mtd/m25p80.txt b/trunk/Documentation/devicetree/bindings/mtd/m25p80.txt deleted file mode 100644 index 6d3d57609470..000000000000 --- a/trunk/Documentation/devicetree/bindings/mtd/m25p80.txt +++ /dev/null @@ -1,29 +0,0 @@ -* MTD SPI driver for ST M25Pxx (and similar) serial flash chips - -Required properties: -- #address-cells, #size-cells : Must be present if the device has sub-nodes - representing partitions. -- compatible : Should be the manufacturer and the name of the chip. Bear in mind - the DT binding is not Linux-only, but in case of Linux, see the - "m25p_ids" table in drivers/mtd/devices/m25p80.c for the list of - supported chips. -- reg : Chip-Select number -- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at - -Optional properties: -- m25p,fast-read : Use the "fast read" opcode to read data from the chip instead - of the usual "read" opcode. This opcode is not supported by - all chips and support for it can not be detected at runtime. - Refer to your chips' datasheet to check if this is supported - by your chip. - -Example: - - flash: m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "spansion,m25p80"; - reg = <0>; - spi-max-frequency = <40000000>; - m25p,fast-read; - }; diff --git a/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt b/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt index dab7847fc800..94de19b8f16b 100644 --- a/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt +++ b/trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt @@ -23,9 +23,6 @@ file systems on embedded devices. unaligned accesses as implemented in the JFFS2 code via memcpy(). By defining "no-unaligned-direct-access", the flash will not be exposed directly to the MTD users (e.g. JFFS2) any more. - - linux,mtd-name: allow to specify the mtd name for retro capability with - physmap-flash drivers as boot loader pass the mtd partition via the old - device name physmap-flash. For JEDEC compatible devices, the following additional properties are defined: diff --git a/trunk/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt b/trunk/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt deleted file mode 100644 index 131e8c11d26f..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/pwm-tiecap.txt +++ /dev/null @@ -1,23 +0,0 @@ -TI SOC ECAP based APWM controller - -Required properties: -- compatible: Must be "ti,am33xx-ecap" -- #pwm-cells: Should be 3. Number of cells being used to specify PWM property. - First cell specifies the per-chip index of the PWM to use, the second - cell is the period in nanoseconds and bit 0 in the third cell is used to - encode the polarity of PWM output. Set bit 0 of the third in PWM specifier - to 1 for inverse polarity & set to 0 for normal polarity. -- reg: physical base address and size of the registers map. - -Optional properties: -- ti,hwmods: Name of the hwmod associated to the ECAP: - "ecap", being the 0-based instance number from the HW spec - -Example: - -ecap0: ecap@0 { - compatible = "ti,am33xx-ecap"; - #pwm-cells = <3>; - reg = <0x48300100 0x80>; - ti,hwmods = "ecap0"; -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt b/trunk/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt deleted file mode 100644 index 4fc7079d822e..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +++ /dev/null @@ -1,23 +0,0 @@ -TI SOC EHRPWM based PWM controller - -Required properties: -- compatible : Must be "ti,am33xx-ehrpwm" -- #pwm-cells: Should be 3. Number of cells being used to specify PWM property. - First cell specifies the per-chip index of the PWM to use, the second - cell is the period in nanoseconds and bit 0 in the third cell is used to - encode the polarity of PWM output. Set bit 0 of the third in PWM specifier - to 1 for inverse polarity & set to 0 for normal polarity. -- reg: physical base address and size of the registers map. - -Optional properties: -- ti,hwmods: Name of the hwmod associated to the EHRPWM: - "ehrpwm", being the 0-based instance number from the HW spec - -Example: - -ehrpwm0: ehrpwm@0 { - compatible = "ti,am33xx-ehrpwm"; - #pwm-cells = <3>; - reg = <0x48300200 0x100>; - ti,hwmods = "ehrpwm0"; -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt b/trunk/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt deleted file mode 100644 index f7eae77f8354..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt +++ /dev/null @@ -1,31 +0,0 @@ -TI SOC based PWM Subsystem - -Required properties: -- compatible: Must be "ti,am33xx-pwmss"; -- reg: physical base address and size of the registers map. -- address-cells: Specify the number of u32 entries needed in child nodes. - Should set to 1. -- size-cells: specify number of u32 entries needed to specify child nodes size - in reg property. Should set to 1. -- ranges: describes the address mapping of a memory-mapped bus. Should set to - physical address map of child's base address, physical address within - parent's address space and length of the address map. For am33xx, - 3 set of child register maps present, ECAP register space, EQEP - register space, EHRPWM register space. - -Also child nodes should also populated under PWMSS DT node. - -Example: -pwmss0: pwmss@48300000 { - compatible = "ti,am33xx-pwmss"; - reg = <0x48300000 0x10>; - ti,hwmods = "epwmss0"; - #address-cells = <1>; - #size-cells = <1>; - status = "disabled"; - ranges = <0x48300100 0x48300100 0x80 /* ECAP */ - 0x48300180 0x48300180 0x80 /* EQEP */ - 0x48300200 0x48300200 0x80>; /* EHRPWM */ - - /* child nodes go here */ -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/pwm.txt index 06e67247859a..73ec962bfe8c 100644 --- a/trunk/Documentation/devicetree/bindings/pwm/pwm.txt +++ b/trunk/Documentation/devicetree/bindings/pwm/pwm.txt @@ -37,21 +37,10 @@ device: pwm-names = "backlight"; }; -Note that in the example above, specifying the "pwm-names" is redundant -because the name "backlight" would be used as fallback anyway. - pwm-specifier typically encodes the chip-relative PWM number and the PWM -period in nanoseconds. - -Optionally, the pwm-specifier can encode a number of flags in a third cell: -- bit 0: PWM signal polarity (0: normal polarity, 1: inverse polarity) - -Example with optional PWM specifier for inverse polarity - - bl: backlight { - pwms = <&pwm 0 5000000 1>; - pwm-names = "backlight"; - }; +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 ----------------------- diff --git a/trunk/Documentation/devicetree/bindings/pwm/spear-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/spear-pwm.txt deleted file mode 100644 index 3ac779d83386..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/spear-pwm.txt +++ /dev/null @@ -1,18 +0,0 @@ -== ST SPEAr SoC PWM controller == - -Required properties: -- compatible: should be one of: - - "st,spear320-pwm" - - "st,spear1340-pwm" -- reg: physical base address and length of the controller's registers -- #pwm-cells: number of cells used to specify PWM which is fixed to 2 on - SPEAr. The first cell specifies the per-chip index of the PWM to use and - the second cell is the period in nanoseconds. - -Example: - - pwm: pwm@a8000000 { - compatible ="st,spear320-pwm"; - reg = <0xa8000000 0x1000>; - #pwm-cells = <2>; - }; diff --git a/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt deleted file mode 100644 index 2943ee5fce00..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwm.txt +++ /dev/null @@ -1,17 +0,0 @@ -Texas Instruments TWL series PWM drivers - -Supported PWMs: -On TWL4030 series: PWM1 and PWM2 -On TWL6030 series: PWM0 and PWM1 - -Required properties: -- compatible: "ti,twl4030-pwm" or "ti,twl6030-pwm" -- #pwm-cells: should be 2. The first cell specifies the per-chip index - of the PWM to use and the second cell is the period in nanoseconds. - -Example: - -twl_pwm: pwm { - compatible = "ti,twl6030-pwm"; - #pwm-cells = <2>; -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwmled.txt b/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwmled.txt deleted file mode 100644 index cb64f3acc10f..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/ti,twl-pwmled.txt +++ /dev/null @@ -1,17 +0,0 @@ -Texas Instruments TWL series PWM drivers connected to LED terminals - -Supported PWMs: -On TWL4030 series: PWMA and PWMB (connected to LEDA and LEDB terminals) -On TWL6030 series: LED PWM (mainly used as charging indicator LED) - -Required properties: -- compatible: "ti,twl4030-pwmled" or "ti,twl6030-pwmled" -- #pwm-cells: should be 2. The first cell specifies the per-chip index - of the PWM to use and the second cell is the period in nanoseconds. - -Example: - -twl_pwmled: pwmled { - compatible = "ti,twl6030-pwmled"; - #pwm-cells = <2>; -}; diff --git a/trunk/Documentation/devicetree/bindings/pwm/vt8500-pwm.txt b/trunk/Documentation/devicetree/bindings/pwm/vt8500-pwm.txt deleted file mode 100644 index bcc63678a9a5..000000000000 --- a/trunk/Documentation/devicetree/bindings/pwm/vt8500-pwm.txt +++ /dev/null @@ -1,17 +0,0 @@ -VIA/Wondermedia VT8500/WM8xxx series SoC PWM controller - -Required properties: -- compatible: should be "via,vt8500-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 period in nanoseconds. -- clocks: phandle to the PWM source clock - -Example: - -pwm1: pwm@d8220000 { - #pwm-cells = <2>; - compatible = "via,vt8500-pwm"; - reg = <0xd8220000 0x1000>; - clocks = <&clkpwm>; -}; diff --git a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt index 7b53da5cb75b..8cf24f6f0a99 100644 --- a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt +++ b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt @@ -13,7 +13,7 @@ Recommended properties: Example: -spi@7000c380 { +spi@7000d600 { compatible = "nvidia,tegra20-sflash"; reg = <0x7000c380 0x80>; interrupts = <0 39 0x04>; diff --git a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt index eefe15e3d95e..f5b1ad1a1ec3 100644 --- a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt +++ b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt @@ -13,7 +13,7 @@ Recommended properties: Example: -spi@7000d600 { +slink@7000d600 { compatible = "nvidia,tegra20-slink"; reg = <0x7000d600 0x200>; interrupts = <0 82 0x04>; diff --git a/trunk/Documentation/devicetree/bindings/spi/spi_atmel.txt b/trunk/Documentation/devicetree/bindings/spi/spi_atmel.txt deleted file mode 100644 index 07e04cdc0c9e..000000000000 --- a/trunk/Documentation/devicetree/bindings/spi/spi_atmel.txt +++ /dev/null @@ -1,26 +0,0 @@ -Atmel SPI device - -Required properties: -- compatible : should be "atmel,at91rm9200-spi". -- reg: Address and length of the register set for the device -- interrupts: Should contain spi interrupt -- cs-gpios: chipselects - -Example: - -spi1: spi@fffcc000 { - compatible = "atmel,at91rm9200-spi"; - reg = <0xfffcc000 0x4000>; - interrupts = <13 4 5>; - #address-cells = <1>; - #size-cells = <0>; - cs-gpios = <&pioB 3 0>; - status = "okay"; - - mmc-slot@0 { - compatible = "mmc-spi-slot"; - reg = <0>; - gpios = <&pioC 4 0>; /* CD */ - spi-max-frequency = <25000000>; - }; -}; diff --git a/trunk/Documentation/hwmon/it87 b/trunk/Documentation/hwmon/it87 index 8386aadc0a82..87850d86c559 100644 --- a/trunk/Documentation/hwmon/it87 +++ b/trunk/Documentation/hwmon/it87 @@ -209,13 +209,3 @@ doesn't use CPU cycles. Trip points must be set properly before switching to automatic fan speed control mode. The driver will perform basic integrity checks before actually switching to automatic control mode. - - -Temperature offset attributes ------------------------------ - -The driver supports temp[1-3]_offset sysfs attributes to adjust the reported -temperature for thermal diodes or diode-connected thermal transistors. -If a temperature sensor is configured for thermistors, the attribute values -are ignored. If the thermal sensor type is Intel PECI, the temperature offset -must be programmed to the critical CPU temperature. diff --git a/trunk/Documentation/x86/boot.txt b/trunk/Documentation/x86/boot.txt index 406d82d5d2bb..f15cb74c4f78 100644 --- a/trunk/Documentation/x86/boot.txt +++ b/trunk/Documentation/x86/boot.txt @@ -373,7 +373,7 @@ Protocol: 2.00+ 1 Loadlin 2 bootsect-loader (0x20, all other values reserved) 3 Syslinux - 4 Etherboot/gPXE/iPXE + 4 Etherboot/gPXE 5 ELILO 7 GRUB 8 U-Boot @@ -381,7 +381,6 @@ Protocol: 2.00+ A Gujin B Qemu C Arcturus Networks uCbootloader - D kexec-tools E Extended (see ext_loader_type) F Special (0xFF = undefined) 10 Reserved diff --git a/trunk/Documentation/xtensa/atomctl.txt b/trunk/Documentation/xtensa/atomctl.txt deleted file mode 100644 index 10a8d1ff35ec..000000000000 --- a/trunk/Documentation/xtensa/atomctl.txt +++ /dev/null @@ -1,44 +0,0 @@ -We Have Atomic Operation Control (ATOMCTL) Register. -This register determines the effect of using a S32C1I instruction -with various combinations of: - - 1. With and without an Coherent Cache Controller which - can do Atomic Transactions to the memory internally. - - 2. With and without An Intelligent Memory Controller which - can do Atomic Transactions itself. - -The Core comes up with a default value of for the three types of cache ops: - - 0x28: (WB: Internal, WT: Internal, BY:Exception) - -On the FPGA Cards we typically simulate an Intelligent Memory controller -which can implement RCW transactions. For FPGA cards with an External -Memory controller we let it to the atomic operations internally while -doing a Cached (WB) transaction and use the Memory RCW for un-cached -operations. - -For systems without an coherent cache controller, non-MX, we always -use the memory controllers RCW, thought non-MX controlers likely -support the Internal Operation. - -CUSTOMER-WARNING: - Virtually all customers buy their memory controllers from vendors that - don't support atomic RCW memory transactions and will likely want to - configure this register to not use RCW. - -Developers might find using RCW in Bypass mode convenient when testing -with the cache being bypassed; for example studying cache alias problems. - -See Section 4.3.12.4 of ISA; Bits: - - WB WT BY - 5 4 | 3 2 | 1 0 - 2 Bit - Field - Values WB - Write Back WT - Write Thru BY - Bypass ---------- --------------- ----------------- ---------------- - 0 Exception Exception Exception - 1 RCW Transaction RCW Transaction RCW Transaction - 2 Internal Operation Exception Reserved - 3 Reserved Reserved Reserved diff --git a/trunk/Makefile b/trunk/Makefile index 6f07f4a28b47..540f7b240c77 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -981,12 +981,6 @@ _modinst_post: _modinst_ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst $(call cmd,depmod) -ifeq ($(CONFIG_MODULE_SIG), y) -PHONY += modules_sign -modules_sign: - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modsign -endif - else # CONFIG_MODULES # Modules not configured diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 8e9e3246b2b4..54ffd0f9df21 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -113,25 +113,6 @@ config HAVE_EFFICIENT_UNALIGNED_ACCESS See Documentation/unaligned-memory-access.txt for more information on the topic of unaligned memory accesses. -config ARCH_USE_BUILTIN_BSWAP - bool - help - Modern versions of GCC (since 4.4) have builtin functions - for handling byte-swapping. Using these, instead of the old - inline assembler that the architecture code provides in the - __arch_bswapXX() macros, allows the compiler to see what's - happening and offers more opportunity for optimisation. In - particular, the compiler will be able to combine the byteswap - with a nearby load or store and use load-and-swap or - store-and-swap instructions if the architecture has them. It - should almost *never* result in code which is worse than the - hand-coded assembler in . But just in case it - does, the use of the builtins is optional. - - Any architecture with load-and-swap or store-and-swap - instructions should set this. And it shouldn't hurt to set it - on architectures that don't have such instructions. - config HAVE_SYSCALL_WRAPPERS bool diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile index d077ef8426df..0f441740c22a 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -107,7 +107,6 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-evm.dtb \ omap3-tobi.dtb \ omap4-panda.dtb \ - omap4-panda-a4.dtb \ omap4-panda-es.dtb \ omap4-var-som.dtb \ omap4-sdp.dtb \ @@ -132,8 +131,8 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ spear320-evb.dtb \ spear320-hmi.dtb dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb -dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \ - sun5i-a13-olinuxino.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun4i-cubieboard.dtb \ + sun5i-olinuxino.dtb dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ diff --git a/trunk/arch/arm/boot/dts/imx27-3ds.dts b/trunk/arch/arm/boot/dts/imx27-3ds.dts index fa04c7b18bcb..b01c0d745fc5 100644 --- a/trunk/arch/arm/boot/dts/imx27-3ds.dts +++ b/trunk/arch/arm/boot/dts/imx27-3ds.dts @@ -21,17 +21,17 @@ }; soc { - aipi@10000000 { /* aipi1 */ + aipi@10000000 { /* aipi */ + uart1: serial@1000a000 { fsl,uart-has-rtscts; status = "okay"; }; - }; - aipi@10020000 { /* aipi2 */ - ethernet@1002b000 { + fec@1002b000 { status = "okay"; }; }; }; + }; diff --git a/trunk/arch/arm/boot/dts/imx27-phytec-phycore.dts b/trunk/arch/arm/boot/dts/imx27-phytec-phycore.dts index 53b0ec0c228e..af50469e34b2 100644 --- a/trunk/arch/arm/boot/dts/imx27-phytec-phycore.dts +++ b/trunk/arch/arm/boot/dts/imx27-phytec-phycore.dts @@ -21,7 +21,8 @@ }; soc { - aipi@10000000 { /* aipi1 */ + aipi@10000000 { /* aipi */ + serial@1000a000 { fsl,uart-has-rtscts; status = "okay"; @@ -37,6 +38,10 @@ status = "okay"; }; + ethernet@1002b000 { + status = "okay"; + }; + i2c@1001d000 { clock-frequency = <400000>; status = "okay"; @@ -55,12 +60,6 @@ }; }; }; - - aipi@10020000 { /* aipi2 */ - ethernet@1002b000 { - status = "okay"; - }; - }; }; nor_flash@c0000000 { diff --git a/trunk/arch/arm/boot/dts/imx27.dtsi b/trunk/arch/arm/boot/dts/imx27.dtsi index 5a82cb5707a8..b8d3905915ac 100644 --- a/trunk/arch/arm/boot/dts/imx27.dtsi +++ b/trunk/arch/arm/boot/dts/imx27.dtsi @@ -55,7 +55,7 @@ compatible = "fsl,aipi-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; - reg = <0x10000000 0x20000>; + reg = <0x10000000 0x10000000>; ranges; wdog: wdog@10002000 { @@ -211,15 +211,6 @@ status = "disabled"; }; - }; - - aipi@10020000 { /* AIPI2 */ - compatible = "fsl,aipi-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x10020000 0x20000>; - ranges; - fec: ethernet@1002b000 { compatible = "fsl,imx27-fec"; reg = <0x1002b000 0x4000>; diff --git a/trunk/arch/arm/boot/dts/omap2420-h4.dts b/trunk/arch/arm/boot/dts/omap2420-h4.dts index 9b0d07746cba..77b84e17c477 100644 --- a/trunk/arch/arm/boot/dts/omap2420-h4.dts +++ b/trunk/arch/arm/boot/dts/omap2420-h4.dts @@ -15,6 +15,6 @@ memory { device_type = "memory"; - reg = <0x80000000 0x4000000>; /* 64 MB */ + reg = <0x80000000 0x84000000>; /* 64 MB */ }; }; diff --git a/trunk/arch/arm/boot/dts/spear13xx.dtsi b/trunk/arch/arm/boot/dts/spear13xx.dtsi index b4ca60f4eb42..009096d1d2c3 100644 --- a/trunk/arch/arm/boot/dts/spear13xx.dtsi +++ b/trunk/arch/arm/boot/dts/spear13xx.dtsi @@ -73,7 +73,7 @@ 400000 500000 600000 >; - status = "disabled"; + status = "disable"; }; ahb { @@ -118,15 +118,15 @@ compatible = "st,spear600-fsmc-nand"; #address-cells = <1>; #size-cells = <1>; - reg = <0xb0000000 0x1000 /* FSMC Register*/ - 0xb0800000 0x0010 /* NAND Base DATA */ - 0xb0820000 0x0010 /* NAND Base ADDR */ - 0xb0810000 0x0010>; /* NAND Base CMD */ - reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + reg = <0xb0000000 0x1000 /* FSMC Register */ + 0xb0800000 0x0010>; /* NAND Base */ + reg-names = "fsmc_regs", "nand_data"; interrupts = <0 20 0x4 0 21 0x4 0 22 0x4 0 23 0x4>; + st,ale-off = <0x20000>; + st,cle-off = <0x10000>; st,mode = <2>; status = "disabled"; }; @@ -144,7 +144,7 @@ compatible = "st,pcm-audio"; #address-cells = <0>; #size-cells = <0>; - status = "disabled"; + status = "disable"; }; smi: flash@ea000000 { diff --git a/trunk/arch/arm/boot/dts/spear300.dtsi b/trunk/arch/arm/boot/dts/spear300.dtsi index f79b3dfaabe6..090adc656015 100644 --- a/trunk/arch/arm/boot/dts/spear300.dtsi +++ b/trunk/arch/arm/boot/dts/spear300.dtsi @@ -38,10 +38,10 @@ #address-cells = <1>; #size-cells = <1>; reg = <0x94000000 0x1000 /* FSMC Register */ - 0x80000000 0x0010 /* NAND Base DATA */ - 0x80020000 0x0010 /* NAND Base ADDR */ - 0x80010000 0x0010>; /* NAND Base CMD */ - reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + 0x80000000 0x0010>; /* NAND Base */ + reg-names = "fsmc_regs", "nand_data"; + st,ale-off = <0x20000>; + st,cle-off = <0x10000>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/spear310.dtsi b/trunk/arch/arm/boot/dts/spear310.dtsi index ab45b8c81982..e814e5e97083 100644 --- a/trunk/arch/arm/boot/dts/spear310.dtsi +++ b/trunk/arch/arm/boot/dts/spear310.dtsi @@ -33,10 +33,10 @@ #address-cells = <1>; #size-cells = <1>; reg = <0x44000000 0x1000 /* FSMC Register */ - 0x40000000 0x0010 /* NAND Base DATA */ - 0x40020000 0x0010 /* NAND Base ADDR */ - 0x40010000 0x0010>; /* NAND Base CMD */ - reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + 0x40000000 0x0010>; /* NAND Base */ + reg-names = "fsmc_regs", "nand_data"; + st,ale-off = <0x10000>; + st,cle-off = <0x20000>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/spear320.dtsi b/trunk/arch/arm/boot/dts/spear320.dtsi index caa5520b1fd4..c056a84deabf 100644 --- a/trunk/arch/arm/boot/dts/spear320.dtsi +++ b/trunk/arch/arm/boot/dts/spear320.dtsi @@ -40,10 +40,10 @@ #address-cells = <1>; #size-cells = <1>; reg = <0x4c000000 0x1000 /* FSMC Register */ - 0x50000000 0x0010 /* NAND Base DATA */ - 0x50020000 0x0010 /* NAND Base ADDR */ - 0x50010000 0x0010>; /* NAND Base CMD */ - reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + 0x50000000 0x0010>; /* NAND Base */ + reg-names = "fsmc_regs", "nand_data"; + st,ale-off = <0x20000>; + st,cle-off = <0x10000>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/spear600.dtsi b/trunk/arch/arm/boot/dts/spear600.dtsi index 19f99dc4115e..e051dde5181f 100644 --- a/trunk/arch/arm/boot/dts/spear600.dtsi +++ b/trunk/arch/arm/boot/dts/spear600.dtsi @@ -76,10 +76,10 @@ #address-cells = <1>; #size-cells = <1>; reg = <0xd1800000 0x1000 /* FSMC Register */ - 0xd2000000 0x0010 /* NAND Base DATA */ - 0xd2020000 0x0010 /* NAND Base ADDR */ - 0xd2010000 0x0010>; /* NAND Base CMD */ - reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd"; + 0xd2000000 0x4000>; /* NAND Base */ + reg-names = "fsmc_regs", "nand_data"; + st,ale-off = <0x20000>; + st,cle-off = <0x10000>; status = "disabled"; }; diff --git a/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts b/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts index 5cab82540437..f4ca126ad994 100644 --- a/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts +++ b/trunk/arch/arm/boot/dts/sun4i-cubieboard.dts @@ -11,11 +11,11 @@ */ /dts-v1/; -/include/ "sun4i-a10.dtsi" +/include/ "sun4i.dtsi" / { model = "Cubietech Cubieboard"; - compatible = "cubietech,a10-cubieboard", "allwinner,sun4i-a10"; + compatible = "cubietech,cubieboard", "allwinner,sun4i"; aliases { serial0 = &uart0; diff --git a/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts b/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts index 498a091a4ea2..d6ff889a5d87 100644 --- a/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts +++ b/trunk/arch/arm/boot/dts/sun5i-olinuxino.dts @@ -12,11 +12,11 @@ */ /dts-v1/; -/include/ "sun5i-a13.dtsi" +/include/ "sun5i.dtsi" / { model = "Olimex A13-Olinuxino"; - compatible = "olimex,a13-olinuxino", "allwinner,sun5i-a13"; + compatible = "olimex,a13-olinuxino", "allwinner,sun5i"; chosen { bootargs = "earlyprintk console=ttyS0,115200"; diff --git a/trunk/arch/arm/configs/nhk8815_defconfig b/trunk/arch/arm/configs/nhk8815_defconfig index 86cfd2959c47..240b25eea565 100644 --- a/trunk/arch/arm/configs/nhk8815_defconfig +++ b/trunk/arch/arm/configs/nhk8815_defconfig @@ -57,7 +57,7 @@ CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND_FSMC=y +CONFIG_MTD_NAND_NOMADIK=y CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_GENERIC=y diff --git a/trunk/arch/arm/include/uapi/asm/unistd.h b/trunk/arch/arm/include/uapi/asm/unistd.h index 4da7cde70b5d..ac03bdb4ae44 100644 --- a/trunk/arch/arm/include/uapi/asm/unistd.h +++ b/trunk/arch/arm/include/uapi/asm/unistd.h @@ -405,7 +405,6 @@ #define __NR_process_vm_readv (__NR_SYSCALL_BASE+376) #define __NR_process_vm_writev (__NR_SYSCALL_BASE+377) /* 378 for kcmp */ -#define __NR_finit_module (__NR_SYSCALL_BASE+379) /* * This may need to be greater than __NR_last_syscall+1 in order to diff --git a/trunk/arch/arm/kernel/calls.S b/trunk/arch/arm/kernel/calls.S index a4fda4e7a372..5935b6a02e6e 100644 --- a/trunk/arch/arm/kernel/calls.S +++ b/trunk/arch/arm/kernel/calls.S @@ -388,7 +388,6 @@ CALL(sys_process_vm_readv) CALL(sys_process_vm_writev) CALL(sys_ni_syscall) /* reserved for sys_kcmp */ - CALL(sys_finit_module) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index 0299915575a8..7211772edd9d 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/uncompress.h b/trunk/arch/arm/mach-ep93xx/include/mach/uncompress.h index d64274fc5760..16026c2b1c8c 100644 --- a/trunk/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ b/trunk/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -47,9 +47,13 @@ static void __raw_writel(unsigned int value, unsigned int ptr) static inline void putc(int c) { - /* Transmit fifo not full? */ - while (__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF) - ; + int i; + + for (i = 0; i < 1000; i++) { + /* Transmit fifo not full? */ + if (!(__raw_readb(PHYS_UART_FLAG) & UART_FLAG_TXFF)) + break; + } __raw_writeb(c, PHYS_UART_DATA); } diff --git a/trunk/arch/arm/mach-exynos/common.h b/trunk/arch/arm/mach-exynos/common.h index 04744f9c120f..dac146df79ac 100644 --- a/trunk/arch/arm/mach-exynos/common.h +++ b/trunk/arch/arm/mach-exynos/common.h @@ -25,7 +25,7 @@ void exynos_init_late(void); #ifdef CONFIG_PM_GENERIC_DOMAINS int exynos_pm_late_initcall(void); #else -static inline int exynos_pm_late_initcall(void) { return 0; } +static int exynos_pm_late_initcall(void) { return 0; } #endif #ifdef CONFIG_ARCH_EXYNOS4 diff --git a/trunk/arch/arm/mach-imx/clk-imx51-imx53.c b/trunk/arch/arm/mach-imx/clk-imx51-imx53.c index 579023f59dc1..e8c0473c7568 100644 --- a/trunk/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/trunk/arch/arm/mach-imx/clk-imx51-imx53.c @@ -319,7 +319,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, unsigned long rate_ckih1, unsigned long rate_ckih2) { int i; - u32 val; struct device_node *np; clk[pll1_sw] = imx_clk_pllv2("pll1_sw", "osc", MX51_DPLL1_BASE); @@ -391,21 +390,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, imx_print_silicon_rev("i.MX51", mx51_revision()); clk_disable_unprepare(clk[iim_gate]); - /* - * Reference Manual says: Functionality of CCDR[18] and CLPCR[23] is no - * longer supported. Set to one for better power saving. - * - * The effect of not setting these bits is that MIPI clocks can't be - * enabled without the IPU clock being enabled aswell. - */ - val = readl(MXC_CCM_CCDR); - val |= 1 << 18; - writel(val, MXC_CCM_CCDR); - - val = readl(MXC_CCM_CLPCR); - val |= 1 << 23; - writel(val, MXC_CCM_CLPCR); - return 0; } diff --git a/trunk/arch/arm/mach-nomadik/board-nhk8815.c b/trunk/arch/arm/mach-nomadik/board-nhk8815.c index 98167a4319f7..5ccdf53c5a9d 100644 --- a/trunk/arch/arm/mach-nomadik/board-nhk8815.c +++ b/trunk/arch/arm/mach-nomadik/board-nhk8815.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include #include "cpu-8815.h" @@ -42,34 +42,39 @@ #define SRC_CR_INIT_MASK 0x00007fff #define SRC_CR_INIT_VAL 0x2aaa8000 -#define ALE_OFF 0x1000000 -#define CLE_OFF 0x800000 - /* These addresses span 16MB, so use three individual pages */ static struct resource nhk8815_nand_resources[] = { { - .name = "nand_data", - .start = 0x40000000, - .end = 0x40000000 + SZ_16K - 1, - .flags = IORESOURCE_MEM, - }, { .name = "nand_addr", - .start = 0x40000000 + ALE_OFF, - .end = 0x40000000 +ALE_OFF + SZ_16K - 1, + .start = NAND_IO_ADDR, + .end = NAND_IO_ADDR + 0xfff, .flags = IORESOURCE_MEM, }, { .name = "nand_cmd", - .start = 0x40000000 + CLE_OFF, - .end = 0x40000000 + CLE_OFF + SZ_16K - 1, + .start = NAND_IO_CMD, + .end = NAND_IO_CMD + 0xfff, .flags = IORESOURCE_MEM, }, { - .name = "fsmc_regs", - .start = NOMADIK_FSMC_BASE, - .end = NOMADIK_FSMC_BASE + SZ_4K - 1, + .name = "nand_data", + .start = NAND_IO_DATA, + .end = NAND_IO_DATA + 0xfff, .flags = IORESOURCE_MEM, - }, + } }; +static int nhk8815_nand_init(void) +{ + /* FSMC setup for nand chip select (8-bit nand in 8815NHK) */ + writel(0x0000000E, FSMC_PCR(0)); + writel(0x000D0A00, FSMC_PMEM(0)); + writel(0x00100A00, FSMC_PATT(0)); + + /* enable access to the chip select area */ + writel(readl(FSMC_PCR(0)) | 0x04, FSMC_PCR(0)); + + return 0; +} + /* * These partitions are the same as those used in the 2.6.20 release * shipped by the vendor; the first two partitions are mandated @@ -103,28 +108,20 @@ static struct mtd_partition nhk8815_partitions[] = { } }; -static struct fsmc_nand_timings nhk8815_nand_timings = { - .thiz = 0, - .thold = 0x10, - .twait = 0x0A, - .tset = 0, -}; - -static struct fsmc_nand_platform_data nhk8815_nand_platform_data = { - .nand_timings = &nhk8815_nand_timings, - .partitions = nhk8815_partitions, - .nr_partitions = ARRAY_SIZE(nhk8815_partitions), - .width = FSMC_NAND_BW8, +static struct nomadik_nand_platform_data nhk8815_nand_data = { + .parts = nhk8815_partitions, + .nparts = ARRAY_SIZE(nhk8815_partitions), + .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING, + .init = nhk8815_nand_init, }; static struct platform_device nhk8815_nand_device = { - .name = "fsmc-nand", - .id = -1, - .resource = nhk8815_nand_resources, - .num_resources = ARRAY_SIZE(nhk8815_nand_resources), - .dev = { - .platform_data = &nhk8815_nand_platform_data, + .name = "nomadik_nand", + .dev = { + .platform_data = &nhk8815_nand_data, }, + .resource = nhk8815_nand_resources, + .num_resources = ARRAY_SIZE(nhk8815_nand_resources), }; /* These are the partitions for the OneNand device, different from above */ @@ -179,10 +176,6 @@ static struct platform_device nhk8815_onenand_device = { .num_resources = ARRAY_SIZE(nhk8815_onenand_resource), }; -/* bus control reg. and bus timing reg. for CS0..CS3 */ -#define FSMC_BCR(x) (NOMADIK_FSMC_VA + (x << 3)) -#define FSMC_BTR(x) (NOMADIK_FSMC_VA + (x << 3) + 0x04) - static void __init nhk8815_onenand_init(void) { #ifdef CONFIG_MTD_ONENAND diff --git a/trunk/arch/arm/mach-nomadik/include/mach/fsmc.h b/trunk/arch/arm/mach-nomadik/include/mach/fsmc.h new file mode 100644 index 000000000000..8c2c05183685 --- /dev/null +++ b/trunk/arch/arm/mach-nomadik/include/mach/fsmc.h @@ -0,0 +1,29 @@ + +/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */ + +#ifndef __ASM_ARCH_FSMC_H +#define __ASM_ARCH_FSMC_H + +#include +/* + * Register list + */ + +/* bus control reg. and bus timing reg. for CS0..CS3 */ +#define FSMC_BCR(x) (NOMADIK_FSMC_VA + (x << 3)) +#define FSMC_BTR(x) (NOMADIK_FSMC_VA + (x << 3) + 0x04) + +/* PC-card and NAND: + * PCR = control register + * PMEM = memory timing + * PATT = attribute timing + * PIO = I/O timing + * PECCR = ECC result + */ +#define FSMC_PCR(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00) +#define FSMC_PMEM(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08) +#define FSMC_PATT(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c) +#define FSMC_PIO(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10) +#define FSMC_PECCR(x) (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14) + +#endif /* __ASM_ARCH_FSMC_H */ diff --git a/trunk/arch/arm/mach-omap2/Kconfig b/trunk/arch/arm/mach-omap2/Kconfig index 41b581fd0213..be0f62bf9037 100644 --- a/trunk/arch/arm/mach-omap2/Kconfig +++ b/trunk/arch/arm/mach-omap2/Kconfig @@ -26,8 +26,6 @@ config SOC_HAS_OMAP2_SDRC config SOC_HAS_REALTIME_COUNTER bool "Real time free running counter" - depends on SOC_OMAP5 - default y config ARCH_OMAP2 bool "TI OMAP2" @@ -81,6 +79,7 @@ config SOC_OMAP5 select ARM_GIC select CPU_V7 select HAVE_SMP + select SOC_HAS_REALTIME_COUNTER select COMMON_CLK comment "OMAP Core Type" diff --git a/trunk/arch/arm/mach-omap2/board-3430sdp.c b/trunk/arch/arm/mach-omap2/board-3430sdp.c index bb73afc9ac17..7b201546834d 100644 --- a/trunk/arch/arm/mach-omap2/board-3430sdp.c +++ b/trunk/arch/arm/mach-omap2/board-3430sdp.c @@ -157,7 +157,6 @@ static struct omap_dss_device sdp3430_lcd_device = { static struct tfp410_platform_data dvi_panel = { .power_down_gpio = -1, - .i2c_bus_num = -1, }; static struct omap_dss_device sdp3430_dvi_device = { diff --git a/trunk/arch/arm/mach-omap2/board-am3517evm.c b/trunk/arch/arm/mach-omap2/board-am3517evm.c index f81a303b87ff..4be58fd071f6 100644 --- a/trunk/arch/arm/mach-omap2/board-am3517evm.c +++ b/trunk/arch/arm/mach-omap2/board-am3517evm.c @@ -208,7 +208,6 @@ static struct omap_dss_device am3517_evm_tv_device = { static struct tfp410_platform_data dvi_panel = { .power_down_gpio = -1, - .i2c_bus_num = -1, }; static struct omap_dss_device am3517_evm_dvi_device = { diff --git a/trunk/arch/arm/mach-omap2/board-cm-t35.c b/trunk/arch/arm/mach-omap2/board-cm-t35.c index b3102c2f4a3c..c8e37dc00892 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t35.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t35.c @@ -241,7 +241,6 @@ static struct omap_dss_device cm_t35_lcd_device = { static struct tfp410_platform_data dvi_panel = { .power_down_gpio = CM_T35_DVI_EN_GPIO, - .i2c_bus_num = -1, }; static struct omap_dss_device cm_t35_dvi_device = { diff --git a/trunk/arch/arm/mach-omap2/board-devkit8000.c b/trunk/arch/arm/mach-omap2/board-devkit8000.c index 12865af25d3a..7667eb749522 100644 --- a/trunk/arch/arm/mach-omap2/board-devkit8000.c +++ b/trunk/arch/arm/mach-omap2/board-devkit8000.c @@ -141,7 +141,6 @@ static struct omap_dss_device devkit8000_lcd_device = { static struct tfp410_platform_data dvi_panel = { .power_down_gpio = -1, - .i2c_bus_num = 1, }; static struct omap_dss_device devkit8000_dvi_device = { diff --git a/trunk/arch/arm/mach-omap2/board-h4.c b/trunk/arch/arm/mach-omap2/board-h4.c index 3be1311f9e33..9a3878ec2256 100644 --- a/trunk/arch/arm/mach-omap2/board-h4.c +++ b/trunk/arch/arm/mach-omap2/board-h4.c @@ -27,12 +27,14 @@ #include #include #include -#include #include #include #include +#include +#include + #include