Eric Lee / smarc-fsl-linux-kernel

05 Jan, 2013

1 commit

04 Jan, 2013

1 commit

  • 0fe763c57   Drivers: misc: remove __dev* attributes. ... Browse Code »

    CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
    markings need to be removed.

    This change removes the use of __devinit, __devexit_p, __devinitdata,
    __devinitconst, and __devexit from these drivers.

    Based on patches originally written by Bill Pemberton, but redone by me
    in order to handle some of the coding style issues better, by hand.

    Cc: Bill Pemberton
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

25 Dec, 2012

3 commits

  • e324ce61e   Input: gpio_keys - defer probing if GPIO probing is deferred ... Browse Code »

    If of_get_gpio_flags() returns an error (as in case when GPIO probe is
    deferred) the driver would attempt to claim invalid GPIO. It should
    propagate the error code up the stack instead so that the probe either
    fails or will be retried later (in case of -EPROBE_DEFER).

    Cc: stable@vger.kernel.org
    Reported-by: Gabor Juhos
    Signed-off-by: Dmitry Torokhov

    Dmitry Torokhov
     
  • d46329a70   Input: gpio_keys_polled - defer probing if GPIO probing is deferred ... Browse Code »

    If GPIO probing is deferred, the driver tries to claim an invalid GPIO line
    which leads to an error message like this:

    gpio-keys-polled buttons.2: unable to claim gpio 4294966779, err=-22
    gpio-keys-polled: probe of buttons.2 failed with error -22

    We should make sure that error code returned by of_get_gpio_flags (including
    -EPROBE_DEFER) is propagated up the stack.

    Cc: stable@vger.kernel.org
    Signed-off-by: Gabor Juhos
    Signed-off-by: Dmitry Torokhov

    Gabor Juhos
     
  • a25461659   Input: sentelic - only report position of first finger as ST coordinates ... Browse Code »

    Report only the position of the first finger as absolute non-MT coordinates,
    instead of reporting both fingers alternatively. Actual MT events are
    unaffected.

    This fixes horizontal and improves vertical scrolling with the touchpad.

    Cc: stable@vger.kernel.org
    Signed-off-by: Christophe TORDEUX
    Signed-off-by: Dmitry Torokhov

    Christophe TORDEUX
     

20 Dec, 2012

1 commit

19 Dec, 2012

1 commit

  • 31564cbd7   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input ... Browse Code »

    Pull second round of input updates from Dmitry Torokhov:
    "As usual, there are a couple of new drivers, input core now supports
    managed input devices (devres), a slew of drivers now have device tree
    support and a bunch of fixes and cleanups."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (71 commits)
    Input: walkera0701 - fix crash on startup
    Input: matrix-keymap - provide a proper module license
    Input: gpio_keys_polled - switch to using gpio_request_one()
    Input: gpio_keys - switch to using gpio_request_one()
    Input: wacom - fix touch support for Bamboo Fun CTH-461
    Input: xpad - add a few new VID/PID combinations
    Input: xpad - minor formatting fixes
    Input: gpio-keys-polled - honor 'autorepeat' setting in platform data
    Input: tca8418-keypad - switch to using managed resources
    Input: tca8418_keypad - increase severity of failures in probe()
    Input: tca8418_keypad - move device ID tables closer to where they are used
    Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data
    Input: tca8418_keypad - use a temporary variable for parent device
    Input: tca8418_keypad - add support for shared interrupt
    Input: tca8418_keypad - add support for device tree bindings
    Input: remove Compaq iPAQ H3600 (Bitsy) touchscreen driver
    Input: bu21013_ts - add support for Device Tree booting
    Input: bu21013_ts - move GPIO init and exit functions into the driver
    Input: bu21013_ts - request regulator that actually exists
    ARM: ux500: Strip out duplicate touch screen platform information
    ...

    Linus Torvalds
     

17 Dec, 2012

