Merge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl',... (bdf20b42) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/88pm860x-codec.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -146,7 +146,7 @@ struct pm860x_priv {
	struct pm860x_det det;		struct pm860x_det det;

	int irq[4];		int irq[4];
	unsigned char name[4][MAX_NAME_LEN];		unsigned char name[4][MAX_NAME_LEN+1];
	};		};

	/* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */		/* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -765,12 +765,18 @@ static int __init mc13783_codec_probe(struct platform_device *pdev)
	return -ENOSYS;		return -ENOSYS;

	ret = of_property_read_u32(np, "adc-port", &priv->adc_ssi_port);		ret = of_property_read_u32(np, "adc-port", &priv->adc_ssi_port);
	if (ret)		if (ret) {
	goto out;		of_node_put(np);
			return ret;
			}

	ret = of_property_read_u32(np, "dac-port", &priv->dac_ssi_port);		ret = of_property_read_u32(np, "dac-port", &priv->dac_ssi_port);
	if (ret)		if (ret) {
	goto out;		of_node_put(np);
			return ret;
			}

			of_node_put(np);
	}		}

	dev_set_drvdata(&pdev->dev, priv);		dev_set_drvdata(&pdev->dev, priv);
	@@ -783,8 +789,6 @@ static int __init mc13783_codec_probe(struct platform_device *pdev)
	ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_mc13783,		ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_mc13783,
	mc13783_dai_async, ARRAY_SIZE(mc13783_dai_async));		mc13783_dai_async, ARRAY_SIZE(mc13783_dai_async));

	out:
	of_node_put(np);
	return ret;		return ret;
	}		}

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,7 @@ static const struct snd_soc_dapm_widget imx_es8328_dapm_widgets[] = {
	static int imx_es8328_probe(struct platform_device *pdev)		static int imx_es8328_probe(struct platform_device *pdev)
	{		{
	struct device_node *np = pdev->dev.of_node;		struct device_node *np = pdev->dev.of_node;
	struct device_node ssi_np, codec_np;		struct device_node ssi_np = NULL, codec_np = NULL;
	struct platform_device *ssi_pdev;		struct platform_device *ssi_pdev;
	struct imx_es8328_data *data;		struct imx_es8328_data *data;
	u32 int_port, ext_port;		u32 int_port, ext_port;
	@@ -104,6 +104,7 @@ static int imx_es8328_probe(struct platform_device *pdev)
	if (ext_port > MUX_PORT_MAX \|\| ext_port == 0) {		if (ext_port > MUX_PORT_MAX \|\| ext_port == 0) {
	dev_err(dev, "mux-ext-port: hardware only has %d mux ports\n",		dev_err(dev, "mux-ext-port: hardware only has %d mux ports\n",
	MUX_PORT_MAX);		MUX_PORT_MAX);
			ret = -EINVAL;
	goto fail;		goto fail;
	}		}

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -501,6 +501,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
	priv->snd_card.dai_link = dai_link;		priv->snd_card.dai_link = dai_link;
	priv->snd_card.num_links = num_links;		priv->snd_card.num_links = num_links;

			priv->gpio_hp_det = -ENOENT;
			priv->gpio_mic_det = -ENOENT;

	/* Get room for the other properties */		/* Get room for the other properties */
	priv->dai_props = devm_kzalloc(dev,		priv->dai_props = devm_kzalloc(dev,
	sizeof(priv->dai_props) num_links,		sizeof(priv->dai_props) num_links,

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -108,8 +108,10 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
	while (val) {		while (val) {
	regmap_read(i2s->regmap, I2S_CLR, &val);		regmap_read(i2s->regmap, I2S_CLR, &val);
	retry--;		retry--;
	if (!retry)		if (!retry) {
	dev_warn(i2s->dev, "fail to clear\n");		dev_warn(i2s->dev, "fail to clear\n");
			break;
			}
	}		}
	}		}
	}		}