ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs

PATCH Applied Oder Chiou 2 participants 4 messages Apr 10, 2014

Subsystems (4)

Device tree bindings Sound ASoC Realtek audio codecs

lore

Share & tools

lore

Oder Chiou

author maintainer

2014-04-10 02:57 UTC #0 lore raw

PATCH 1/2 ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs

The patch adds the string "rt5639" to the list of I2C device IDs.

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

---
 sound/soc/codecs/rt5640.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

sound/soc/codecs/rt5640.c +3 -2

index d672f44..2e7132b 100644
@@ -1,5 +1,5 @@
 /*
- * rt5640.c  --  RT5640 ALSA SoC audio codec driver
+ * rt5640.c  --  RT5640/RT5639 ALSA SoC audio codec driver
  *
  * Copyright 2011 Realtek Semiconductor Corp.
  * Author: Johnny Hsu <[email protected]>

@@ -2164,6 +2164,7 @@ static const struct regmap_config rt5640_regmap = {
 
 static const struct i2c_device_id rt5640_i2c_id[] = {
 	{ "rt5640", 0 },
+	{ "rt5639", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);

@@ -2322,6 +2323,6 @@ static struct i2c_driver rt5640_i2c_driver = {
 };
 module_i2c_driver(rt5640_i2c_driver);
 
-MODULE_DESCRIPTION("ASoC RT5640 driver");
+MODULE_DESCRIPTION("ASoC RT5640/RT5639 driver");
 MODULE_AUTHOR("Johnny Hsu <[email protected]>");
 MODULE_LICENSE("GPL v2");

Signature · 1 line

1.8.1.1.439.g50a6b54

Oder Chiou

author maintainer

2014-04-10 02:57 UTC #1 lore raw

PATCH 2/2 ASoC: rt5640: Add the info of rt5639 to the binding document

The patch adds the info of rt5639 to the binding document.

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

---
 Documentation/devicetree/bindings/sound/rt5640.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Documentation/devicetree/bindings/sound/rt5640.txt +8 -5

index 068a114..bac4d9a 100644
@@ -1,10 +1,10 @@
-RT5640 audio CODEC
+RT5640/RT5639 audio CODEC
 
 This device supports I2C only.
 
 Required properties:
 
-- compatible : "realtek,rt5640".
+- compatible : One of "realtek,rt5640" or "realtek,rt5639".
 
 - reg : The I2C address of the device.

@@ -18,7 +18,7 @@ Optional properties:
 
 - realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.
 
-Pins on the device (for linking into audio routes):
+Pins on the device (for linking into audio routes) for RT5639/RT5640:
 
   * DMIC1
   * DMIC2

@@ -31,13 +31,16 @@ Pins on the device (for linking into audio routes):
   * HPOR
   * LOUTL
   * LOUTR
-  * MONOP
-  * MONON
   * SPOLP
   * SPOLN
   * SPORP
   * SPORN
 
+Additional pins on the device for RT5640:
+
+  * MONOP
+  * MONON
+
 Example:
 
 rt5640 {