Permalink
Switch branches/tags
Commits on May 19, 2010
  1. Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linu…

    …x/kernel/git/khilman/linux-davinci
    
    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits)
      Revert "rtc: omap: let device wakeup capability be configured from chip init logic"
      DM365: Added more PINMUX configurations for AEMIF
      DM365: Make CLKOUTx available
      DM365: Added PINMUX definitions for GPIO30..32
      Davinci: iotable based ioremap() interception
      Davinci: pinmux - use ioremap()
      Davinci: aintc/cpintc - use ioremap()
      Davinci: psc - use ioremap()
      Davinci: timer - use ioremap()
      Davinci: jtag_id - use ioremap()
      Davinci: da8xx: rtc - use ioremap
      Davinci: gpio - use ioremap()
      davinci: edma: fix coding style issue related to breaking lines
      davinci: edma: use BIT() wherever possible
      davinci: edma: fix coding style issue related to usage of braces
      davinci: edma: use a more intuitive name for edma_info
      Davinci: serial - conditional reset via pwremu
      Davinci: serial - use ioremap()
      Davinci: serial - remove unnecessary define
      Davinci: watchdog reset separation across socs
      ...
    
    Fix up trivial conflict in arch/arm/Kconfig due to removal of "select
    GENERIC_TIME"
    torvalds committed May 19, 2010
  2. Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux

    * 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux: (98 commits)
      Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry
      Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support
      Input: s3c24xx_ts - Implement generic GPIO configuration callback
      ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration
      ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen
      ARM: S3C64XX: Add touchscreen platform device definition
      ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
      ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100
      ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100
      ARM: S5PC100: gpio.h cleanup
      ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100
      ARM: S5PC100: Use common functions for gpiolib implementation
      drivers: serial: S5PC100 serial driver cleanup
      ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move
      ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories
      ARM: SAMSUNG: move driver strength gpio configuration helper to common dir
      ARM: S5PV210: Add GPIOlib support
      ARM: SAMSUNGy: fix broken timer irq base
      ARM: SMDK6440: Add audio devices on board
      ARM: S5P6440: Add audio platform devices
      ...
    torvalds committed May 19, 2010
  3. cpumask: fix compat getaffinity

    Commit a45185d "cpumask: convert kernel/compat.c" broke libnuma, which
    abuses sched_getaffinity to find out NR_CPUS in order to parse
    /sys/devices/system/node/node*/cpumap.
    
    On NUMA systems with less than 32 possibly CPUs, the current
    compat_sys_sched_getaffinity now returns '4' instead of the actual
    NR_CPUS/8, which makes libnuma bail out when parsing the cpumap.
    
    The libnuma call sched_getaffinity(0, bitmap, 4096) at first.  It mean
    the libnuma expect the return value of sched_getaffinity() is either len
    argument or NR_CPUS.  But it doesn't expect to return nr_cpu_ids.
    
    Strictly speaking, userland requirement are
    
    1) Glibc assume the return value mean the lengh of initialized
       of mask argument. E.g. if sched_getaffinity(1024) return 128,
       glibc make zero fill rest 896 byte.
    2) Libnuma assume the return value can be used to guess NR_CPUS
       in kernel. It assume len-arg<NR_CPUS makes -EINVAL. But
       it try len=4096 at first and 4096 is always bigger than
       NR_CPUS. Then, if we remove strange min_length normalization,
       we never hit -EINVAL case.
    
    sched_getaffinity() already solved this issue.  This patch adapts
    compat_sys_sched_getaffinity() to match the non-compat case.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Rusty Russell <rusty@rustcorp.com.au>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Reported-by: Ken Werner <ken.werner@web.de>
    Cc: stable@kernel.org
    Cc: Andi Kleen <andi@firstfloor.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    kosaki committed with torvalds May 19, 2010
  4. Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Drop duplicated "config IOMMU_HELPER"
      [IA64] invoke oom-killer from page fault
      [IA64] use __ratelimit
      [IA64] Use set_cpus_allowed_ptr
      [IA64] Use set_cpus_allowed_ptr
      [IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi
      [IA64] removing redundant ifdef
    torvalds committed May 19, 2010
  5. Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits)
      ARM: remove 'select GENERIC_TIME'
      ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO
      ARM: 6074/1: oprofile: convert from sysdev to platform device
      ARM: 6073/1: oprofile: remove old files and update KConfig
      ARM: 6072/1: oprofile: use perf-events framework as backend
      ARM: 6071/1: perf-events: allow modules to query the number of hardware counters
      ARM: 6070/1: perf-events: add support for xscale PMUs
      ARM: 6069/1: perf-events: use numeric ID to identify PMU
      ARM: 6064/1: pmu: register IRQs at runtime
      ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA
      ARM: 6134/1: Handle instruction cache maintenance fault properly
      ARM: nwfpe: allow debugging output to be configured at runtime
      ARM: rename mach_cpu_disable() to platform_cpu_disable()
      ARM: 6132/1: PL330: Add common core driver
      ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310
      ARM: Move memory mapping into mmu.c
      ARM: Ensure meminfo is sorted prior to sanity_check_meminfo
      ARM: Remove useless linux/bootmem.h includes
      ARM: convert /proc/cpu/aligment to seq_file
      arm: use asm-generic/scatterlist.h
      ...
    torvalds committed May 19, 2010
  6. Revert "rtc: omap: let device wakeup capability be configured from ch…

    …ip init logic"
    
    This reverts commit 9c0a342 because
    it was included without proper signoffs from RTC maintainers.
    Kevin Hilman committed May 19, 2010
  7. Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits)
      sh: update defconfigs.
      sh: Fix up the NUMA build for recent LMB changes.
      sh64: provide a stub per_cpu_trap_init() definition.
      sh: fix up CONFIG_KEXEC=n build.
      sh: fixup the docbook paths for clock framework shuffling.
      driver core: Early dev_name() depends on slab_is_available().
      sh: simplify WARN usage in SH clock driver
      sh: Check return value of clk_get on ms7724
      sh: Check return value of clk_get on ecovec24
      sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c
      sh: move sh clock.c contents to drivers/sh/clk.
      sh: move sh asm/clock.h contents to linux/sh_clk.h V2
      sh: remove unused clock lookup
      sh: switch boards to clkdev
      sh: switch sh4-202 to clkdev
      sh: switch shx3 to clkdev
      sh: switch sh7757 to clkdev
      sh: switch sh7763 to clkdev
      sh: switch sh7780 to clkdev
      sh: switch sh7786 to clkdev
      ...
    torvalds committed May 19, 2010
  8. Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (24 commits)
      [S390] drivers/s390/char: Use kmemdup
      [S390] drivers/s390/char: Use kstrdup
      [S390] debug: enable exception-trace debug facility
      [S390] s390_hypfs: Add new attributes
      [S390] qdio: remove API wrappers
      [S390] qdio: set correct bit in dsci
      [S390] qdio: dont convert timestamps to microseconds
      [S390] qdio: remove memset hack
      [S390] qdio: prevent starvation on PCI devices
      [S390] qdio: count number of qdio interrupts
      [S390] user space fault: report fault before calling do_exit
      [S390] topology: expose core identifier
      [S390] dasd: remove uid from devmap
      [S390] dasd: add dynamic pav toleration
      [S390] vdso: add missing vdso_install target
      [S390] vdso: remove redundant check for CONFIG_64BIT
      [S390] avoid default_llseek in s390 drivers
      [S390] vmcp: disallow modular build
      [S390] add breaking event address for user space
      [S390] virtualization aware cpu measurement
      ...
    torvalds committed May 19, 2010
  9. Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry

    Make the driver depend on either ARCH_S3C2410 (as legacy) or the new
    device selection of SAMSUNG_DEV_TS.
    
    Change the menuconfig name to reflect this driver is now handling more
    devices that just the s3c2410.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Acked-by: Dmitry Torokhov <dtor@mail.ru>
    Ben Dooks committed May 19, 2010
  10. Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support

    This patch adds a feature bit field in the touchscreen driver for Samsung SoCs.
    Which can be used to distinguish the TSADC module features.
    
    Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    [ben-linux@fluff.org: minor fix to title]
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Acked-by: Dmitry Torokhov <dtor@mail.ru>
    Naveen Krishna committed with Ben Dooks May 18, 2010
  11. Input: s3c24xx_ts - Implement generic GPIO configuration callback

    This patch implements generic GPIO configuration function in Samsung
    touchscreen driver. And makes the touchscreen driver s3c24xx-ts.c
    generic to all the Samsung SoCs.
    
    Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    [ben-linux@fluff.org: fixed title ]
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Acked-by: Dmitry Torokhov <dtor@mail.ru>
    Naveen Krishna committed with Ben Dooks May 18, 2010
  12. ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename config…

    …uration
    
    Move the arch/arm/mach-s3c64xx/dev-ts.c file to arch/arm/plat-samsung and
    rename the Kconfig entry appropriately.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 19, 2010
  13. ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen

    This patch implements cfg_gpio function for Samsung touchscreen.
    And also modifies the H1940 machine respectively.
    
    Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Naveen Krishna committed with Ben Dooks May 18, 2010
  14. ARM: S3C64XX: Add touchscreen platform device definition

    This patch adds the touchscreen platform device definition for S3C64XX boards.
    
    Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    mcuelenaere committed with Ben Dooks May 4, 2010
  15. ARM: SAMSUNG: Move mach/ts.h to plat/ts.h

    This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in
    order to prepare for s3c64xx support in the touchscreen driver.
    
    Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    mcuelenaere committed with Ben Dooks May 4, 2010
  16. ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100

    Move i2c helpers from plat-s5pc1xx to mach-s5pc100.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  17. ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5p…

    …c100
    
    Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  18. ARM: S5PC100: gpio.h cleanup

    This patch renames gpio related registers from s5pc1xx to s5pc100 to
    better match the plat-s5p framework style. GPIO_MP* defines now used
    anywhere thus has been removed.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  19. ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100

    Move gpio-lib support from plat-s5pc1xx to mach-s5pc100. Only basic gpio
    functionality is now supported. Gpio interrupts are disabled temporarly
    and will be added later.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  20. ARM: S5PC100: Use common functions for gpiolib implementation

    GPIOlib helpers from plat-samsung already have functions for accessing
    4bit gpio banks. This patch removes the duplicated functions from
    plat-s5pc1xx/gpiolib.c.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  21. drivers: serial: S5PC100 serial driver cleanup

    Remove unnecessary Kconfig entry. S5PC100 has exactly the same driver as
    S3C6400/S3C6410/S5P6440.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  22. ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p …

    …move
    
    This is a pre-requisite clock patch for the plat-s5pc1xx to plat-s5p
    movement. The patches that perform the movement of the code from
    plat-s5pc1xx to plat-s5p (and mach-s5pc100) should also enable the
    build for the mach-s5pc100/clock.c code.
    
    Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    omas-ab committed with Ben Dooks May 14, 2010
  23. ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  24. ARM: SAMSUNG: move driver strength gpio configuration helper to commo…

    …n dir
    
    Driver strength parameter can be changed not only on S5PC100 but also
    on S5PV210/S5PC110 platforms, so move the helper functions to the common
    plat-samsung directory.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 18, 2010
  25. ARM: Merge for-2635/samsung-rtc

    Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
    
    Conflicts:
    	arch/arm/mach-s3c64xx/include/mach/map.h
    	arch/arm/plat-samsung/Kconfig
    	arch/arm/plat-samsung/Makefile
    Ben Dooks committed May 19, 2010
  26. ARM: Merge for-2635/samsung-ts

    Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  27. ARM: Merge for-2635/s5p-audio

    Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  28. ARM: Merge for-2635/s5p-dma

    Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
    
    Conflicts:
    	arch/arm/mach-s5pv210/Makefile
    Ben Dooks committed May 19, 2010
  29. ARM: Merge for-2635/fb-updates1

    Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  30. ARM: Merge for-2635/s5pv210-clock

    Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  31. ARM: Merge for-2635/s5p6440-clock

    Merge branch 'for-2635/s5p6440-clock' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  32. ARM: Merge for-2635/s3c6410-clock

    Merge branch 'for-2635/s3c6410-clock' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  33. ARM: Merge for-2635/gpio2

    Merge branch 'for-2635/gpio2' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  34. ARM: Merge for-2635/rx1950

    Merge branch 'for-2635/rx1950' into for-linus/samsung2
    Ben Dooks committed May 19, 2010
  35. ARM: Merge for-2635/acer-n35

    Merge branch 'for-2635/acer-n35' into for-linus/samsung2
    Ben Dooks committed May 19, 2010