11 Mar, 2013

4 commits

  • Pull input updates from Dmitry Torokhov:
    "Except for the largish change to the ALPS driver adding "Dolphin V1"
    support and Wacom getting a new signature of yet another device, the
    rest are straightforward driver fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: mms114 - Fix regulator enable and disable paths
    Input: ads7864 - check return value of regulator enable
    Input: tc3589x-keypad - fix keymap size
    Input: wacom - add support for 0x10d
    Input: ALPS - update documentation for recent touchpad driver mods
    Input: ALPS - add "Dolphin V1" touchpad support
    Input: ALPS - remove unused argument to alps_enter_command_mode()
    Input: cypress_ps2 - fix trackpadi found in Dell XPS12

    Linus Torvalds
     
  • When it uses regulators the mms114 driver checks to see if it managed to
    acquire regulators and ignores errors. This is not the intended usage and
    not great style in general.

    Since the driver already refuses to probe if it fails to allocate the
    regulators simply make the enable and disable calls unconditional and
    add appropriate error handling, including adding cleanup of the
    regulators if setup_reg() fails.

    Signed-off-by: Mark Brown
    Acked-by: Joonyoung Shim
    Signed-off-by: Dmitry Torokhov

    Mark Brown
     
  • At least print a warning if we can't power the device up.

    Signed-off-by: Mark Brown
    Signed-off-by: Dmitry Torokhov

    Mark Brown
     
  • The keymap size used by tc3589x is too low, leading to the driver
    overwriting other people's memory. Fix this by making the driver
    use the automatically allocated keymap provided by
    matrix_keypad_build_keymap() instead of allocating one on its own.

    Signed-off-by: Rabin Vincent
    Signed-off-by: Dmitry Torokhov

    Rabin Vincent
     

10 Mar, 2013

2 commits

  • It is a Wacom device found in Fujitsu Lifebook T902.

    Signed-off-by: Stephan Frank
    Acked-by: Ping Cheng
    Signed-off-by: Dmitry Torokhov

    Stephan Frank
     
  • There is a more complete atmel patch-series out by Nick Dyer that fixes
    this and other things, but in the meantime this is the minimal thing to
    get the touchscreen going on (at least my) Pixel Chromebook.

    Not that I want my dirty fingers near that beautiful screen, but it
    seems that a non-initialized touchscreen will also end up being a
    constant wakeup source, so you have to disable it to go to sleep. And
    it's easier to just fix the initialization sequence.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

09 Mar, 2013

1 commit

  • This same driver can be used by atmel based touchscreens and touchpads
    (buttonpads). Platform data may specify a device is a touchpad
    using the is_tp flag.

    This will cause the driver to perform some touchpad specific
    initializations, such as:
    * register input device name "Atmel maXTouch Touchpad" instead of
    Touchscreen.
    * register BTN_LEFT & BTN_TOOL_* event types.
    * register axis resolution (as a fixed constant, for now)
    * register BUTTONPAD property
    * process GPIO buttons using reportid T19

    Input event GPIO mapping is done by the platform data key_map array.

    key_map[x] should contain the KEY or BTN code to send when processing
    GPIOx from T19. To specify a GPIO as not an input source, populate
    with KEY_RESERVED, or 0.

    Signed-off-by: Daniel Kurtz
    Signed-off-by: Benson Leung
    Signed-off-by: Nick Dyer
    Tested-by: Olof Johansson
    Signed-off-by: Linus Torvalds

    Daniel Kurtz
     

04 Mar, 2013