4 commits

  • 022573c27   Merge branch 'next' into for-linus ... Browse Code »

    Prepare first set of updates for 3.8 merge window.

    Dmitry Torokhov
     
  • a455e2985   Input: walkera0701 - fix crash on startup ... Browse Code »

    The driver's timer must be set up before enabling IRQ handler, otherwise
    bad things may happen.

    Reported-and-tested-by: Fengguang Wu
    Signed-off-by: Peter Popovec
    CC: stable@vger.kernel.org
    Signed-off-by: Dmitry Torokhov

    Peter Popovec
     
  • 2dfea3803   Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 ... Browse Code »

    Pull MFS update from Samuel Ortiz:
    "This is the MFD patch set for the 3.8 merge window.

    We have several new drivers, most of the time coming with their sub
    devices drivers:

    - Austria Microsystem's AS3711
    - Nano River's viperboard
    - TI's TPS80031, AM335x TS/ADC,
    - Realtek's MMC/memstick card reader
    - Nokia's retu

    We also got some notable cleanups and improvements:

    - tps6586x got converted to IRQ domains.
    - tps65910 and tps65090 moved to the regmap IRQ API.
    - STMPE is now Device Tree aware.
    - A general twl6040 and twl-core cleanup, with moves to the regmap
    I/O and IRQ APIs and a conversion to the recently added PWM
    framework.
    - sta2x11 gained regmap support.

    Then the rest is mostly tiny cleanups and fixes, among which we have
    Mark's wm5xxx and wm8xxx patchset."

    Far amount of annoying but largely trivial conflicts. Many due to
    __devinit/exit removal, others due to one or two of the new drivers also
    having come in through another tree.

    * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits)
    mfd: tps6507x: Convert to devm_kzalloc
    mfd: stmpe: Update DT support for stmpe driver
    mfd: wm5102: Add readback of DSP status 3 register
    mfd: arizona: Log if we fail to create the primary IRQ domain
    mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ
    mfd: tps80031: Add terminating entry for tps80031_id_table
    mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask()
    mfd: wm5102: Add tuning for revision B
    mfd: arizona: Defer patch initialistation until after first device boot
    mfd: tps65910: Fix wrong ack_base register
    mfd: tps65910: Remove unused data
    mfd: stmpe: Get rid of irq_invert_polarity
    mfd: ab8500-core: Fix invalid free of devm_ allocated data
    mfd: wm5102: Mark DSP memory regions as volatile
    mfd: wm5102: Correct default for LDO1_CONTROL_2
    mfd: arizona: Register haptics devices
    mfd: wm8994: Make current device behaviour the default
    mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ
    mfd: Fix stmpe.c build when OF is not enabled
    mfd: jz4740-adc: Use devm_kzalloc
    ...

    Linus Torvalds
     
  • 770b6cb4d   ARM: OMAP: Fix drivers to depend on omap for internal devices ... Browse Code »

    These devices are not available on other architectures, so
    let's limit them to omap.

    If the driver subsystem maintainers want to build test
    system wide changes without building for each target,
    it's easy to carry a test patch that just strips out the
    depends entries from Kconfig files.

    Signed-off-by: Tony Lindgren
    Signed-off-by: Linus Torvalds

    Tony Lindgren
     

14 Dec, 2012

