Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/mach-davinci
History
Linus Torvalds 046e7d685b Sound updates for 3.8-rc1 
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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJQyYh9AAoJEGwxgFQ9KSmk95UP+wcVXRynWulCVwEnVjjWv/UM
 2fIsD0RkWO4WoqEVCNCHzW27pvFC36uqLx5vtas4CoJ2CX8ufQsPqWTx6K3MY/DQ
 /VJT8CI2EKPQY1Q0PySVo2nBqwcUXWWoZE47t1ZowR6cxtmgrS8lLxYJvkbfEOHF
 PS8WItACqH5F5VPxGFkhPwR2OTLfaYt7ilKx82vgxSzdMAel8q/I9uS/MUv8KV+1
 1s5yBvlW5eyDXKpQbP/KiMJLJ/zk1MRAKK2HftAk8pNt+Xy160NvXhbILDWKC4uT
 QBRPqyIe8BmL3VlXpw3mn7nbeU7rSfc/Rbrnm2+Yb54/Wtj4PnV6Z6bg7HO610im
 e/tBNHoaL7qn1iNYSC3heW11rToksd03/LK0GREvkX3Bl21T+Naaun/DY/PGIfMQ
 nOXy7uVo6sVdZnN2MTWof9qeMYBSlrwQVsMde6kbYadNcXnuqUqCOx41kiAdE8t5
 jfZy5QR+uDjdJgDv8/CuiCYxSjjTUfO1tdSV/VjsTK17Gfw3DWTJpeznVnoIALbZ
 81HXYxb+uGZ8xDr0WXGkydlnPvB6bnWu2vvfrLBkioA/p60EDNCtgKo1y3NzQGh8
 P2qILNhXIRrS2EoAScQOb6F1RPsvbDN9PbihnkShX3r7DXyeynr9jgPy3L2vf0bR
 xyu0jtQiqYb34ss7qqdz
 =IIsz
 -----END PGP SIGNATURE-----

Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

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
  ...
2012-12-13 11:51:23 -08:00
..
include/mach ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
aemif.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
asp.h ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific 2012-08-27 11:12:09 -07:00
board-da830-evm.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-da850-evm.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
board-dm355-evm.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-dm355-leopard.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-dm365-evm.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-dm644x-evm.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
board-dm646x-evm.c ARM: davinci: board-dm646x-evm.c: Remove unecessary semicolon 2012-10-26 13:59:01 +05:30
board-mityomapl138.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-neuros-osd2.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-omapl138-hawk.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
board-sffsdr.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-tnetv107x-evm.c sections: fix section conflicts in arch/arm/ 2012-10-06 03:04:38 +09:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
clock.h ARM: davinci: add support for multiple power domains 2011-12-03 00:35:52 +05:30
common.c ARM: davinci: remove obsoleted init_consistent_dma_size() 2012-11-13 10:13:20 +01:00
cp_intc.c ARM: davinci: cp_intc: Add OF support for TI interrupt controller 2012-07-05 14:12:35 +05:30
cpufreq.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
cpuidle.c ARM: davinci: Fix for cpuidle consolidation changes 2012-03-22 01:19:44 -04:00
da8xx-dt.c ARM: davinci: add support for am1808 based EnBW CMC board 2012-10-29 15:43:43 +05:30
da830.c sections: fix section conflicts in arch/arm/ 2012-10-06 03:04:38 +09:00
da850.c ARM: davinci: da8xx: add DA850 PRUSS support 2012-10-27 16:28:36 +05:30
davinci.h Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
devices-da8xx.c ARM: davinci: da8xx: add DA850 PRUSS support 2012-10-27 16:28:36 +05:30
devices-tnetv107x.c ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init() 2012-10-30 14:03:31 +05:30
devices.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
dm355.c ARM: davinci: sram: switch from iotable to ioremapped regions 2012-10-27 16:28:33 +05:30
dm365.c ARM: davinci: sram: switch from iotable to ioremapped regions 2012-10-27 16:28:33 +05:30
dm644x.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
dm646x.c ARM: davinci: sram: switch from iotable to ioremapped regions 2012-10-27 16:28:33 +05:30
dma.c arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: davinci: da850: add DT boot support 2012-10-29 15:24:42 +05:30
Makefile ARM: davinci: da850: add DT boot support 2012-10-29 15:24:42 +05:30
Makefile.boot ARM: davinci: move dtb targets to common location 2012-11-19 22:25:59 -08:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
pm_domain.c ARM: davinci: add runtime PM support for clock management 2012-07-01 17:26:26 +05:30
psc.c ARM: davinci: psc: fix incorrect offsets 2011-12-05 16:47:15 +05:30
serial.c ARM: davinci: serial: provide API to initialze UART clocks 2012-10-27 16:28:31 +05:30
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c ARM: davinci: add platform hook to fetch the SRAM pool 2012-10-27 16:28:35 +05:30
time.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
tnetv107x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
usb.c ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc 2012-10-24 16:37:17 +05:30