1 commit

  • Pull second set of s390 patches from Martin Schwidefsky:
    "The main part of this merge are Heikos uaccess patches. Together with
    commit 09884964335e ("mm: do not grow the stack vma just because of an
    overrun on preceding vma") the user string access is hopefully fixed
    for good.

    In addition some bug fixes and two cleanup patches."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/module: fix compile warning
    qdio: remove unused parameters
    s390/uaccess: fix kernel ds access for page table walk
    s390/uaccess: fix strncpy_from_user string length check
    input: disable i8042 PC Keyboard controller for s390
    s390/dis: Fix invalid array size
    s390/uaccess: remove pointless access_ok() checks
    s390/uaccess: fix strncpy_from_user/strnlen_user zero maxlen case
    s390/uaccess: shorten strncpy_from_user/strnlen_user
    s390/dasd: fix unresponsive device after all channel paths were lost
    s390/mm: ignore change bit for vmemmap
    s390/page table dumper: add support for change-recording override bit

    Linus Torvalds
     

03 Mar, 2013

1 commit


28 Feb, 2013

1 commit


25 Feb, 2013

1 commit

  • Pull MFS updates from Samuel Ortiz:
    "This is the MFD pull request for the 3.9 merge window.

    No new drivers this time, but a bunch of fairly big cleanups:

    - Roger Quadros worked on a OMAP USBHS and TLL platform data
    consolidation, OMAP5 support and clock management code cleanup.

    - The first step of a major sync for the ab8500 driver from Lee
    Jones. In particular, the debugfs and the sysct interfaces got
    extended and improved.

    - Peter Ujfalusi sent a nice patchset for cleaning and fixing the
    twl-core driver, with a much needed module id lookup code
    improvement.

    - The regular wm5102 and arizona cleanups and fixes from Mark Brown.

    - Laxman Dewangan extended the palmas APIs in order to implement the
    palmas GPIO and rt drivers.

    - Laxman also added DT support for the tps65090 driver.

    - The Intel SCH and ICH drivers got a couple fixes from Aaron Sierra
    and Darren Hart.

    - Linus Walleij patchset for the ab8500 driver allowed ab8500 and
    ab9540 based devices to switch to the new abx500 pin-ctrl driver.

    - The max8925 now has device tree and irqdomain support thanks to
    Qing Xu.

    - The recently added rtsx driver got a few cleanups and fixes for a
    better card detection code path and now also supports the RTS5227
    chipset, thanks to Wei Wang and Roger Tseng."

    * tag 'mfd-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (109 commits)
    mfd: lpc_ich: Use devres API to allocate private data
    mfd: lpc_ich: Add Device IDs for Intel Wellsburg PCH
    mfd: lpc_sch: Accomodate partial population of the MFD devices
    mfd: da9052-i2c: Staticize da9052_i2c_fix()
    mfd: syscon: Fix sparse warning
    mfd: twl-core: Fix kernel panic on boot
    mfd: rtsx: Fix issue that booting OS with SD card inserted
    mfd: ab8500: Fix compile error
    mfd: Add missing GENERIC_HARDIRQS dependecies
    Documentation: Add docs for max8925 dt
    mfd: max8925: Add dts
    mfd: max8925: Support dt for backlight
    mfd: max8925: Fix onkey driver irq base
    mfd: max8925: Fix mfd device register failure
    mfd: max8925: Add irqdomain for dt
    mfd: vexpress: Allow vexpress-sysreg to self-initialise
    mfd: rtsx: Support RTS5227
    mfd: rtsx: Implement driving adjustment to device-dependent callbacks
    mfd: vexpress: Add pseudo-GPIO based LEDs
    mfd: ab8500: Rename ab8500 to abx500 for hwmon driver
    ...

    Linus Torvalds
     

22 Feb, 2013

6 commits

  • These touchpads use a different protocol; they have been seen on Dell
    N5110, Dell 17R SE, and others.

    The official ALPS driver identifies them by looking for an exact match
    on the E7 report: 73 03 50. Dolphin V1 returns an EC report of
    73 01 xx (02 and 0d have been seen); Dolphin V2 returns an EC report of
    73 02 xx (02 has been seen).

    Dolphin V2 probably needs a different initialization sequence and/or
    report parser, so it is left for a future commit.

    Signed-off-by: Dave Turvene
    Signed-off-by: Kevin Cernekee
    Signed-off-by: Dmitry Torokhov

    Dave Turvene
     
  • Now that alps_identify() explicitly issues an EC report using
    alps_rpt_cmd(), we no longer need to look at the magic numbers returned
    by alps_enter_command_mode().

    Signed-off-by: Kevin Cernekee
    Signed-off-by: Dmitry Torokhov

    Kevin Cernekee
     
  • Avoid firmware glitch in Cypress PS/2 Trackpad firmware version 11
    (as observed in Dell XPS12) which prevents driver from recognizing
    the trackpad.

    BugLink: http://launchpad.net/bugs/1103594

    Signed-off-by: Kamal Mostafa
    Cc: Dudley Du
    Signed-off-by: Dmitry Torokhov

    Kamal Mostafa
     
  • Pull ARM SoC-specific updates from Arnd Bergmann:
    "This is a larger set of new functionality for the existing SoC
    families, including:

    - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
    wm8850

    - prima2 gains support for the "marco" SoC family, its SMP based
    cousin

    - tegra gains support for the new Tegra4 (Tegra114) family

    - socfpga now supports a newer version of the hardware including SMP

    - i.mx31 and bcm2835 are now using DT probing for their clocks

    - lots of updates for sh-mobile

    - OMAP updates for clocks, power management and USB

    - i.mx6q and tegra now support cpuidle

    - kirkwood now supports PCIe hot plugging

    - tegra clock support is updated

    - tegra USB PHY probing gets implemented diffently"

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
    ARM: prima2: remove duplicate v7_invalidate_l1
    ARM: shmobile: r8a7779: Correct TMU clock support again
    ARM: prima2: fix __init section for cpu hotplug
    ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
    ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
    arm: socfpga: Add SMP support for actual socfpga harware
    arm: Add v7_invalidate_l1 to cache-v7.S
    arm: socfpga: Add entries to enable make dtbs socfpga
    arm: socfpga: Add new device tree source for actual socfpga HW
    ARM: tegra: sort Kconfig selects for Tegra114
    ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
    ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
    ARM: tegra: Fix build error for gic update
    ARM: tegra: remove empty tegra_smp_init_cpus()
    ARM: shmobile: Register ARM architected timer
    ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
    ARM: shmobile: r8a7779: Correct TMU clock support
    ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
    ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
    ARM: mxs: use apbx bus clock to drive the timers on timrotv2
    ...

    Linus Torvalds
     
  • Pull tty/serial patches from Greg Kroah-Hartman:
    "Here's the big tty/serial driver patches for 3.9-rc1.

    More tty port rework and fixes from Jiri here, as well as lots of
    individual serial driver updates and fixes.

    All of these have been in the linux-next tree for a while."

    * tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits)
    tty: mxser: improve error handling in mxser_probe() and mxser_module_init()
    serial: imx: fix uninitialized variable warning
    serial: tegra: assume CONFIG_OF
    TTY: do not update atime/mtime on read/write
    lguest: select CONFIG_TTY to build properly.
    ARM defconfigs: add missing inclusions of linux/platform_device.h
    fb/exynos: include platform_device.h
    ARM: sa1100/assabet: include platform_device.h directly
    serial: imx: Fix recursive locking bug
    pps: Fix build breakage from decoupling pps from tty
    tty: Remove ancient hardpps()
    pps: Additional cleanups in uart_handle_dcd_change
    pps: Move timestamp read into PPS code proper
    pps: Don't crash the machine when exiting will do
    pps: Fix a use-after free bug when unregistering a source.
    pps: Use pps_lookup_dev to reduce ldisc coupling
    pps: Add pps_lookup_dev() function
    tty: serial: uartlite: Support uartlite on big and little endian systems
    tty: serial: uartlite: Fix sparse and checkpatch warnings
    serial/arc-uart: Miscll DT related updates (Grant's review comments)
    ...

    Fix up trivial conflicts, mostly just due to the TTY config option
    clashing with the EXPERIMENTAL removal.

    Linus Torvalds
     
  • Pull driver core patches from Greg Kroah-Hartman:
    "Here is the big driver core merge for 3.9-rc1

    There are two major series here, both of which touch lots of drivers
    all over the kernel, and will cause you some merge conflicts:

    - add a new function called devm_ioremap_resource() to properly be
    able to check return values.

    - remove CONFIG_EXPERIMENTAL

    Other than those patches, there's not much here, some minor fixes and
    updates"

    Fix up trivial conflicts

    * tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
    base: memory: fix soft/hard_offline_page permissions
    drivercore: Fix ordering between deferred_probe and exiting initcalls
    backlight: fix class_find_device() arguments
    TTY: mark tty_get_device call with the proper const values
    driver-core: constify data for class_find_device()
    firmware: Ignore abort check when no user-helper is used
    firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
    firmware: Make user-mode helper optional
    firmware: Refactoring for splitting user-mode helper code
    Driver core: treat unregistered bus_types as having no devices
    watchdog: Convert to devm_ioremap_resource()
    thermal: Convert to devm_ioremap_resource()
    spi: Convert to devm_ioremap_resource()
    power: Convert to devm_ioremap_resource()
    mtd: Convert to devm_ioremap_resource()
    mmc: Convert to devm_ioremap_resource()
    mfd: Convert to devm_ioremap_resource()
    media: Convert to devm_ioremap_resource()
    iommu: Convert to devm_ioremap_resource()
    drm: Convert to devm_ioremap_resource()
    ...

    Linus Torvalds
     

21 Feb, 2013

3 commits

  • Pull ACPI and power management updates from Rafael Wysocki:

    - Rework of the ACPI namespace scanning code from Rafael J. Wysocki
    with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg,
    Toshi Kani, and Yinghai Lu.

    - ACPI power resources handling and ACPI device PM update from Rafael
    J Wysocki.

    - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with
    contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner.

    - Support for Intel Lynxpoint LPSS from Mika Westerberg.

    - cpuidle update from Len Brown including Intel Haswell support, C1
    state for intel_idle, removal of global pm_idle.

    - cpuidle fixes and cleanups from Daniel Lezcano.

    - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with
    contributions from Stratos Karafotis and Rickard Andersson.

    - Intel P-states driver for Sandy Bridge processors from Dirk
    Brandewie.

    - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn.

    - cpufreq fixes related to ordering issues between acpi-cpufreq and
    powernow-k8 from Borislav Petkov and Matthew Garrett.

    - cpufreq support for Calxeda Highbank processors from Mark Langsdorf
    and Rob Herring.

    - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update
    from Shawn Guo.

    - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat,
    and Inderpal Singh.

    - Support for "lightweight suspend" from Zhang Rui.

    - Removal of the deprecated power trace API from Paul Gortmaker.

    - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso,
    Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu,
    Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki
    Ishimatsu.

    * tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits)
    PM idle: remove global declaration of pm_idle
    unicore32 idle: delete stray pm_idle comment
    openrisc idle: delete pm_idle
    mn10300 idle: delete pm_idle
    microblaze idle: delete pm_idle
    m32r idle: delete pm_idle, and other dead idle code
    ia64 idle: delete pm_idle
    cris idle: delete idle and pm_idle
    ARM64 idle: delete pm_idle
    ARM idle: delete pm_idle
    blackfin idle: delete pm_idle
    sparc idle: rename pm_idle to sparc_idle
    sh idle: rename global pm_idle to static sh_idle
    x86 idle: rename global pm_idle to static x86_idle
    APM idle: register apm_cpu_idle via cpuidle
    cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
    cpufreq / intel_pstate: Change to disallow module build
    tools/power turbostat: display SMI count by default
    intel_idle: export both C1 and C1E
    ACPI / hotplug: Fix concurrency issues and memory leaks
    ...

    Linus Torvalds
     
  • Pull device tree changes from Grant Likely:
    "All around device tree changes destined for v3.8. Aside from the
    documentation updates the highlights in this branch include:

    - Kbuild changes for using CPP with .dts files
    - locking fix from preempt_rt patchset
    - include DT alias names in device uevent
    - Selftest bugfixes and improvements
    - New function for counting phandles stanzas in a property
    - constify argument to of_node_full_name()
    - Various bug fixes

    This tree did also contain a commit to use platform_device_add instead
    of open-coding the device add code, but it caused problems with amba
    devices and needed to be reverted."

    * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
    Revert "of: use platform_device_add"
    kbuild: limit dtc+cpp include path
    gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
    of: Create function for counting number of phandles in a property
    of/base: Clean up exit paths for of_parse_phandle_with_args()
    of/selftest: Use selftest() macro throughout
    of/selftest: Fix GPIOs selftest to cover the 7th case
    of: fix recursive locking in of_get_next_available_child()
    documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
    OF: convert devtree lock from rw_lock to raw spinlock
    of/exynos_g2d: Add Bindings for exynos G2D driver
    kbuild: create a rule to run the pre-processor on *.dts files
    input: Extend matrix-keypad device tree binding
    devicetree: Move NS2 LEDs binding into LEDs directory
    of: use platform_device_add
    powerpc/5200: Fix size to request_mem_region() call
    documentation/devicetree: Fix typos
    of: add 'const' to of_node_full_name parameter
    of: Output devicetree alias names in uevent
    DT: add vendor prefixes for Renesas and Toshiba
    ...

    Linus Torvalds
     
  • Pull input updates from Dmitry Torokhov:
    "Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2
    touchpad and a big update to ALPS driver from Kevin Cernekee that adds
    support for "Rushmore" touchpads and paves way for adding support for
    "Dolphin" touchpads.

    There is also a new input driver for Goldfish emulator and also
    Android keyreset driver was folded into SysRq code.

    A few more drivers were updated with device tree bindings and others
    got some small cleanups and fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
    Input: cyttsp-spi - remove duplicate MODULE_ALIAS()
    Input: tsc2005 - add MODULE_ALIAS
    Input: tegra-kbc - require CONFIG_OF, remove platform data
    Input: synaptics - initialize pointer emulation usage
    Input: MT - do not apply filtering on emulated events
    Input: bma150 - make some defines public and fix some comments
    Input: bma150 - fix checking pm_runtime_get_sync() return value
    Input: ALPS - enable trackstick on Rushmore touchpads
    Input: ALPS - add support for "Rushmore" touchpads
    Input: ALPS - make the V3 packet field decoder "pluggable"
    Input: ALPS - move pixel and bitmap info into alps_data struct
    Input: ALPS - fix command mode check
    Input: ALPS - rework detection of Pinnacle AGx touchpads
    Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults()
    Input: ALPS - use function pointers for different protocol handlers
    Input: ALPS - rework detection sequence
    Input: ALPS - introduce helper function for repeated commands
    Input: ALPS - move alps_get_model() down below hw_init code
    Input: ALPS - copy "model" info into alps_data struct
    Input: ALPS - document the alps.h data structures
    ...

    Linus Torvalds
     

