Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus (58be9a93) · Commits · e / devices / android_kernel_teracube_2e

sound/soc/samsung/i2s.c

+4 −62

Original line number	Diff line number	Diff line
		@@ -1016,52 +1016,6 @@ static struct i2s_dai i2s_alloc_dai(struct platform_device pdev, bool sec)
		return i2s;
		}

		#ifdef CONFIG_OF
		static int samsung_i2s_parse_dt_gpio(struct i2s_dai *i2s)
		{
		struct device *dev = &i2s->pdev->dev;
		int index, gpio, ret;

		for (index = 0; index < 7; index++) {
		gpio = of_get_gpio(dev->of_node, index);
		if (!gpio_is_valid(gpio)) {
		dev_err(dev, "invalid gpio[%d]: %d\n", index, gpio);
		goto free_gpio;
		}

		ret = gpio_request(gpio, dev_name(dev));
		if (ret) {
		dev_err(dev, "gpio [%d] request failed\n", gpio);
		goto free_gpio;
		}
		i2s->gpios[index] = gpio;
		}
		return 0;

		free_gpio:
		while (--index >= 0)
		gpio_free(i2s->gpios[index]);
		return -EINVAL;
		}

		static void samsung_i2s_dt_gpio_free(struct i2s_dai *i2s)
		{
		unsigned int index;
		for (index = 0; index < 7; index++)
		gpio_free(i2s->gpios[index]);
		}
		#else
		static int samsung_i2s_parse_dt_gpio(struct i2s_dai *dai)
		{
		return -EINVAL;
		}

		static void samsung_i2s_dt_gpio_free(struct i2s_dai *dai)
		{
		}

		#endif

		static const struct of_device_id exynos_i2s_match[];

		static inline int samsung_i2s_get_driver_data(struct platform_device *pdev)
		@@ -1235,19 +1189,11 @@ static int samsung_i2s_probe(struct platform_device *pdev)
		pri_dai->sec_dai = sec_dai;
		}

		if (np) {
		if (samsung_i2s_parse_dt_gpio(pri_dai)) {
		if (i2s_pdata && i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {
		dev_err(&pdev->dev, "Unable to configure gpio\n");
		ret = -EINVAL;
		goto err;
		}
		} else {
		if (i2s_pdata->cfg_gpio && i2s_pdata->cfg_gpio(pdev)) {
		dev_err(&pdev->dev, "Unable to configure gpio\n");
		ret = -EINVAL;
		goto err;
		}
		}

		snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component,
		&pri_dai->i2s_dai_drv, 1);
		@@ -1267,14 +1213,10 @@ static int samsung_i2s_remove(struct platform_device *pdev)
		{
		struct i2s_dai i2s, other;
		struct resource *res;
		struct s3c_audio_pdata *i2s_pdata = pdev->dev.platform_data;

		i2s = dev_get_drvdata(&pdev->dev);
		other = i2s->pri_dai ? : i2s->sec_dai;

		if (!i2s_pdata->cfg_gpio && pdev->dev.of_node)
		samsung_i2s_dt_gpio_free(i2s->pri_dai);

		if (other) {
		other->pri_dai = NULL;
		other->sec_dai = NULL;

sound/soc/samsung/s3c-i2s-v2.c

+1 −3

Original line number	Diff line number	Diff line
		/* sound/soc/samsung/s3c-i2c-v2.c
		*
		* ALSA Soc Audio Layer - I2S core for newer Samsung SoCs.
		/* ALSA Soc Audio Layer - I2S core for newer Samsung SoCs.
		*
		* Copyright (c) 2006 Wolfson Microelectronics PLC.
		* Graeme Gregory graeme.gregory@wolfsonmicro.com