diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:46 +0100 |
| commit | 5388d48047def3c30e42c7ba86c3c9ff0d2bd40c (patch) | |
| tree | 47ac60125f77315234f847722da0c426fb6e88b4 /include | |
| parent | 8a8b0e874a09e021e3d3ae1f1fb07cc926bf6dcb (diff) | |
| parent | a1ce31388dfc954fa034e5e840f7323a81cb9e90 (diff) | |
| download | lwn-5388d48047def3c30e42c7ba86c3c9ff0d2bd40c.tar.gz lwn-5388d48047def3c30e42c7ba86c3c9ff0d2bd40c.zip | |
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pxa2xx_ssp.h | 11 | ||||
| -rw-r--r-- | include/sound/pxa2xx-lib.h | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 467cc6307b62..49444203328a 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -21,6 +21,8 @@ #include <linux/list.h> #include <linux/io.h> +#include <linux/of.h> + /* * SSP Serial Port Registers @@ -190,6 +192,8 @@ struct ssp_device { int irq; int drcmr_rx; int drcmr_tx; + + struct device_node *of_node; }; /** @@ -218,11 +222,18 @@ static inline u32 pxa_ssp_read_reg(struct ssp_device *dev, u32 reg) #ifdef CONFIG_ARCH_PXA struct ssp_device *pxa_ssp_request(int port, const char *label); void pxa_ssp_free(struct ssp_device *); +struct ssp_device *pxa_ssp_request_of(const struct device_node *of_node, + const char *label); #else static inline struct ssp_device *pxa_ssp_request(int port, const char *label) { return NULL; } +static inline struct ssp_device *pxa_ssp_request_of(const struct device_node *n, + const char *name) +{ + return NULL; +} static inline void pxa_ssp_free(struct ssp_device *ssp) {} #endif diff --git a/include/sound/pxa2xx-lib.h b/include/sound/pxa2xx-lib.h index 2fd3d251d9a5..56e818e4a1cb 100644 --- a/include/sound/pxa2xx-lib.h +++ b/include/sound/pxa2xx-lib.h @@ -6,13 +6,6 @@ /* PCM */ -struct pxa2xx_pcm_dma_params { - char *name; /* stream identifier */ - u32 dcmd; /* DMA descriptor dcmd field */ - volatile u32 *drcmr; /* the DMA request channel to use */ - u32 dev_addr; /* device physical address for DMA */ -}; - extern int __pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params); extern int __pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream); |