Eric Lee / smarc-fsl-linux-kernel

09 Dec, 2011

6 commits

06 Dec, 2011

3 commits

02 Dec, 2011

3 commits

  • 50f0959ad   serial: sh-sci: Handle GPIO function requests. ... Browse Code »

    This adds initial support for requesting the various GPIO functions
    necessary for certain ports. This just plugs in dumb request/free logic,
    but serves as a building block for migrating off of the ->init_pins mess
    to a wholly gpiolib backed solution (primarily parts with external
    RTS/CTS pins, but will also allow us to clean up RXD pin testing).

    Signed-off-by: Paul Mundt

    Paul Mundt
     
  • 73c3d53f3   serial: sh-sci: Avoid FIFO clear for MCE toggle. ... Browse Code »

    When toggling the MCE support we don't want to concern ourselves with the
    FIFO state, so ensure that the clearing bits are masked out when updating
    the MCE state.

    Signed-off-by: Paul Mundt

    Paul Mundt
     
  • faf02f8fe   serial: sh-sci: per-port modem control. ... Browse Code »

    The bulk of the ports do not support any sort of modem control, so
    blindly twiddling the MCE bit doesn't accomplish much. We now require
    ports to manually specify which line supports modem control signals.

    While at it, tidy up the RTS/CTSIO handling in SCSPTR parts so it's a bit
    more obvious what's going on (and without clobbering other configurations
    in the process).

    Signed-off-by: Paul Mundt

    Paul Mundt
     

30 Nov, 2011

1 commit

29 Nov, 2011

12 commits

28 Nov, 2011

6 commits

  • b7b996da2   Merge branch 'exynos-drm' of git://git.infradead.org/users/kmpark/linux-samsung into drm-fixes ... Browse Code »

    * 'exynos-drm' of git://git.infradead.org/users/kmpark/linux-samsung:
    drm/exynos: fixed wrong err ptr usage and destroy call in exeception
    drm/exynos: Add disable of manager
    drm/exynos: include linux/module.h
    drm/exynos: fix vblank bug.
    drm/exynos: changed buffer structure.
    drm/exynos: removed unnecessary variable.
    drm/exynos: use gem create function generically
    drm/exynos: checked for null pointer
    drm/exynos: added crtc dpms for disable crtc
    drm/exynos: removed meaningless parameter from fbdev update
    drm/exynos: restored kernel_fb_list when reiniting fb_helper
    drm/exynos: changed exynos_drm_display to exynos_drm_display_ops
    drm/exynos: added manager object to connector
    drm/exynos: fixed converting between display mode and timing
    drm/exynos: fixed connector flag with hpd and interlace scan for hdmi
    drm/exynos: added kms poll for handling hpd event

    Dave Airlie
     
  • 401d0069c   Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6 ... Browse Code »

    * 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6:
    viafb: correct sync polarity for OLPC DCON
    video:da8xx-fb: Disable and reset sequence on version2 of LCDC
    OMAPDSS: DISPC: skip scaling calculations when not scaling
    OMAPFB: fix compilation warnings due to missing include
    OMAPDSS: HDMI: fix returned HDMI pixel clock

    Linus Torvalds
     
  • 06718f151   ath9k: Revert change that broke AR928X on Acer Ferrari One ... Browse Code »

    Revert a hunk in drivers/net/wireless/ath/ath9k/hw.c introduced by
    commit 2577c6e8f232 ("ath9k_hw: Add support for AR946/8x chipsets") that
    caused a nasty regression to appear on my Acer Ferrari One (the box
    locks up entirely at random times after the wireless has been started
    without any way to get debug information out of it).

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Felix Fietkau
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     
  • f339240dd   Merge branch 'fix/hda' into for-linus Browse Code »
    Takashi Iwai
     
  • 187d333ed   ALSA: hda - Fix jack-detection control of VT1708 ... Browse Code »

    VT1708 has no support for unsolicited events per jack-plug, the driver
    implements the workq for polling the jack-detection. The mixer element
    "Jack Detect" was supposed to control this behavior on/off, but this
    doesn't work properly as is now. The workq is always started and the
    HP automute is always enabled.

    This patch fixes the jack-detect control behavior by triggering / stopping
    the work appropriately at the state change. Also the work checks the
    internal state to continue scheduling or not.

    Cc: [v3.1]
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • 92bb43e6a   ALSA: hda - cut and paste typo in cs420x_models[] ... Browse Code »

    The CS420X_IMAC27 was copied from the line before but CS420X_APPLE
    was clearly intented.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Takashi Iwai

    Dan Carpenter
     

