* [PATCH v4 2/3] ASoC: rt5645: change gpio to gpiod APIs
2015-06-10 6:27 [PATCH v4 1/3] SoC: rt5645: make RT5650_TDM_CTRL_4 readable Oder Chiou
@ 2015-06-10 6:27 ` Oder Chiou
2015-06-10 17:32 ` Mark Brown
2015-06-10 6:27 ` [PATCH v4 3/3] ASoC: rt5645: add device tree support Oder Chiou
1 sibling, 1 reply; 6+ messages in thread
From: Oder Chiou @ 2015-06-10 6:27 UTC (permalink / raw)
To: broonie, lgirdwood; +Cc: Oder Chiou, Bard Liao, alsa-devel, john.lin, flove
Move gpio to gpio_desc and use gpiod APIs in codec driver.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
---
* Change gpio name from rt5645 to hp-detect
* Use devm_gpiod_get API to get gpiod
---
include/sound/rt5645.h | 3 ---
sound/soc/codecs/rt5645.c | 47 ++++++++++++-----------------------------------
sound/soc/codecs/rt5645.h | 1 +
3 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h
index 652cb9e..22734bc 100644
--- a/include/sound/rt5645.h
+++ b/include/sound/rt5645.h
@@ -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;
};
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index b86474a..41bd47e 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -2938,17 +2938,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);
@@ -3238,7 +3232,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);
@@ -3253,19 +3246,16 @@ 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);
if (IS_ERR(rt5645->regmap)) {
ret = PTR_ERR(rt5645->regmap);
@@ -3427,16 +3417,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));
}
@@ -3450,9 +3430,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;
diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h
index 9ec4e89..0353a6a 100644
--- a/sound/soc/codecs/rt5645.h
+++ b/sound/soc/codecs/rt5645.h
@@ -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;
--
1.8.1.1.439.g50a6b54
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v4 3/3] ASoC: rt5645: add device tree support
2015-06-10 6:27 [PATCH v4 1/3] SoC: rt5645: make RT5650_TDM_CTRL_4 readable Oder Chiou
2015-06-10 6:27 ` [PATCH v4 2/3] ASoC: rt5645: change gpio to gpiod APIs Oder Chiou
@ 2015-06-10 6:27 ` Oder Chiou
2015-06-10 17:32 ` Mark Brown
2015-06-11 1:24 ` Nicolas Boichat
1 sibling, 2 replies; 6+ messages in thread
From: Oder Chiou @ 2015-06-10 6:27 UTC (permalink / raw)
To: broonie, lgirdwood; +Cc: Oder Chiou, Bard Liao, alsa-devel, john.lin, flove
Modify the RT5645 driver to parse platform data from device tree.
Write a DT binding document to describe those properties.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
---
* Add hp-detect-gpios' property
---
Documentation/devicetree/bindings/sound/rt5645.txt | 72 ++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/rt5645.txt
diff --git a/Documentation/devicetree/bindings/sound/rt5645.txt b/Documentation/devicetree/bindings/sound/rt5645.txt
new file mode 100644
index 0000000..7cee1f5
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rt5645.txt
@@ -0,0 +1,72 @@
+RT5650/RT5645 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+- compatible : One of "realtek,rt5645" or "realtek,rt5650".
+
+- reg : The I2C address of the device.
+
+- interrupts : The CODEC's interrupt output.
+
+Optional properties:
+
+- hp-detect-gpios:
+ a GPIO spec for the external headphone detect pin. If jd-mode = 0,
+ we will get the JD status by getting the value of hp-detect-gpios.
+
+- realtek,in2-differential
+ Boolean. Indicate MIC2 input are differential, rather than single-ended.
+
+- realtek,dmic1-data-pin
+ 0: dmic1 is not used
+ 1: using IN2P pin as dmic1 data pin
+ 2: using GPIO6 pin as dmic1 data pin
+ 3: using GPIO10 pin as dmic1 data pin
+ 4: using GPIO12 pin as dmic1 data pin
+
+- realtek,dmic2-data-pin
+ 0: dmic2 is not used
+ 1: using IN2N pin as dmic2 data pin
+ 2: using GPIO5 pin as dmic2 data pin
+ 3: using GPIO11 pin as dmic2 data pin
+
+-- realtek,jd-mode : The JD mode of rt5645/rt5650
+ 0 : rt5645/rt5650 JD function is not used
+ 1 : Mode-0 (VDD=3.3V), two port jack detection
+ 2 : Mode-1 (VDD=3.3V), one port jack detection
+ 3 : Mode-2 (VDD=1.8V), one port jack detection
+
+Pins on the device (for linking into audio routes) for RT5645/RT5650:
+
+ * DMIC L1
+ * DMIC R1
+ * DMIC L2
+ * DMIC R2
+ * IN1P
+ * IN1N
+ * IN2P
+ * IN2N
+ * Haptic Generator
+ * HPOL
+ * HPOR
+ * LOUTL
+ * LOUTR
+ * PDM1L
+ * PDM1R
+ * SPOL
+ * SPOR
+
+Example:
+
+codec: rt5650@1a {
+ compatible = "realtek,rt5650";
+ reg = <0x1a>;
+ hp-detect-gpios = <&gpio 19 0>;
+ interrupt-parent = <&gpio>;
+ interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
+ realtek,dmic-en = "true";
+ realtek,en-jd-func = "true";
+ realtek,jd-mode = <3>;
+};
\ No newline at end of file
--
1.8.1.1.439.g50a6b54
^ permalink raw reply related [flat|nested] 6+ messages in thread