Permalink
Commits on Aug 1, 2013
  1. Makefile: Build a uImage with dtb already appended

    glikely committed with sumananna Apr 24, 2012
    Do not commit to mainline; this is a useful hack only for now.
    
    Signed-off-by: R Sricharan <r.sricharan@ti.com>
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
  2. HACK: tidspbridge: enable the build for testing

    sumananna committed May 17, 2013
    Signed-off-by: Suman Anna <s-anna@ti.com>
  3. ARM: dts: AM33xx: Add mailbox node

    sumananna committed Apr 23, 2013
    The mailbox DT node data has been added for AM33xx device, with
    information added currently only for communicating with WkupM3
    processor. The usr_id value in the DT node reflects the value
    used for MPU like the rest of the SoCs. The driver logic will
    be adjusted to account for the WkupM3 usr_id within the code.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  4. mailbox/omap: add code to support the wkupm3 operations

    sumananna committed Jul 29, 2013
    The WkupM3 mailbox used for triggering PM operations such as suspend
    and resume on AM33x/AM43x is special in that the M3 processor cannot
    access the mailbox registers. However, an interrupt is needed to be
    sent to request the M3 to perform a desired PM operation. This patch
    adds the support for this special mailbox through separate ops for
    this mailbox.
    
    NOTE: The current patch assigns the new controller ops for all links
          on AM33x/AM43x that uses a WkupM3 mailbox with logic adjusted
          for non-WkupM3 mailboxes. This may be a bit inelegant, but a
          newer version of mailbox framework is expected to have ops per
          link, which should improve the code a bit.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
