summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeeyush Gupta2019-11-06 00:57:44 -0600
committerPeeyush Gupta2019-11-06 00:57:44 -0600
commit0170dc18180fca9c75dd7417e9a1336c5401cfda (patch)
tree53114c8e0790d8ac70d436d2a492d2297482ae33
parentab58657b5fa00ed9f4274263df91193faa36b224 (diff)
downloadtas2562-stereo-android-driver-0170dc18180fca9c75dd7417e9a1336c5401cfda.tar.gz
tas2562-stereo-android-driver-0170dc18180fca9c75dd7417e9a1336c5401cfda.tar.xz
tas2562-stereo-android-driver-0170dc18180fca9c75dd7417e9a1336c5401cfda.zip
resolving merge conflict
-rw-r--r--Kconfig4
-rw-r--r--tas2562-codec.c4
-rw-r--r--tas2562-regmap.c24
3 files changed, 2 insertions, 30 deletions
diff --git a/Kconfig b/Kconfig
index 6a753f0..2ec5e59 100644
--- a/Kconfig
+++ b/Kconfig
@@ -19,10 +19,10 @@ config TAS2562_CODEC
19 and functions. 19 and functions.
20 20
21config PLATFORM_EXYNOS 21config PLATFORM_EXYNOS
22 bool "Exyons platform support" 22 bool "Exynos platform support"
23 default y 23 default y
24 help 24 help
25 Enable support for Exyons platformt. 25 Enable support for Exynos platformt.
26 26
27config TAS25XX_ALGO 27config TAS25XX_ALGO
28 bool "TAS2562 Calibration Support" 28 bool "TAS2562 Calibration Support"
diff --git a/tas2562-codec.c b/tas2562-codec.c
index 4d90c93..d2fe9f7 100644
--- a/tas2562-codec.c
+++ b/tas2562-codec.c
@@ -269,11 +269,7 @@ static int tas2562_i2c_load_data(struct tas2562_priv *p_tas2562,
269 return n_result; 269 return n_result;
270} 270}
271 271
272<<<<<<< HEAD
273#ifdef CONFIG_CODEC_PM
274=======
275#ifdef CODEC_PM 272#ifdef CODEC_PM
276>>>>>>> 56d3d8e4fffa953d86ca695e217decdcfdd6e507
277static int tas2562_codec_suspend(struct snd_soc_codec *codec) 273static int tas2562_codec_suspend(struct snd_soc_codec *codec)
278{ 274{
279 struct tas2562_priv *p_tas2562 = snd_soc_codec_get_drvdata(codec); 275 struct tas2562_priv *p_tas2562 = snd_soc_codec_get_drvdata(codec);
diff --git a/tas2562-regmap.c b/tas2562-regmap.c
index a887834..365c3a6 100644
--- a/tas2562-regmap.c
+++ b/tas2562-regmap.c
@@ -474,21 +474,6 @@ static const struct regmap_config tas2562_i2c_regmap = {
474static void tas2562_hw_reset(struct tas2562_priv *p_tas2562) 474static void tas2562_hw_reset(struct tas2562_priv *p_tas2562)
475{ 475{
476 if (gpio_is_valid(p_tas2562->mn_reset_gpio)) { 476 if (gpio_is_valid(p_tas2562->mn_reset_gpio)) {
477<<<<<<< HEAD
478 if (gpio_is_valid(p_tas2562->mn_reset_gpio2)) {
479 gpio_direction_output(p_tas2562->mn_reset_gpio, 0);
480 gpio_direction_output(p_tas2562->mn_reset_gpio2, 0);
481 msleep(20);
482 gpio_direction_output(p_tas2562->mn_reset_gpio, 1);
483 gpio_direction_output(p_tas2562->mn_reset_gpio2, 1);
484 msleep(20);
485 } else {
486 gpio_direction_output(p_tas2562->mn_reset_gpio, 0);
487 msleep(20);
488 gpio_direction_output(p_tas2562->mn_reset_gpio, 1);
489 msleep(20);
490 }
491=======
492 gpio_direction_output(p_tas2562->mn_reset_gpio, 0); 477 gpio_direction_output(p_tas2562->mn_reset_gpio, 0);
493 478
494 if(p_tas2562->mn_channels != 1) { 479 if(p_tas2562->mn_channels != 1) {
@@ -511,7 +496,6 @@ static void tas2562_hw_reset(struct tas2562_priv *p_tas2562)
511 } 496 }
512 497
513 msleep(20); 498 msleep(20);
514>>>>>>> 56d3d8e4fffa953d86ca695e217decdcfdd6e507
515 } 499 }
516 dev_info(p_tas2562->dev, "reset gpio up !!\n"); 500 dev_info(p_tas2562->dev, "reset gpio up !!\n");
517 501
@@ -890,10 +874,6 @@ static int tas2562_pm_resume(struct device *dev)
890 dev_err(p_tas2562->dev, "drvdata is NULL\n"); 874 dev_err(p_tas2562->dev, "drvdata is NULL\n");
891 return -EINVAL; 875 return -EINVAL;
892 } 876 }
893<<<<<<< HEAD
894=======
895
896>>>>>>> 56d3d8e4fffa953d86ca695e217decdcfdd6e507
897 mutex_lock(&p_tas2562->codec_lock); 877 mutex_lock(&p_tas2562->codec_lock);
898 tas2562_runtime_resume(p_tas2562); 878 tas2562_runtime_resume(p_tas2562);
899 mutex_unlock(&p_tas2562->codec_lock); 879 mutex_unlock(&p_tas2562->codec_lock);
@@ -1043,11 +1023,7 @@ static int tas2562_i2c_probe(struct i2c_client *p_client,
1043 p_tas2562->update_bits = tas2562_dev_update_bits; 1023 p_tas2562->update_bits = tas2562_dev_update_bits;
1044 p_tas2562->hw_reset = tas2562_hw_reset; 1024 p_tas2562->hw_reset = tas2562_hw_reset;
1045 p_tas2562->enable_irq = tas2562_enable_irq; 1025 p_tas2562->enable_irq = tas2562_enable_irq;
1046<<<<<<< HEAD
1047#ifdef CONFIG_CODEC_PM
1048=======
1049#ifdef CODEC_PM 1026#ifdef CODEC_PM
1050>>>>>>> 56d3d8e4fffa953d86ca695e217decdcfdd6e507
1051 p_tas2562->runtime_suspend = tas2562_runtime_suspend; 1027 p_tas2562->runtime_suspend = tas2562_runtime_suspend;
1052 p_tas2562->runtime_resume = tas2562_runtime_resume; 1028 p_tas2562->runtime_resume = tas2562_runtime_resume;
1053#endif 1029#endif