20 Feb, 2013

1 commit


19 Feb, 2013

1 commit


17 Feb, 2013

2 commits


16 Feb, 2013

5 commits

  • Tegra only supports, and always enables, device tree. Remove all ifdefs
    and runtime checks for DT support from the driver. Platform data is
    therefore no longer required. Delete the header that defines it, and
    rework the driver to parse the device tree directly into struct
    tegra_kbc.

    Signed-off-by: Stephen Warren
    Signed-off-by: Dmitry Torokhov

    Stephen Warren
     
  • To properly setup event parameters for emulated events, pass
    the appropriate flag to the slot initialization function. Also,
    all MT-related events should be setup before initialization.

    Incidentally, this solves the issue of doubly filtered pointer
    events.

    Reported-by: Daniel Kurtz
    Signed-off-by: Henrik Rydberg
    Signed-off-by: Dmitry Torokhov

    Henrik Rydberg
     
  • The pointer emulation events are derived from contact values that
    have already been filtered, so send the emulated events as is.

    Reported-by: Daniel Kurtz
    Signed-off-by: Henrik Rydberg
    Signed-off-by: Dmitry Torokhov

    Henrik Rydberg
     
  • Make the constants referring to range and bandwidth public so they can
    be used when initializing the platform data fields in the platform code.

    Fix also some comments regarding the unit of measurement to use for the
    range and bandwidth fields, the values are not actually expected to be
    in G or HZ, the code in bma150.c just uses the BMA150_RANGE_xxx and
    BMA150_BW_xxx constants like they are with no translation from actual
    values in G or HZ.

    Signed-off-by: Michael Trimarchi
    Signed-off-by: Antonio Ospite
    Signed-off-by: Dmitry Torokhov

    Michael Trimarchi
     
  • When PM_RUNTIME is not defined, pm_runtime_get_sync() returns 1, see
    include/linux/pm_runtime.c::__pm_runtime_resume(), and the check of the
    return value was overlooking this, in this case bma150_open() would
    return 1 which is not expected by upper layers.

    Maybe the check for != -ENOSYS (Function not implemented) was meant to
    cover this, but pm_runtime_get_sync() does not return this value.

    For now fix the issue locally by checking explicitly for negative return
    values.

    Signed-off-by: Michael Trimarchi
    Signed-off-by: Antonio Ospite
    Signed-off-by: Dmitry Torokhov

    Michael Trimarchi
     

15 Feb, 2013

11 commits