Skip to contentSkip to conversation

SoC: rt5645: make RT5650_TDM_CTRL_4 readable

PATCH Applied Oder Chiou 3 participants 6 messages Jun 10, 2015 – Jun 11, 2015

Subsystems (4)
Device tree bindings Sound ASoC Realtek audio codecs
lore
Share & tools
lore

Oder Chiou

author maintainer
#0 lore raw

PATCH v4 1/3 SoC: rt5645: make RT5650_TDM_CTRL_4 readable

Register RT5650_TDM_CTRL_4(0x7A) is readable and used for mixer setting. It should be added in rt5645_readable_register function.

Signed-off-by Bard Liao <[email protected]>
Signed-off-by Oder Chiou <[email protected]>
---
 sound/soc/codecs/rt5645.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5645.c +1 -0
index d5f0f56..b86474a 100644
@@ -349,6 +349,7 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg)
 	case RT5645_TDM_CTRL_1:
 	case RT5645_TDM_CTRL_2:
 	case RT5645_TDM_CTRL_3:
+	case RT5650_TDM_CTRL_4:
 	case RT5645_GLB_CLK:
 	case RT5645_PLL_CTRL1:
 	case RT5645_PLL_CTRL2:
Signature · 1 line
1.8.1.1.439.g50a6b54
author maintainer
#1 lore raw

PATCH v4 2/3 ASoC: rt5645: change gpio to gpiod APIs

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

Signed-off-by Bard Liao <[email protected]>
Signed-off-by Oder Chiou <[email protected]>

---
* 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(-)
include/sound/rt5645.h +0 -3
index 652cb9e..22734bc 100644
@@ -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

80 lines not on this page · raw message

sound/soc/codecs/rt5645.h +1 -0
index 9ec4e89..0353a6a 100644
@@ -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;
Signature · 1 line
1.8.1.1.439.g50a6b54
maintainer Applied
#2 lore raw

Re: [PATCH v4 2/3] ASoC: rt5645: change gpio to gpiod APIs

Quoted 1 line · Oder Chiou

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

Applied, thanks.

author maintainer
#3 lore raw

PATCH v4 3/3 ASoC: rt5645: add device tree support

In reply to Oder Chiou

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 <[email protected]>
Signed-off-by Oder Chiou <[email protected]>

---
* 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
Documentation/devicetree/bindings/sound/rt5645.txt new file +72 -0
new file mode 100644
index 0000000..7cee1f5
@@ -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
Signature · 1 line
1.8.1.1.439.g50a6b54
maintainer Applied
#4 lore raw

Re: [PATCH v4 3/3] ASoC: rt5645: add device tree support

Quoted 2 lines · Oder Chiou

Modify the RT5645 driver to parse platform data from device tree. Write a DT binding document to describe those properties.

Applied, thanks.

#5 lore raw

Re: [PATCH v4 3/3] ASoC: rt5645: add device tree support

In reply to Oder Chiou
Quoted 11 lines · Oder Chiou

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 <[email protected]>
Signed-off-by Oder Chiou <[email protected]>

---
* 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

Oder: It looks like this version patch is missing the update in sound/soc/codecs/rt5645.c, that was present in v3...

Best,