Commits on Jul 29, 2013
  1. mailbox/omap: adapt to the new mailbox API & framework

    sumananna committed Feb 2, 2013
    The OMAP mailbox driver and its existing clients (remoteproc
    for OMAP4+ and TI DSP/Bridge for OMAP3) are adapted to use
    the generic mailbox framework.
    
    The main changes for the adaptation are:
      - The generic OMAP mailbox driver module is absorbed into the
        individual modules for OMAP1 and OMAP2+ (no more omap-mailbox.ko)
        The file is reused for supplying the common functionality between
        OMAP1 and OMAP2.
      - The tasklet used for Tx is replaced with the state machine from
        the generic mailbox framework. The workqueue used for processing
        the received messages stays intact for minimizing the effects on
        the mailbox clients.
      - The existing omap_mbox_ops are pruned to supply the abstraction to
        the common layer. This functionality is achieved through the
        ipc_link_ops from the new framework.
      - The remoteproc and tidspbridge drivers (current clients) are adapted
        to use the new API. The notifier callbacks used within these clients
        are replaced with the regular callbacks from the newer framework.
      - The exported OMAP mailbox API are limited to omap_mbox_save_ctx,
        omap_mbox_restore_ctx, omap_mbox_enable_irq & omap_mbox_disable_irq.
        The first 2 will be removed when the OMAP mailbox driver is adapted
        to runtime_pm.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  2. mailbox: move the internal definitions into a private file

    sumananna committed May 16, 2013
    This is needed for extracting the omap_mbox. The OMAP mailbox
    code has a need for exporting some pre-existing API to not
    break the current clients.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  3. mailbox: pl320: Introduce common API driver

    Jassi Brar committed with sumananna Apr 26, 2013
    Convert the PL320 controller driver to work with the common
    mailbox API. Also convert the only user of PL320, highbank-cpufreq.c
    to work with thee API. Drop the obsoleted driver pl320-ipc.c
    
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
  4. mailbox: Introduce a new common API

    Jassi Brar committed with sumananna Apr 26, 2013
    Introduce common framework for client/protocol drivers and
    controller drivers of Inter-Processor-Communication (IPC).
    
    Client driver developers should have a look at
     include/linux/mailbox_client.h to understand the part of
    the API exposed to client drivers.
    Similarly controller driver developers should have a look
    at include/linux/mailbox_controller.h
    
    Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
  5. mailbox: rename pl320-ipc specific mailbox.h

    sumananna committed Mar 6, 2013
    The patch 3005867 "ARM / highbank: add support for pl320 IPC"
    added a pl320 IPC specific header file as a generic mailbox.h.
    This file has been renamed appropriately to allow the
    introduction of the generic mailbox API framework.
    
    Acked-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
    Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
  6. mailbox/omap: remove omap_mbox_type_t from mailbox ops

    sumananna committed May 13, 2013
    The type definition omap_mbox_type_t used for distinguishing
    OMAP1 from OMAP2+ mailboxes does not really belong to the
    ops, and has been cleaned up.
    
    Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
  7. ARM: dts: OMAP5: Add mailbox dt node

    sumananna committed Jul 22, 2013
    Add the mailbox device DT node for OMAP5 SoC.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  8. ARM: OMAP5: hwmod data: Add mailbox data

    sumananna committed Jul 22, 2013
    Add the hwmod data for the mailbox IP in OMAP5 SoC.
    This is needed to be able to enable the OMAP mailbox
    support for OMAP5.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  9. ARM: dts: OMAP2+: Add mailbox nodes

    sumananna committed Apr 23, 2013
    The mailbox DT node data has been added for OMAP2420,
    OMAP2430, OMAP3430/OMAP3630, OMAP44xx devices. Data
    for OMAP5 and other SoCs will be added separately.
    
    The mailbox static device initialization logic is also
    adjusted for a DT boot.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  10. mailbox/omap: add support for parsing dt devices

    sumananna committed Apr 25, 2013
    Logic has been added to the OMAP2+ mailbox code to
    parse the mailbox dt nodes and construct the different
    mailboxes associated with the instance. The design is
    based on gathering the same information that was being
    passed previously through the platform data, except for
    the interrupt type configuration information.
    
    Signed-off-by: Suman Anna <s-anna@ti.com>
  11. mailbox/omap: add a parent structure common to all mboxes

    sumananna committed May 15, 2013
    A new structure, omap_mbox_device, is added to contain
    the global variables pertinent to a mailbox h/w IP block.
    This enables the support for having multiple instances of
    the same h/w IP block in the SoC. The startup sequence for
    each mailbox is also simplified along the way, removing the
    usage of single global configuration variables for all h/w
    instances.
    
    Reviewed-by: Russ Dill <russ.dill@ti.com>
    Signed-off-by: Suman Anna <s-anna@ti.com>
  12. Linux 3.11-rc3

    torvalds committed Jul 29, 2013
  13. Merge tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux…

    torvalds committed Jul 29, 2013
    …/kernel/git/linusw/linux-pinctrl
    
    Pull pin control fixes from Linus Walleij:
     - Driver fixes for AM33xx, SIRF and PFC pin controllers
     - Fix a compile warning from the pinctrl single-register driver
     - Fix a little nasty memory leak
    
    * tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl: fix a memleak when freeing maps
      pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM
      pinctrl: sh-pfc: fix SDHI0 VccQ regulator on sh73a0 with DT
      arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
      pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
      pinctrl: sirf: fix the pin number and mux bit for usp0
      pinctrl: am33xx dt binding: correct include path
  14. Merge tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linu…

    torvalds committed Jul 29, 2013
    …x/kernel/git/rostedt/linux-trace
    
    Pull tracing fixes from Steven Rostedt:
     "Oleg is working on fixing a very tight race between opening a event
      file and deleting that event at the same time (both must be done as
      root).
    
      I also found a bug while testing Oleg's patches which has to do with a
      race with kprobes using the function tracer.
    
      There's also a deadlock fix that was introduced with the previous
      fixes"
    
    * tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      tracing: Remove locking trace_types_lock from tracing_reset_all_online_cpus()
      ftrace: Add check for NULL regs if ops has SAVE_REGS set
      tracing: Kill trace_cpu struct/members
      tracing: Change tracing_fops/snapshot_fops to rely on tracing_get_cpu()
      tracing: Change tracing_entries_fops to rely on tracing_get_cpu()
      tracing: Change tracing_stats_fops to rely on tracing_get_cpu()
      tracing: Change tracing_buffers_fops to rely on tracing_get_cpu()
      tracing: Change tracing_pipe_fops() to rely on tracing_get_cpu()
      tracing: Introduce trace_create_cpu_file() and tracing_get_cpu()
  15. Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Jul 29, 2013
    …it/jejb/scsi
    
    Pull SCSI fixes from James Bottomley:
     "This is five bug fixes, two of which fix long standing problems
      causing crashes (sd and mvsas).  The remaining three are hung (isci
      race) or lost (qla2xxx, isci) devices"
    
    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
      [SCSI] isci: fix breakage caused by >16byte CDB patch
      [SCSI] mvsas: Fix kernel panic on tile due to unaligned data access
      [SCSI] sd: fix crash when UA received on DIF enabled device
      [SCSI] qla2xxx: Properly set the tagging for commands.
      [SCSI] isci: Fix a race condition in the SSP task management path
