Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2da1e487 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ASoC: s3c24xx_uda134x: Drop initialization of codec's platform data 



It's already taken care by the codec and its platform_data defined
in the arch/arm/mach-s3c24xx/mach-mini2440.c board file.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 84c5c203

sound/soc/samsung/s3c24xx_uda134x.c

+1 −70
Original line number Diff line number Diff line
@@ -226,78 +226,12 @@ static struct snd_soc_card snd_soc_s3c24xx_uda134x = { 
	.num_links = 1,

};



static struct s3c24xx_uda134x_platform_data *s3c24xx_uda134x_l3_pins;



static void setdat(int v)

{

	gpio_set_value(s3c24xx_uda134x_l3_pins->l3_data, v > 0);

}



static void setclk(int v)

{

	gpio_set_value(s3c24xx_uda134x_l3_pins->l3_clk, v > 0);

}



static void setmode(int v)

{

	gpio_set_value(s3c24xx_uda134x_l3_pins->l3_mode, v > 0);

}



/* FIXME - This must be codec platform data but in which board file ?? */

static struct uda134x_platform_data s3c24xx_uda134x = {

	.l3 = {

		.setdat = setdat,

		.setclk = setclk,

		.setmode = setmode,

		.data_hold = 1,

		.data_setup = 1,

		.clock_high = 1,

		.mode_hold = 1,

		.mode = 1,

		.mode_setup = 1,

	},

};



static int s3c24xx_uda134x_setup_pin(int pin, char *fun)

{

	if (gpio_request(pin, "s3c24xx_uda134x") < 0) {

		printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: "

		       "l3 %s pin already in use", fun);

		return -EBUSY;

	}

	gpio_direction_output(pin, 0);

	return 0;

}



static int s3c24xx_uda134x_probe(struct platform_device *pdev)

{

	int ret;



	printk(KERN_INFO "S3C24XX_UDA134X SoC Audio driver\n");



	s3c24xx_uda134x_l3_pins = pdev->dev.platform_data;

	if (s3c24xx_uda134x_l3_pins == NULL) {

		printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: "

		       "unable to find platform data\n");

		return -ENODEV;

	}

	s3c24xx_uda134x.model = s3c24xx_uda134x_l3_pins->model;



	if (s3c24xx_uda134x_setup_pin(s3c24xx_uda134x_l3_pins->l3_data,

				      "data") < 0)

		return -EBUSY;

	if (s3c24xx_uda134x_setup_pin(s3c24xx_uda134x_l3_pins->l3_clk,

				      "clk") < 0) {

		gpio_free(s3c24xx_uda134x_l3_pins->l3_data);

		return -EBUSY;

	}

	if (s3c24xx_uda134x_setup_pin(s3c24xx_uda134x_l3_pins->l3_mode,

				      "mode") < 0) {

		gpio_free(s3c24xx_uda134x_l3_pins->l3_data);

		gpio_free(s3c24xx_uda134x_l3_pins->l3_clk);

		return -EBUSY;

	}



	s3c24xx_uda134x_snd_device = platform_device_alloc("soc-audio", -1);

	if (!s3c24xx_uda134x_snd_device) {

		printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: "
@@ -307,7 +241,7 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev) 


	platform_set_drvdata(s3c24xx_uda134x_snd_device,

			     &snd_soc_s3c24xx_uda134x);

	platform_device_add_data(s3c24xx_uda134x_snd_device, &s3c24xx_uda134x, sizeof(s3c24xx_uda134x));



	ret = platform_device_add(s3c24xx_uda134x_snd_device);

	if (ret) {

		printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: Unable to add\n");
@@ -320,9 +254,6 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev) 
static int s3c24xx_uda134x_remove(struct platform_device *pdev)

{

	platform_device_unregister(s3c24xx_uda134x_snd_device);

	gpio_free(s3c24xx_uda134x_l3_pins->l3_data);

	gpio_free(s3c24xx_uda134x_l3_pins->l3_clk);

	gpio_free(s3c24xx_uda134x_l3_pins->l3_mode);

	return 0;

}