3 commits

  • fd62c5450   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid ... Browse Code »

    Pull HID subsystem updates from Jiri Kosina:

    1) Support for HID over I2C bus has been added by Benjamin Tissoires.
    ACPI device discovery is still in the works.

    2) Support for Win8 Multitiouch protocol is being added, most work done
    by Benjamin Tissoires as well

    3) EIO/ERESTARTSYS is fixed in hiddev/hidraw, fixes by Andrew Duggan
    and Jiri Kosina

    4) ION iCade driver added by Bastien Nocera

    5) Support for a couple new Roccat devices has been added by Stefan
    Achatz

    6) HID sensor hubs are now auto-detected instead of having to list all
    the VID/PID combinations in the blacklist array

    7) other random fixes and support for new device IDs

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (65 commits)
    HID: i2c-hid: add mutex protecting open/close race
    Revert "HID: sensors: add to special driver list"
    HID: sensors: autodetect USB HID sensor hubs
    HID: hidp: fallback to input session properly if hid is blacklisted
    HID: i2c-hid: fix ret_count check
    HID: i2c-hid: fix i2c_hid_get_raw_report count mismatches
    HID: i2c-hid: remove extra .irq field in struct i2c_hid
    HID: i2c-hid: reorder allocation/free of buffers
    HID: i2c-hid: fix memory corruption due to missing hid declaration
    HID: i2c-hid: remove superfluous include
    HID: i2c-hid: remove unneeded test in i2c_hid_remove
    HID: i2c-hid: i2c_hid_get_report may fail
    HID: i2c-hid: also call i2c_hid_free_buffers in i2c_hid_remove
    HID: i2c-hid: fix error messages
    HID: i2c-hid: fix return paths
    HID: i2c-hid: remove unused static declarations
    HID: i2c-hid: fix i2c_hid_dbg macro
    HID: i2c-hid: fix checkpatch.pl warning
    HID: i2c-hid: enhance Kconfig
    HID: i2c-hid: change I2C name
    ...

    Linus Torvalds
     
  • 046e7d685   Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound ... Browse Code »

    Pull sound updates from Takashi Iwai:
    "This update contains a fairly wide range of changes all over in sound
    subdirectory, mainly because of UAPI header moves by David and __dev*
    annotation removals by Bill. Other highlights are:

    - Introduced the support for wallclock timestamps in ALSA PCM core

    - Add the poll loop implementation for HD-audio jack detection

    - Yet more VGA-switcheroo fixes for HD-audio

    - New VIA HD-audio codec support

    - More fixes on resource management in USB audio and MIDI drivers

    - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
    Roland VG-99, etc

    - Add support for FastTrack C400 usb-audio

    - Clean ups in many drivers regarding firmware loading

    - Add PSC724 Ultiimate Edge support to ice1712

    - A few hdspm driver updates

    - New Stanton SCS.1d/1m FireWire driver

    - Standardisation of the logging in ASoC codes

    - DT and dmaengine support for ASoC Atmel

    - Support for Wolfson ADSP cores

    - New drivers for Freescale/iVeia P1022 and Maxim MAX98090

    - Lots of other ASoC driver fixes and developments"

    Fix up trivial conflicts. And go out on a limb and assume the dts file
    'status' field of one of the conflicting things was supposed to be
    "disabled", not "disable" like in pretty much all other cases.

    * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
    ALSA: hda - Move runtime PM check to runtime_idle callback
    ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
    ALSA: hda - Avoid doubly suspend after vga switcheroo
    ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
    ALSA: hda - Check validity of CORB/RIRB WP reads
    ALSA: hda - use usleep_range in link reset and change timeout check
    ALSA: HDA: VIA: Add support for codec VT1808.
    ALSA: HDA: VIA Add support for codec VT1705CF.
    ASoC: codecs: remove __dev* attributes
    ASoC: utils: remove __dev* attributes
    ASoC: ux500: remove __dev* attributes
    ASoC: txx9: remove __dev* attributes
    ASoC: tegra: remove __dev* attributes
    ASoC: spear: remove __dev* attributes
    ASoC: sh: remove __dev* attributes
    ASoC: s6000: remove __dev* attributes
    ASoC: OMAP: remove __dev* attributes
    ASoC: nuc900: remove __dev* attributes
    ASoC: mxs: remove __dev* attributes
    ASoC: kirkwood: remove __dev* attributes
    ...

    Linus Torvalds
     
  • b8edf848e   Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC multiplatform conversion patches from Olof Johansson:
    "Here are more patches in the progression towards multiplatform, sparse
    irq conversions in particular.

    Tegra has a handful of cleanups and general groundwork, but is not
    quite there yet on full enablement.

    Platforms that are enabled through this branch are VT8500 and Zynq.
    Note that i.MX was converted in one of the earlier cleanup branches as
    well (before we started a separate topic for multiplatform). And both
    new platforms for this merge window, sunxi and bcm, were merged with
    multiplatform support enabled."

    Fix up conflicts mostly as per Olof.

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: zynq: Remove all unused mach headers
    ARM: zynq: add support for ARCH_MULTIPLATFORM
    ARM: zynq: make use of debug_ll_io_init()
    ARM: zynq: remove TTC early mapping
    ARM: tegra: move debug-macro.S to include/debug
    ARM: tegra: don't include iomap.h from debug-macro.S
    ARM: tegra: decouple uncompress.h and debug-macro.S
    ARM: tegra: simplify DEBUG_LL UART selection options
    ARM: tegra: select SPARSE_IRQ
    ARM: tegra: enhance timer.c to get IO address from device tree
    ARM: tegra: enhance timer.c to get IRQ info from device tree
    ARM: timer: fix checkpatch warnings
    ARM: tegra: add TWD to device tree
    ARM: tegra: define DT bindings for and instantiate RTC
    ARM: tegra: define DT bindings for and instantiate timer
    clocksource/mtu-nomadik: use apb_pclk
    clk: ux500: Register mtu apb_pclocks
    ARM: plat-nomadik: convert platforms to SPARSE_IRQ
    mfd/db8500-prcmu: use the irq_domain_add_simple()
    mfd/ab8500-core: use irq_domain_add_simple()
    ...

    Linus Torvalds
     

