leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/fsl', 'asoc/topic/gpio-chip' and 'asoc/topic/hdmi' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2016-09-29 12:44:24 -07:00
commit ee61b89298
12 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/hdac_hdmi.c
View File

@ -614,7 +614,7 @@ static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
(!pin->eld.eld_valid)) { (!pin->eld.eld_valid)) {
dev_warn(&hdac->hdac.dev, dev_warn(&hdac->hdac.dev,
"Failed: montior present? %d ELD valid?: %d for pin: %d\n", "Failed: monitor present? %d ELD valid?: %d for pin: %d\n",
pin->eld.monitor_present, pin->eld.eld_valid, pin->nid); pin->eld.monitor_present, pin->eld.eld_valid, pin->nid);
return 0; return 0;

2
sound/soc/codecs/rt5677.c
View File

@ -4657,7 +4657,7 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)
return regmap_irq_get_virq(data, irq); return regmap_irq_get_virq(data, irq);
} }
static struct gpio_chip rt5677_template_chip = { static const struct gpio_chip rt5677_template_chip = {
.label = "rt5677", .label = "rt5677",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.direction_output = rt5677_gpio_direction_out, .direction_output = rt5677_gpio_direction_out,

2
sound/soc/codecs/wm5100.c
View File

@ -2285,7 +2285,7 @@ static int wm5100_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
(1 << WM5100_GP1_DIR_SHIFT)); (1 << WM5100_GP1_DIR_SHIFT));
} }
static struct gpio_chip wm5100_template_chip = { static const struct gpio_chip wm5100_template_chip = {
.label = "wm5100", .label = "wm5100",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.direction_output = wm5100_gpio_direction_out, .direction_output = wm5100_gpio_direction_out,

2
sound/soc/codecs/wm8903.c
View File

@ -1830,7 +1830,7 @@ static void wm8903_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
!!value << WM8903_GP1_LVL_SHIFT); !!value << WM8903_GP1_LVL_SHIFT);
} }
static struct gpio_chip wm8903_template_chip = { static const struct gpio_chip wm8903_template_chip = {
.label = "wm8903", .label = "wm8903",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.request = wm8903_gpio_request, .request = wm8903_gpio_request,

2
sound/soc/codecs/wm8962.c
View File

@ -3357,7 +3357,7 @@ static int wm8962_gpio_direction_out(struct gpio_chip *chip,
return 0; return 0;
} }
static struct gpio_chip wm8962_template_chip = { static const struct gpio_chip wm8962_template_chip = {
.label = "wm8962", .label = "wm8962",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.request = wm8962_gpio_request, .request = wm8962_gpio_request,

2
sound/soc/codecs/wm8996.c
View File

@ -2184,7 +2184,7 @@ static int wm8996_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
(1 << WM8996_GP1_DIR_SHIFT)); (1 << WM8996_GP1_DIR_SHIFT));
} }
static struct gpio_chip wm8996_template_chip = { static const struct gpio_chip wm8996_template_chip = {
.label = "wm8996", .label = "wm8996",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.direction_output = wm8996_gpio_direction_out, .direction_output = wm8996_gpio_direction_out,

2
sound/soc/dwc/designware_i2s.c
View File

@ -577,7 +577,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev,
dev->capability |= DWC_I2S_PLAY; dev->capability |= DWC_I2S_PLAY;
dev->play_dma_data.dt.addr = res->start + I2S_TXDMA; dev->play_dma_data.dt.addr = res->start + I2S_TXDMA;
dev->play_dma_data.dt.addr_width = bus_widths[idx]; dev->play_dma_data.dt.addr_width = bus_widths[idx];
dev->play_dma_data.dt.chan_name = "TX";
dev->play_dma_data.dt.fifo_size = fifo_depth * dev->play_dma_data.dt.fifo_size = fifo_depth *
(fifo_width[idx2]) >> 8; (fifo_width[idx2]) >> 8;
dev->play_dma_data.dt.maxburst = 16; dev->play_dma_data.dt.maxburst = 16;
@ -588,7 +587,6 @@ static int dw_configure_dai_by_dt(struct dw_i2s_dev *dev,
dev->capability |= DWC_I2S_RECORD; dev->capability |= DWC_I2S_RECORD;
dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA; dev->capture_dma_data.dt.addr = res->start + I2S_RXDMA;
dev->capture_dma_data.dt.addr_width = bus_widths[idx]; dev->capture_dma_data.dt.addr_width = bus_widths[idx];
dev->capture_dma_data.dt.chan_name = "RX";
dev->capture_dma_data.dt.fifo_size = fifo_depth * dev->capture_dma_data.dt.fifo_size = fifo_depth *
(fifo_width[idx2] >> 8); (fifo_width[idx2] >> 8);
dev->capture_dma_data.dt.maxburst = 16; dev->capture_dma_data.dt.maxburst = 16;

12
sound/soc/fsl/fsl_asrc.c
View File

@ -726,7 +726,7 @@ static const struct regmap_config fsl_asrc_regmap_config = {
.readable_reg = fsl_asrc_readable_reg, .readable_reg = fsl_asrc_readable_reg,
.volatile_reg = fsl_asrc_volatile_reg, .volatile_reg = fsl_asrc_volatile_reg,
.writeable_reg = fsl_asrc_writeable_reg, .writeable_reg = fsl_asrc_writeable_reg,
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_FLAT,
}; };
/** /**
@ -879,7 +879,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
} }
} }
if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx35-asrc")) { if (of_device_is_compatible(np, "fsl,imx35-asrc")) {
asrc_priv->channel_bits = 3; asrc_priv->channel_bits = 3;
clk_map[IN] = input_clk_map_imx35; clk_map[IN] = input_clk_map_imx35;
clk_map[OUT] = output_clk_map_imx35; clk_map[OUT] = output_clk_map_imx35;
@ -892,7 +892,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
ret = fsl_asrc_init(asrc_priv); ret = fsl_asrc_init(asrc_priv);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to init asrc %d\n", ret); dev_err(&pdev->dev, "failed to init asrc %d\n", ret);
return -EINVAL; return ret;
} }
asrc_priv->channel_avail = 10; asrc_priv->channel_avail = 10;
@ -901,14 +901,14 @@ static int fsl_asrc_probe(struct platform_device *pdev)
&asrc_priv->asrc_rate); &asrc_priv->asrc_rate);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to get output rate\n"); dev_err(&pdev->dev, "failed to get output rate\n");
return -EINVAL; return ret;
} }
ret = of_property_read_u32(np, "fsl,asrc-width", ret = of_property_read_u32(np, "fsl,asrc-width",
&asrc_priv->asrc_width); &asrc_priv->asrc_width);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to get output width\n"); dev_err(&pdev->dev, "failed to get output width\n");
return -EINVAL; return ret;
} }
if (asrc_priv->asrc_width != 16 && asrc_priv->asrc_width != 24) { if (asrc_priv->asrc_width != 16 && asrc_priv->asrc_width != 24) {
@ -933,8 +933,6 @@ static int fsl_asrc_probe(struct platform_device *pdev)
return ret; return ret;
} }
dev_info(&pdev->dev, "driver registered\n");
return 0; return 0;
} }

8
sound/soc/fsl/fsl_esai.c
View File

@ -77,19 +77,19 @@ static irqreturn_t esai_isr(int irq, void *devid)
regmap_read(esai_priv->regmap, REG_ESAI_ESR, &esr); regmap_read(esai_priv->regmap, REG_ESAI_ESR, &esr);
if (esr & ESAI_ESR_TINIT_MASK) if (esr & ESAI_ESR_TINIT_MASK)
dev_dbg(&pdev->dev, "isr: Transmition Initialized\n"); dev_dbg(&pdev->dev, "isr: Transmission Initialized\n");
if (esr & ESAI_ESR_RFF_MASK) if (esr & ESAI_ESR_RFF_MASK)
dev_warn(&pdev->dev, "isr: Receiving overrun\n"); dev_warn(&pdev->dev, "isr: Receiving overrun\n");
if (esr & ESAI_ESR_TFE_MASK) if (esr & ESAI_ESR_TFE_MASK)
dev_warn(&pdev->dev, "isr: Transmition underrun\n"); dev_warn(&pdev->dev, "isr: Transmission underrun\n");
if (esr & ESAI_ESR_TLS_MASK) if (esr & ESAI_ESR_TLS_MASK)
dev_dbg(&pdev->dev, "isr: Just transmitted the last slot\n"); dev_dbg(&pdev->dev, "isr: Just transmitted the last slot\n");
if (esr & ESAI_ESR_TDE_MASK) if (esr & ESAI_ESR_TDE_MASK)
dev_dbg(&pdev->dev, "isr: Transmition data exception\n"); dev_dbg(&pdev->dev, "isr: Transmission data exception\n");
if (esr & ESAI_ESR_TED_MASK) if (esr & ESAI_ESR_TED_MASK)
dev_dbg(&pdev->dev, "isr: Transmitting even slots\n"); dev_dbg(&pdev->dev, "isr: Transmitting even slots\n");
@ -781,7 +781,7 @@ static const struct regmap_config fsl_esai_regmap_config = {
.readable_reg = fsl_esai_readable_reg, .readable_reg = fsl_esai_readable_reg,
.volatile_reg = fsl_esai_volatile_reg, .volatile_reg = fsl_esai_volatile_reg,
.writeable_reg = fsl_esai_writeable_reg, .writeable_reg = fsl_esai_writeable_reg,
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_FLAT,
}; };
static int fsl_esai_probe(struct platform_device *pdev) static int fsl_esai_probe(struct platform_device *pdev)

6
sound/soc/fsl/fsl_sai.c
View File

@ -801,8 +801,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
sai->pdev = pdev; sai->pdev = pdev;
if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai") || if (of_device_is_compatible(np, "fsl,imx6sx-sai") ||
of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) of_device_is_compatible(np, "fsl,imx6ul-sai"))
sai->sai_on_imx = true; sai->sai_on_imx = true;
sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
@ -883,7 +883,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
} }
if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) && if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) { of_device_is_compatible(np, "fsl,imx6ul-sai")) {
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr"); gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
if (IS_ERR(gpr)) { if (IS_ERR(gpr)) {
dev_err(&pdev->dev, "cannot find iomuxc registers\n"); dev_err(&pdev->dev, "cannot find iomuxc registers\n");

2
sound/soc/fsl/fsl_spdif.c
View File

@ -1103,7 +1103,7 @@ static const struct regmap_config fsl_spdif_regmap_config = {
.readable_reg = fsl_spdif_readable_reg, .readable_reg = fsl_spdif_readable_reg,
.volatile_reg = fsl_spdif_volatile_reg, .volatile_reg = fsl_spdif_volatile_reg,
.writeable_reg = fsl_spdif_writeable_reg, .writeable_reg = fsl_spdif_writeable_reg,
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_FLAT,
}; };
static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv, static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv,

2
sound/soc/fsl/fsl_ssi.c
View File

@ -182,7 +182,7 @@ static const struct regmap_config fsl_ssi_regconfig = {
.volatile_reg = fsl_ssi_volatile_reg, .volatile_reg = fsl_ssi_volatile_reg,
.precious_reg = fsl_ssi_precious_reg, .precious_reg = fsl_ssi_precious_reg,
.writeable_reg = fsl_ssi_writeable_reg, .writeable_reg = fsl_ssi_writeable_reg,
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_FLAT,
}; };
struct fsl_ssi_soc_data { struct fsl_ssi_soc_data {