27 Nov, 2011

3 commits

  • aaa0b4f00   iio: iio_event_getfd -- fix ev_int build failure ... Browse Code »

    Fix build failure in staging iio driver:

    .../drivers/staging/iio/industrialio-core.c: In function 'iio_event_getfd':
    .../drivers/staging/iio/industrialio-core.c:262:32: error:
    'ev_int' undeclared (first use in this function)

    Also convert the rest of the function to use the new variable.

    Signed-off-by: Andy Whitcroft
    Signed-off-by: Linus Torvalds

    Andy Whitcroft
     
  • ac03564f9   Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
    powerpc/44x: Add mtd ndfc to the ppx44x defconfig
    powerpc: Fix compiliation with hugetlbfs enabled
    arch/powerpc/sysdev/ehv_pic.c: add missing kfree
    powerpc/fsl-lbc: Fix for fsl_upm
    drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
    powerpc/qe: Fixup QE_General4 errata
    powerpc/85xx: Fix compile error on p3060_qds.c
    powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO'
    powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe

    Linus Torvalds
     
  • 25a236a5d   hwmon: convert drivers/hwmon/* to use module_platform_driver() ... Browse Code »

    This patch converts the drivers in drivers/hwmon/* to use the
    module_platform_driver() macro which makes the code smaller and a bit
    simpler.

    Cc: Donggeun Kim
    Cc: Simon Guinot
    Cc: Lars-Peter Clausen
    Cc: MyungJoo Ham
    Cc: Ben Dooks
    Cc: Hans de Goede
    Cc: J Keerthy
    Cc: David S. Miller
    Cc: Mark Brown
    Signed-off-by: Axel Lin
    Acked-by: Mark Brown
    Signed-off-by: Guenter Roeck

    Axel Lin
     

26 Nov, 2011

2 commits

25 Nov, 2011

4 commits

  • b52fabca3   hwmon: Remove redundant spi driver bus initialization ... Browse Code »

    In ancient times it was necessary to manually initialize the bus field of an
    spi_driver to spi_bus_type. These days this is done in spi_register_driver(),
    so we can drop the manual assignment.

    The patch was generated using the following coccinelle semantic patch:
    //
    @@
    identifier _driver;
    @@
    struct spi_driver _driver = {
    .driver = {
    - .bus = &spi_bus_type,
    },
    };
    //

    Signed-off-by: Lars-Peter Clausen
    Cc: Jean Delvare
    Cc: Guenter Roeck
    Cc: lm-sensors@lm-sensors.org
    Signed-off-by: Guenter Roeck

    Lars-Peter Clausen
     
  • 4c81f045c   ext4: fix racy use-after-free in ext4_end_io_dio() ... Browse Code »

    ext4_end_io_dio() queues io_end->work and then clears iocb->private;
    however, io_end->work calls aio_complete() which frees the iocb
    object. If that slab object gets reallocated, then ext4_end_io_dio()
    can end up clearing someone else's iocb->private, this use-after-free
    can cause a leak of a struct ext4_io_end_t structure.

    Detected and tested with slab poisoning.

    [ Note: Can also reproduce using 12 fio's against 12 file systems with the
    following configuration file:

    [global]
    direct=1
    ioengine=libaio
    iodepth=1
    bs=4k
    ba=4k
    size=128m

    [create]
    filename=${TESTDIR}
    rw=write

    -- tytso ]

    Google-Bug-Id: 5354697
    Signed-off-by: Tejun Heo
    Signed-off-by: "Theodore Ts'o"
    Reported-by: Kent Overstreet
    Tested-by: Kent Overstreet
    Cc: stable@kernel.org

    Tejun Heo
     
  • 49e44064d   powerpc/44x: Add mtd ndfc to the ppx44x defconfig ... Browse Code »

    Signed-off-by: Tony Breeds
    Acked-by: Josh Boyer
    Signed-off-by: Benjamin Herrenschmidt

    Tony Breeds
     
  • 13020be8b   powerpc: Fix compiliation with hugetlbfs enabled ... Browse Code »

    arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
    arch/powerpc/mm/hugetlbpage.c:312:2: error: implicit declaration of function 'parse_args'

    Signed-off-by: Kumar Gala
    Signed-off-by: Benjamin Herrenschmidt

    Kumar Gala