1
0
Fork 0
alistair23-linux/sound/soc/pxa
Linus Torvalds 8ceafbfa91 Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
Pull DMA mask updates from Russell King:
 "This series cleans up the handling of DMA masks in a lot of drivers,
  fixing some bugs as we go.

  Some of the more serious errors include:
   - drivers which only set their coherent DMA mask if the attempt to
     set the streaming mask fails.
   - drivers which test for a NULL dma mask pointer, and then set the
     dma mask pointer to a location in their module .data section -
     which will cause problems if the module is reloaded.

  To counter these, I have introduced two helper functions:
   - dma_set_mask_and_coherent() takes care of setting both the
     streaming and coherent masks at the same time, with the correct
     error handling as specified by the API.
   - dma_coerce_mask_and_coherent() which resolves the problem of
     drivers forcefully setting DMA masks.  This is more a marker for
     future work to further clean these locations up - the code which
     creates the devices really should be initialising these, but to fix
     that in one go along with this change could potentially be very
     disruptive.

  The last thing this series does is prise away some of Linux's addition
  to "DMA addresses are physical addresses and RAM always starts at
  zero".  We have ARM LPAE systems where all system memory is above 4GB
  physical, hence having DMA masks interpreted by (eg) the block layers
  as describing physical addresses in the range 0..DMAMASK fails on
  these platforms.  Santosh Shilimkar addresses this in this series; the
  patches were copied to the appropriate people multiple times but were
  ignored.

  Fixing this also gets rid of some ARM weirdness in the setup of the
  max*pfn variables, and brings ARM into line with every other Linux
  architecture as far as those go"

* 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm: (52 commits)
  ARM: 7805/1: mm: change max*pfn to include the physical offset of memory
  ARM: 7797/1: mmc: Use dma_max_pfn(dev) helper for bounce_limit calculations
  ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations
  ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
  ARM: 7794/1: block: Rename parameter dma_mask to max_addr for blk_queue_bounce_limit()
  ARM: DMA-API: better handing of DMA masks for coherent allocations
  ARM: 7857/1: dma: imx-sdma: setup dma mask
  DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks
  DMA-API: dcdbas: update DMA mask handing
  DMA-API: dma: edma.c: no need to explicitly initialize DMA masks
  DMA-API: usb: musb: use platform_device_register_full() to avoid directly messing with dma masks
  DMA-API: crypto: remove last references to 'static struct device *dev'
  DMA-API: crypto: fix ixp4xx crypto platform device support
  DMA-API: others: use dma_set_coherent_mask()
  DMA-API: staging: use dma_set_coherent_mask()
  DMA-API: usb: use new dma_coerce_mask_and_coherent()
  DMA-API: usb: use dma_set_coherent_mask()
  DMA-API: parport: parport_pc.c: use dma_coerce_mask_and_coherent()
  DMA-API: net: octeon: use dma_coerce_mask_and_coherent()
  DMA-API: net: nxp/lpc_eth: use dma_coerce_mask_and_coherent()
  ...
2013-11-14 07:55:21 +09:00
..
Kconfig ALSA: move dmaengine implementation from ASoC to ALSA core 2013-08-15 11:18:09 +01:00
Makefile ASoC: remove saarb and tavorevb3 machine drivers 2013-05-15 08:59:29 +04:00
brownstone.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
corgi.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
e740_wm9705.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
e750_wm9705.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
e800_wm9712.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
em-x270.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
hx4700.c ASoC: pxa/hx4700: remove __dev* attributes 2012-12-10 00:29:59 +09:00
imote2.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
magician.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
mioa701_wm9713.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
mmp-pcm.c sound/soc/pxa/mmp-pcm.c: use gen_pool_dma_alloc() to allocate dma buffer 2013-11-13 12:09:23 +09:00
mmp-sspa.c ASoC: mmp-sspa: Use devm_snd_soc_register_component 2013-09-19 14:57:38 +01:00
mmp-sspa.h ASoC: mmp: add sspa support 2012-06-13 13:13:39 +01:00
palm27x.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
poodle.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
pxa-ssp.c ASoC: pxa: pxa-ssp: set dma filter data from startup hook 2013-08-15 11:29:07 +01:00
pxa-ssp.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-ac97.c ALSA: ASoC: pxa: fix pxa2xx-ac97 DAI initialization order 2013-10-18 00:35:00 +01:00
pxa2xx-ac97.h ASoC: pxa2xx: fixup multi-platform AC'97 build failures 2013-06-29 13:24:29 +01:00
pxa2xx-i2s.c ASoC: pxa: Use WARN_ON() instead of BUG_ON() 2013-11-07 19:55:15 +00:00
pxa2xx-i2s.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-pcm.c DMA-API: sound: fix dma mask handling in a lot of drivers 2013-10-31 14:48:47 +00:00
raumfeld.c ASoC: Remove unnecessary -codec from cs4270 driver name 2012-02-28 12:35:20 +00:00
spitz.c ASoC: Change spitz_ext_control to take dapm as argument. 2012-02-17 08:09:33 -08:00
tosa.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
ttc-dkb.c ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers 2013-10-18 00:35:00 +01:00
z2.c ASoC: Convert z2 to table based DAPM init 2012-01-02 13:08:38 +00:00
zylonite.c ASoC: Fix double assignment of .owner in struct snd_soc_card 2013-06-14 11:00:03 +01:00