Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 440a5285 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc-next

parents b12a1906 87c19364 ad32d0c7

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Required properties: 
SSI subnode properties:

- interrupts			: Should contain SSI interrupt for PIO transfer

- shared-pin			: if shared clock pin

- pio-transfer			: use PIO transfer mode



SRC subnode properties:

no properties at this point

sound/soc/omap/omap-pcm.h→include/sound/omap-pcm.h

+0 −0

File moved.

View file

sound/soc/davinci/davinci-mcasp.c

+1 −1
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ 
#include <sound/initval.h>

#include <sound/soc.h>

#include <sound/dmaengine_pcm.h>

#include <sound/omap-pcm.h>



#include "davinci-pcm.h"

#include "davinci-mcasp.h"

#include "../omap/omap-pcm.h"



#define MCASP_MAX_AFIFO_DEPTH	64

sound/soc/omap/omap-dmic.c

+1 −1
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
#include <sound/initval.h>

#include <sound/soc.h>

#include <sound/dmaengine_pcm.h>

#include <sound/omap-pcm.h>



#include "omap-dmic.h"

#include "omap-pcm.h"



struct omap_dmic {

	struct device *dev;

sound/soc/omap/omap-hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
#include <sound/asoundef.h>

#include <sound/dmaengine_pcm.h>

#include <video/omapdss.h>

#include <sound/omap-pcm.h>



#include "omap-hdmi.h"

#include "omap-pcm.h"



#define DRV_NAME "omap-hdmi-audio-dai"