1. 30 1月, 2015 1 次提交
  2. 24 1月, 2015 2 次提交
  3. 22 1月, 2015 2 次提交
  4. 21 1月, 2015 1 次提交
    • T
      ARM: OMAP3: Add back Kconfig option MACH_OMAP3517EVM for ASoC · 549f95ed
      Tony Lindgren 提交于
      We still have SND_OMAP_SOC_AM3517EVM depending on MACH_OMAP3517EVM,
      so let's keep MACH_OMAP3517EVM Kconfig option around for a little
      bit longer.
      
      This removes the dependency between ARM SoC changes and the ASoC
      changes, and allows the following three options for the driver:
      
      1. Update the driver for device tree based booting
      
      2. Initialize the driver with legacy platform data, then update
         the driver for device tree based booting
      
      3. Just remove the driver if there are no audio users for
         3517-evm board
      Reported-by: NPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      549f95ed
  5. 20 1月, 2015 2 次提交
  6. 15 1月, 2015 13 次提交
  7. 14 1月, 2015 5 次提交
  8. 13 1月, 2015 1 次提交
    • O
      Merge tag 'renesas-lager-board-removal-for-v3.20' of... · 63bdaa93
      Olof Johansson 提交于
      Merge tag 'renesas-lager-board-removal-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
      
      Merge "Renesas ARM Based SoC Lager Board Removal for v3.20" from Simon Horman:
      
      "The serial port rename changes are not strictly related to lager board
      removal from a feature point of view. But the lager portion of this change
      depends on board removal to avoid a regression of booting using that code,
      And thus it seems to make sense to put here. And it seems best to put the
      koelsch and lager serial port rename changes in the same branch.
      
      Likewise the removal of bootargs from lager DT depends on removing lager
      board code to avoid a regression when using it and thus I have included
      it in the same branch."
      
      * Remove legacy r8a7790 SoC and its Lager board code
      * Update serial port names on koelsch and lager boards
      * Remove console bootargs parameter from lager DT
      
      * tag 'renesas-lager-board-removal-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: lager dts: Drop console= bootargs parameter
        ARM: shmobile: koelsch: Rename SCIF[01] serial ports to ttySC[01]
        ARM: shmobile: lager: Rename SCIFA[01] serial ports to ttySC[01]
        ARM: shmobile: r8a7790: Remove legacy code
        ARM: shmobile: lager: Remove legacy board support
        ARM: shmobile: lager-reference: DTS-only board support
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      63bdaa93
  9. 12 1月, 2015 8 次提交
  10. 11 1月, 2015 3 次提交
  11. 10 1月, 2015 2 次提交
    • L
      Merge tag 'sound-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · eb749269
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "All a few small regression or stable fixes: a Nvidia HDMI ID addition,
        a regression fix for CAIAQ stream count, a typo fix for GPIO setup
        with STAC/IDT HD-audio codecs, and a Fireworks big-endian fix"
      
      * tag 'sound-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: fireworks: fix an endianness bug for transaction length
        ALSA: hda - Add new GPU codec ID 0x10de0072 to snd-hda
        ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs
        ALSA: snd-usb-caiaq: fix stream count check
      eb749269
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 28023d2a
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
      
       - bounds checking fixes in logitech and roccat drivers, from Peter Wu
         and Dan Carpenter
      
       - double-kfree fix in i2c-hid driver on bus shutdown, from Mika
         Westerberg
      
       - a couple of various small driver fixes
      
       - a few device id additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
        HID: Add a new id 0x501a for Genius MousePen i608X
        HID: logitech-hidpp: prefix the name with "Logitech"
        HID: logitech-hidpp: avoid unintended fall-through
        HID: Allow HID_BATTERY_STRENGTH to be enabled
        HID: i2c-hid: Do not free buffers in i2c_hid_stop()
        HID: add battery quirk for USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO keyboard
        HID: logitech-hidpp: check WTP report length
        HID: logitech-dj: check report length
      28023d2a