Commits on Jul 26, 2013
  1. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds committed Jul 26, 2013
    Pull drm fixes from Dave Airlie:
     "This is just a regular fixes pull apart from the qxl one, it has
      radeon and intel bits in it,
    
      The intel fixes are for a regression with the RC6 fix and a 3.10 hdmi
      regression, whereas radeon is more DPM fixes, a few lockup fixes and
      some rn50/r100 DAC fixes"
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/radeon/dpm: fix r600_enable_sclk_control()
      drm/radeon/dpm: implement force performance levels for rv6xx
      drm/radeon/dpm: fix displaygap programming on rv6xx
      drm/radeon/dpm: fix a typo in the rv6xx mclk setup
      drm/i915: initialize gt_lock early with other spin locks
      drm/i915: fix hdmi portclock limits
      drm/radeon: fix combios tables on older cards
      drm/radeon: improve dac adjust heuristics for legacy pdac
      drm/radeon: Another card with wrong primary dac adj
      drm/radeon: fix endian issues with DP handling (v3)
      drm/radeon/vm: only align the pt base to 32k
      drm/radeon: wait for 3D idle before using CP DMA
  2. Merge branch 'qxl-fixes' of git://people.freedesktop.org/~airlied/linux

    torvalds committed Jul 26, 2013
    Pull qxl drm fixes from Dave Airlie:
     "Okay as I warned, the qxl driver was running a bit free and loose with
      its ttm object reservations and the new lockdep enabled reservation
      tracking shone a bright light into it, it also with the new
      reservations mutexes hits a possible deadlock during boot.
    
      The first patch is a real fix to render the console correctly as the
      driver used to just drop irq renderering as too hard, this also fixes
      a sleeping while atomic warning.
    
      The other two patches are the big ugly ones that redo how the driver
      allocates objects and reserves them and makes things all work
      properly, I've tested this in a VM, and compared to the current code
      which hits a lockdep warning and the sleep while atomic warning before
      failing.
    
      So sorry this is coming in late, I should have tested qxl before
      merging the mutex code, but I'd rather just fix qxl with this than
      revert the reservations code at this point"
    
    * 'qxl-fixes' of git://people.freedesktop.org/~airlied/linux:
      qxl: convert qxl driver to proper use for reservations
      qxl: allow creation of pre-pinned objects and use for releases.
      drm/qxl: add delayed fb operations
  3. Merge tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds committed Jul 26, 2013
    …rnel/git/rafael/linux-pm
    
    Pull ACPI and power management fixes from Rafael Wysocki:
     "These are just two fixes, a revert of the would-be backlight fix that
      didn't work and an intel_pstate fix for two problems related to
      maximum P-state selection.
    
      Specifics:
    
       - Revert of the ACPI video commit that I hoped would help fix
         backlight problems related to Windows 8 compatibility on some
         systems.  Unfortunately, it turned out to cause problems to happen
         too.
    
       - Fix for two problems in intel_pstate, a possible failure to respond
         to a load change on a quiet system and a possible failure to select
         the highest available P-state on some systems.  From Dirk
         Brandewie"
    
    * tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
      cpufreq / intel_pstate: Change to scale off of max P-state
  4. Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jul 26, 2013
    …/git/cmarinas/linux-aarch64
    
    Pull arm64 fixes from Catalin Marinas:
     - Stack size increased to 16K (similar to other 64-bit architectures)
     - Additional cache flushing for secondary CPUs boot mode
    
    * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
      arm64: Change kernel stack size to 16K
      arm64: Fix definition of arm_pm_restart to match the declaration
      arm64: virt: ensure visibility of __boot_cpu_mode
  5. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds committed Jul 26, 2013
    …nel/git/arm/arm-soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "This is a largeish batch of fixes, mostly because I missed -rc2 due to
      travel/vacation.  So in number these are a bit more than ideal unless
      you amortize them over two -rcs.
    
      Quick breakdown:
       - Defconfig updates
         - Making multi_v7_defconfig useful on more hardware to encourage
           single-image usage
         - Davinci and nomadik updates due to new code merged this merge
           window
       - Fixes for UART on Samsung platforms, both PM and clock-related
       - A handful of warning fixes from defconfig builds, including for
         max8925 backlight and pxamci (both with appropriate acks)
       - Exynos5440 fixes for LPAE configuration, PM
       - ...plus a bunch of other smaller changes all over the place
    
      I expect to switch to regressions-or-severe-bugs-only fixes from here
      on out"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
      mfd: max8925: fix dt code for backlight
      ARM: omap5: Only select errata 798181 if SMP
      ARM: EXYNOS: Update CONFIG_ARCH_NR_GPIO for Exynos
      ARM: EXYNOS: Fix low level debug support
      ARM: SAMSUNG: Save/restore only selected uart's registers
      ARM: SAMSUNG: Add SAMSUNG_PM config option to select pm
      ARM: S3C24XX: Add missing clkdev entries for s3c2440 UART
      ARM: multi_v7_defconfig: Select USB chipidea driver
      ARM: pxa: propagate errors from regulator_enable() to pxamci
      ARM: zynq: fix compilation warning
      ARM: keystone: fix compilation warning
      ARM: highbank: Only touch common coherency control register fields
      ARM: footbridge: fix overlapping PCI mappings
      dmaengine: shdma: fix a build failure on platforms with no DMA support
      ARM: STi: Set correct ARM ERRATAs.
      ARM: dts: STi: Fix pinconf setup for STiH416 serial2
      ARM: nomadik: configure for NO_HZ and HRTIMERS
      ARM: nomadik: update defconfig base
      ARM: nomadik: Update MMC defconfigs
      ARM: davinci: defconfig: enable EDMA driver
      ...
  6. Merge tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jul 26, 2013
    …/git/gregkh/usb
    
    Pull USB fixes from Greg KH:
     "Here are a number of USB fixes for 3.11-rc3.
    
      Lots of little things, nothing major.  A number of new device ids,
      build fixes for DMA, and a bunch of other minor things.  All of these
      have been in the linux-next tree"
    
    * tag 'usb-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
      usb: Clear both buffers when clearing a control transfer TT buffer.
      usb/gadget: free opts struct on error recovery
      USB: mos7840: fix memory leak in open
      usb: serial: option.c: remove ONDA MT825UP product ID fromdriver
      usb: serial: option: add Olivetti Olicard 200
      usb: serial: option: blacklist ONDA MT689DC QMI interface
      xhci: fix null pointer dereference on ring_doorbell_for_active_rings
      usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
      usb: fix build warning in pci-quirks.h when CONFIG_PCI is not enabled
      usb: xhci: Mark two functions __maybe_unused
      xhci: Avoid NULL pointer deref when host dies.
      usb: serial: option: Add ONYX 3G device support
      USB: ti_usb_3410_5052: fix dynamic-id matching
      usb: option: add TP-LINK MA260
      USB: option: add D-Link DWM-152/C1 and DWM-156/C1
      USB: EHCI: Fix resume signalling on remote wakeup
      USB: cp210x: add MMB and PI ZigBee USB Device Support
      usb: cp210x support SEL C662 Vendor/Device
      USB: option: append Petatel NP10T device to GSM modems list
      USB: misc: Add Manhattan Hi-Speed USB DVI Converter to sisusbvga
      ...
  7. Merge tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Jul 26, 2013
    …/git/gregkh/tty
    
    Pull tty/serial fixes from Greg KH:
     "Here are 3 fixes for TTY and serial issues that have been reported.
      Nothing huge, but nice to get fixed"
    
    * tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
      serial: tegra: correct help message in Kconfig from 'ttyHS' to 'ttyTHS'
      tty/8250_early: Don't truncate last character of options
      TTY: snyclinkmp: calculating wrong addresses
  8. Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds committed Jul 26, 2013
    …rnel/git/gregkh/staging
    
    Pull staging fixes from Greg KH:
     "Here are some tiny drivers/staging/ fixes for 3.11-rc3
    
      A number of bugfixes, all pretty tiny, but resolve issues that have
      been reported (the kstrtos32 change fixes a data corruption problem
      that Dan found).  And a MAINTAINERS file update for the comedi
      drivers"
    
    * tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      MAINTAINERS: Update the list of maintainers for staging/comedi driver.
      staging: tidspbridge: replace strict_strtol() with kstrtos32()
      staging: android: logger: Correct write offset reset on error
      staging: zram: protect zram_reset_device() call
      staging: gdm72xx: potential use after free in send_qos_list()
      staging: drm/imx: drop "select OF_VIDEOMODE"
      staging: frontier: use after free in disconnect()
      staging: comedi: fix a race between do_cmd_ioctl() and read/write
      staging: comedi: COMEDI_CANCEL ioctl should wake up read/write
  9. Merge tag 'char-misc-3.11-rc3' of git://git.kernel.org/pub/scm/linux/…

    torvalds committed Jul 26, 2013
    …kernel/git/gregkh/char-misc
    
    Pull char/misc patches from Greg KH:
     "Here are some char/misc patches for 3.11-rc3.  It's pretty much just:
       - mei fixes
       - hyperv fixes
       - new ja_JP translation update
      all tiny stuff, but fixes for issues people have reported."
    
    * tag 'char-misc-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
      HOWTO ja_JP sync
      mei: me: fix waiting for hw ready
      mei: don't have to clean the state on power up
      mei: me: fix reset state machine
      mei: hbm: fix typo in error message
      Tools: hv: KVP: Fix a bug in IPV6 subnet enumeration
      Drivers: hv: balloon: Do not post pressure status if interrupted
      Drivers: hv: balloon: Fix a bug in the hot-add code
      Drivers: hv: vmbus: incorrect device name is printed when child device is unregistered
  10. Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds committed Jul 26, 2013
    …it/tiwai/sound
    
    Pull sound fixes from Takashi Iwai:
     "Just a handful of regression and small fixes in ASoC, HD-audio and
      USB-audio drivers.
    
       - Sigmetal HD-audio codec regression fixes
       - A copule of XRUN indication fixes for usb-audio devices
       - ASoC: ep93xx build fix, sgtl5000 fix for probe order changes,
         max98088 register access fix, etc"
    
    * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
      ALSA: hiface: return correct XRUN indication
      ASoC: tegra: correct playback_dma_data setup
      ASoC: core: double free in snd_soc_add_platform()
      ALSA: usb-audio: 6fire: return correct XRUN indication
      ASoC: ep93xx: fix build of ep93xx-ac97.c
      ALSA: hda - Remove NO_PRESENCE bit override for Dell 1420n Laptop
      ALSA: hda - Fix EAPD GPIO control for Sigmatel codecs
      ASoC: atmel-ssc: remove clk_disable_unprepare call from critical section
      ASoC: sgtl5000: defer the probe if clock is not found
      ASoC: max98088 - fix element type of the register cache.
  11. Merge tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs

    torvalds committed Jul 26, 2013
    Pull xfs fix from Ben Myers:
     "Fix for regression in commit cca9f93 ("xfs: don't do IO when
      creating an new inode"), recovery causing filesystem corruption after
      a crash"
    
    * tag 'for-linus-v3.11-rc3' of git://oss.sgi.com/xfs/xfs:
      xfs: di_flushiter considered harmful
  12. Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

    torvalds committed Jul 26, 2013
    Pull nfsd fix from Bruce Fields:
     "One more nfsd bugfix for 3.11"
    
    * 'for-3.11' of git://linux-nfs.org/~bfields/linux:
      nfsd: nfsd_open: when dentry_open returns an error do not propagate as struct file
  13. Merge tag 'md/3.11-fixes' of git://neil.brown.name/md

    torvalds committed Jul 26, 2013
    Pull md fixes from Neil Brown:
     "Two more bugfixes for md in 3.11
    
      Both marked for -stable, both since 3.3.  I guess I should spend more
      time testing..."
    
    * tag 'md/3.11-fixes' of git://neil.brown.name/md:
      md/raid5: fix interaction of 'replace' and 'recovery'.
      md/raid10: remove use-after-free bug.
  14. Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed Jul 26, 2013
    …ernel/git/tj/libata
    
    Pull libata fixes from Tejun Heo:
     "Assorted libata updates.
    
      The most critical one is a fix for ahci oops during boot.  Also, a new
      smallish platform ahci driver is added and sata_inic162x is marked
      clearly as experimental (it whines during boot too) as data corruption
      seems rather common on the device and it's unlikely to get any love in
      the foreseeable future.  If the whining doesn't draw any attention, I
      think we'd probably be better of making the driver depend on BROKEN in
      a couple releases"
    
    This is v2 of this pull request with fixed dependencies for ahci_imx.
    
    * 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
      ahci_imx: depend on CONFIG_MFD_SYSCON
      ahci_imx: add ahci sata support on imx platforms
      ARM: imx6q: update the sata bits definitions of gpr13
      ahci: fix Null pointer dereference in achi_host_active()
      libata: make it clear that sata_inic162x is experimental
      libata: replace strict_strtol() with kstrtol()
      ata: Fix DVD not dectected at some platform with Wellsburg PCH
  15. Revert "ACPI / video / i915: No ACPI backlight if firmware expects Wi…

    Rafael J. Wysocki committed Jul 25, 2013
    …ndows 8"
    
    We attempted to address a regression introduced by commit a57f7f9
    (ACPICA: Add Windows8/Server2012 string for _OSI method.) after which
    ACPI video backlight support doesn't work on a number of systems,
    because the relevant AML methods in the ACPI tables in their BIOSes
    become useless after the BIOS has been told that the OS is compatible
    with Windows 8.  That problem is tracked by the bug entry at:
    
    https://bugzilla.kernel.org/show_bug.cgi?id=51231
    
    Commit 8c5bd7a (ACPI / video / i915: No ACPI backlight if firmware
    expects Windows 8) introduced for this purpose essentially prevented
    the ACPI backlight support from being used if the BIOS had been told
    that the OS was compatible with Windows 8 and the i915 driver was
    loaded, in which case the backlight would always be handled by i915.
    Unfortunately, however, that turned out to cause problems with
    backlight to appear on multiple systems with symptoms indicating that
    i915 was unable to control the backlight on those systems as
    expected.
    
    For this reason, revert commit 8c5bd7a, but leave the function
    acpi_video_backlight_quirks() introduced by it, because another
    commit on top of it uses that function.
    
    References: https://lkml.org/lkml/2013/7/21/119
    References: https://lkml.org/lkml/2013/7/22/261
    References: https://lkml.org/lkml/2013/7/23/429
    References: https://lkml.org/lkml/2013/7/23/459
    References: https://lkml.org/lkml/2013/7/23/81
    References: https://lkml.org/lkml/2013/7/24/27
    Reported-and-tested-by: James Hogan <james@albanarts.com>
    Reported-and-tested-by: Kamal Mostafa <kamal@canonical.com>
    Reported-and-tested-by: Jörg Otte <jrg.otte@gmail.com>
    Reported-and-tested-by: Steven Newbury <steve@snewbury.org.uk>
    Reported-by: Martin Steigerwald <Martin@lichtvoll.de>
    Reported-by: Kalle Valo <kvalo@adurom.com>
    Tested-by: Joerg Platte <jplatte@naasa.net>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  16. ahci_imx: depend on CONFIG_MFD_SYSCON

    htejun committed Jul 26, 2013
    ahci_imx makes use of regmap but the dependency wasn't specified in
    Kconfig leading build failures if CONFIG_AHCI_IMX is enabled but
    CONFIG_MFD_SYSCON is not.  Add the Kconfig dependency.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>