mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
022d00ee0b
This patch fixes lpass-platform driver which was broken in v4.9-rc1.
lpass_pcm_data data structure holds information specific to stream.
Holding a single private pointer to it in global lpass_data
will not work, because it would be overwritten by for each pcm instance.
This code was breaking playback when we have both playback and capture
pcm streams, as playback settings are over written by capture settings.
Fix this by moving channel allocation logic out of pcm_new to pcm_open
so that we can store the stream specific information in private_data of
snd_pcm_runtime.
Fixes: 6adcbdcd4b ("ASoC: lpass-platform: don't use snd_soc_pcm_set_drvdata()")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
103 lines
3 KiB
C
103 lines
3 KiB
C
/*
|
|
* Copyright (c) 2010-2011,2013-2015 The Linux Foundation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* lpass.h - Definitions for the QTi LPASS
|
|
*/
|
|
|
|
#ifndef __LPASS_H__
|
|
#define __LPASS_H__
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regmap.h>
|
|
|
|
#define LPASS_AHBIX_CLOCK_FREQUENCY 131072000
|
|
#define LPASS_MAX_MI2S_PORTS (8)
|
|
#define LPASS_MAX_DMA_CHANNELS (8)
|
|
|
|
/* Both the CPU DAI and platform drivers will access this data */
|
|
struct lpass_data {
|
|
|
|
/* AHB-I/X bus clocks inside the low-power audio subsystem (LPASS) */
|
|
struct clk *ahbix_clk;
|
|
|
|
/* MI2S system clock */
|
|
struct clk *mi2s_osr_clk[LPASS_MAX_MI2S_PORTS];
|
|
|
|
/* MI2S bit clock (derived from system clock by a divider */
|
|
struct clk *mi2s_bit_clk[LPASS_MAX_MI2S_PORTS];
|
|
|
|
/* low-power audio interface (LPAIF) registers */
|
|
void __iomem *lpaif;
|
|
|
|
/* regmap backed by the low-power audio interface (LPAIF) registers */
|
|
struct regmap *lpaif_map;
|
|
|
|
/* interrupts from the low-power audio interface (LPAIF) */
|
|
int lpaif_irq;
|
|
|
|
/* SOC specific variations in the LPASS IP integration */
|
|
struct lpass_variant *variant;
|
|
|
|
/* bit map to keep track of static channel allocations */
|
|
unsigned long dma_ch_bit_map;
|
|
|
|
/* used it for handling interrupt per dma channel */
|
|
struct snd_pcm_substream *substream[LPASS_MAX_DMA_CHANNELS];
|
|
|
|
/* 8016 specific */
|
|
struct clk *pcnoc_mport_clk;
|
|
struct clk *pcnoc_sway_clk;
|
|
|
|
};
|
|
|
|
/* Vairant data per each SOC */
|
|
struct lpass_variant {
|
|
u32 i2sctrl_reg_base;
|
|
u32 i2sctrl_reg_stride;
|
|
u32 i2s_ports;
|
|
u32 irq_reg_base;
|
|
u32 irq_reg_stride;
|
|
u32 irq_ports;
|
|
u32 rdma_reg_base;
|
|
u32 rdma_reg_stride;
|
|
u32 rdma_channels;
|
|
u32 wrdma_reg_base;
|
|
u32 wrdma_reg_stride;
|
|
u32 wrdma_channels;
|
|
|
|
/**
|
|
* on SOCs like APQ8016 the channel control bits start
|
|
* at different offset to ipq806x
|
|
**/
|
|
u32 dmactl_audif_start;
|
|
u32 wrdma_channel_start;
|
|
/* SOC specific intialization like clocks */
|
|
int (*init)(struct platform_device *pdev);
|
|
int (*exit)(struct platform_device *pdev);
|
|
int (*alloc_dma_channel)(struct lpass_data *data, int direction);
|
|
int (*free_dma_channel)(struct lpass_data *data, int ch);
|
|
|
|
/* SOC specific dais */
|
|
struct snd_soc_dai_driver *dai_driver;
|
|
int num_dai;
|
|
};
|
|
|
|
/* register the platform driver from the CPU DAI driver */
|
|
int asoc_qcom_lpass_platform_register(struct platform_device *);
|
|
int asoc_qcom_lpass_cpu_platform_remove(struct platform_device *pdev);
|
|
int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev);
|
|
int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai);
|
|
extern const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops;
|
|
|
|
#endif /* __LPASS_H__ */
|