13 Dec, 2012

1 commit

  • 8287361ab   Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC Header cleanups from Olof Johansson:
    "This is a collection of header file cleanups, mostly for OMAP and
    AT91, that keeps moving the platforms in the direction of
    multiplatform by removing the need for mach-dependent header files
    used in drivers and other places."

    Fix up mostly trivial conflicts as per Olof.

    * tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)
    ARM: OMAP2+: Move iommu/iovmm headers to platform_data
    ARM: OMAP2+: Make some definitions local
    ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
    ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
    ARM: OMAP2+: Move iopgtable header to drivers/iommu/
    ARM: OMAP: Merge iommu2.h into iommu.h
    atmel: move ATMEL_MAX_UART to platform_data/atmel.h
    ARM: OMAP: Remove omap_init_consistent_dma_size()
    arm: at91: move at91rm9200 rtc header in drivers/rtc
    arm: at91: move reset controller header to arm/arm/mach-at91
    arm: at91: move pit define to the driver
    arm: at91: move at91_shdwc.h to arch/arm/mach-at91
    arm: at91: move board header to arch/arm/mach-at91
    arn: at91: move at91_tc.h to arch/arm/mach-at91
    arm: at91 move at91_aic.h to arch/arm/mach-at91
    arm: at91 move board.h to arch/arm/mach-at91
    arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
    arm: at91: drop machine defconfig
    ARM: OMAP: Remove NEED_MACH_GPIO_H
    ARM: OMAP: Remove unnecessary mach and plat includes
    ...

    Linus Torvalds
     

12 Dec, 2012

1 commit

  • ad6865241   x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops ... Browse Code »

    Some MSI laptop BIOSes are broken - INT 15h code uses port 92h to enable A20
    line but resume code assumes that KBC was used.
    The laptop will not resume from S3 otherwise but powers off after a while
    and then powers on again stuck with a blank screen.

    Fix it by enabling A20 using KBC in i8042_platform_init for x86.

    Fixes https://bugzilla.kernel.org/show_bug.cgi?id=12878

    Signed-off-by: Ondrej Zary
    Cc: Dmitry Torokhov
    Cc: Alan Cox
    Cc: Rafael J. Wysocki
    Cc:
    Link: http://lkml.kernel.org/r/201212112218.06551.linux@rainbow-software.org
    Signed-off-by: H. Peter Anvin

    Ondrej Zary
     

11 Dec, 2012

2 commits

  • 55220bb3e   Input: matrix-keymap - provide proper module license ... Browse Code »

    The matrix-keymap module is currently lacking a proper module license,
    add one so we don't have this module tainting the entire kernel. This
    issue has been present since commit 1932811f426f ("Input: matrix-keymap
    - uninline and prepare for device tree support")

    Signed-off-by: Florian Fainelli
    CC: stable@vger.kernel.org # v3.5+
    Signed-off-by: Dmitry Torokhov
    Signed-off-by: Linus Torvalds

    Florian Fainelli
     
  • 516d798f6   Input: matrix-keymap - provide a proper module license ... Browse Code »

    The matrix-keymap module is currently lacking a proper module license,
    add one so we don't have this module tainting the entire kernel. This
    issue has been present since commit 1932811f (Input: matrix-keymap -
    uninline and prepare for device tree support)

    Signed-off-by: Florian Fainelli
    CC: stable@vger.kernel.org
    Signed-off-by: Dmitry Torokhov

    Florian Fainelli
     

04 Dec, 2012

5 commits

02 Dec, 2012

1 commit

30 Nov, 2012

8 commits

28 Nov, 2012

8 commits