Commit 0b0cefc8 authored by Oder Chiou's avatar Oder Chiou Committed by Mark Brown
Browse files

ASoC: rt5645: change gpio to gpiod APIs 



Move gpio to gpio_desc and use gpiod APIs in codec driver.

Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarOder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5ae4f63b

include/sound/rt5645.h

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ struct rt5645_platform_data { 
	unsigned int dmic2_data_pin;

	/* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */



	unsigned int hp_det_gpio;

	bool gpio_hp_det_active_high;



	unsigned int jd_mode;

};

sound/soc/codecs/rt5645.c

+12 −35
Original line number Diff line number Diff line
@@ -2944,17 +2944,11 @@ static int rt5645_irq_detection(struct rt5645_priv *rt5645) 


	switch (rt5645->pdata.jd_mode) {

	case 0: /* Not using rt5645 JD */

		if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) {

			gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio);

			dev_dbg(rt5645->codec->dev, "gpio = %d(%d)\n",

				rt5645->pdata.hp_det_gpio, gpio_state);

		}

		if ((rt5645->pdata.gpio_hp_det_active_high && gpio_state) ||

			(!rt5645->pdata.gpio_hp_det_active_high &&

			 !gpio_state)) {

			report = rt5645_jack_detect(rt5645->codec, 1);

		} else {

			report = rt5645_jack_detect(rt5645->codec, 0);

		if (rt5645->gpiod_hp_det) {

			gpio_state = gpiod_get_value(rt5645->gpiod_hp_det);

			dev_dbg(rt5645->codec->dev, "gpio_state = %d\n",

				gpio_state);

			report = rt5645_jack_detect(rt5645->codec, gpio_state);

		}

		snd_soc_jack_report(rt5645->hp_jack,

				    report, SND_JACK_HEADPHONE);
@@ -3244,7 +3238,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
	struct rt5645_priv *rt5645;

	int ret;

	unsigned int val;

	struct gpio_desc *gpiod;



	rt5645 = devm_kzalloc(&i2c->dev, sizeof(struct rt5645_priv),

				GFP_KERNEL);
@@ -3259,17 +3252,14 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
	} else {

		if (dmi_check_system(dmi_platform_intel_braswell)) {

			rt5645->pdata = *rt5645_pdata;

			gpiod = devm_gpiod_get_index(&i2c->dev, "rt5645", 0);



			if (IS_ERR(gpiod) || gpiod_direction_input(gpiod)) {

				rt5645->pdata.hp_det_gpio = -1;

				dev_err(&i2c->dev, "failed to initialize gpiod\n");

			} else {

				rt5645->pdata.hp_det_gpio = desc_to_gpio(gpiod);

				rt5645->pdata.gpio_hp_det_active_high

						= !gpiod_is_active_low(gpiod);

		}

	}



	rt5645->gpiod_hp_det = devm_gpiod_get(&i2c->dev, "hp-detect", GPIOD_IN);



	if (IS_ERR(rt5645->gpiod_hp_det)) {

		rt5645->gpiod_hp_det = NULL;

		dev_err(&i2c->dev, "failed to initialize gpiod\n");

	}



	rt5645->regmap = devm_regmap_init_i2c(i2c, &rt5645_regmap);
@@ -3433,16 +3423,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
			dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);

	}



	if (gpio_is_valid(rt5645->pdata.hp_det_gpio)) {

		ret = gpio_request(rt5645->pdata.hp_det_gpio, "rt5645");

		if (ret)

			dev_err(&i2c->dev, "Fail gpio_request hp_det_gpio\n");



		ret = gpio_direction_input(rt5645->pdata.hp_det_gpio);

		if (ret)

			dev_err(&i2c->dev, "Fail gpio_direction hp_det_gpio\n");

	}



	return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645,

				      rt5645_dai, ARRAY_SIZE(rt5645_dai));

}
@@ -3456,9 +3436,6 @@ static int rt5645_i2c_remove(struct i2c_client *i2c) 


	cancel_delayed_work_sync(&rt5645->jack_detect_work);



	if (gpio_is_valid(rt5645->pdata.hp_det_gpio))

		gpio_free(rt5645->pdata.hp_det_gpio);



	snd_soc_unregister_codec(&i2c->dev);



	return 0;

sound/soc/codecs/rt5645.h

+1 −0
Original line number Diff line number Diff line
@@ -2182,6 +2182,7 @@ struct rt5645_priv { 
	struct rt5645_platform_data pdata;

	struct regmap *regmap;

	struct i2c_client *i2c;

	struct gpio_desc *gpiod_hp_det;

	struct snd_soc_jack *hp_jack;

	struct snd_soc_jack *mic_jack;

	struct snd_soc_jack *btn_jack;