Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs
@ 2014-04-10  2:57 Oder Chiou
  2014-04-10  2:57 ` [PATCH 2/2] ASoC: rt5640: Add the info of rt5639 to the binding document Oder Chiou
  2014-04-10  9:13 ` [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs Mark Brown
  0 siblings, 2 replies; 4+ messages in thread
From: Oder Chiou @ 2014-04-10  2:57 UTC (permalink / raw)
  To: broonie, lgirdwood; +Cc: oder_chiou, bardliao, alsa-devel, flove

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

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
---
 sound/soc/codecs/rt5640.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index d672f44..2e7132b 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -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 <johnnyhsu@realtek.com>
@@ -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 <johnnyhsu@realtek.com>");
 MODULE_LICENSE("GPL v2");
-- 
1.8.1.1.439.g50a6b54

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] ASoC: rt5640: Add the info of rt5639 to the binding document
  2014-04-10  2:57 [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs Oder Chiou
@ 2014-04-10  2:57 ` Oder Chiou
  2014-04-10  9:13   ` Mark Brown
  2014-04-10  9:13 ` [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs Mark Brown
  1 sibling, 1 reply; 4+ messages in thread
From: Oder Chiou @ 2014-04-10  2:57 UTC (permalink / raw)
  To: broonie, lgirdwood; +Cc: oder_chiou, bardliao, alsa-devel, flove

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

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
---
 Documentation/devicetree/bindings/sound/rt5640.txt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/rt5640.txt b/Documentation/devicetree/bindings/sound/rt5640.txt
index 068a114..bac4d9a 100644
--- a/Documentation/devicetree/bindings/sound/rt5640.txt
+++ b/Documentation/devicetree/bindings/sound/rt5640.txt
@@ -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 {
-- 
1.8.1.1.439.g50a6b54

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs
  2014-04-10  2:57 [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs Oder Chiou
  2014-04-10  2:57 ` [PATCH 2/2] ASoC: rt5640: Add the info of rt5639 to the binding document Oder Chiou
@ 2014-04-10  9:13 ` Mark Brown
  1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-04-10  9:13 UTC (permalink / raw)
  To: Oder Chiou; +Cc: bardliao, alsa-devel, lgirdwood, flove


[-- Attachment #1.1: Type: text/plain, Size: 146 bytes --]

On Thu, Apr 10, 2014 at 10:57:34AM +0800, Oder Chiou wrote:
> The patch adds the string "rt5639" to the list of I2C device IDs.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] ASoC: rt5640: Add the info of rt5639 to the binding document
  2014-04-10  2:57 ` [PATCH 2/2] ASoC: rt5640: Add the info of rt5639 to the binding document Oder Chiou
@ 2014-04-10  9:13   ` Mark Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-04-10  9:13 UTC (permalink / raw)
  To: Oder Chiou; +Cc: bardliao, alsa-devel, lgirdwood, flove


[-- Attachment #1.1: Type: text/plain, Size: 139 bytes --]

On Thu, Apr 10, 2014 at 10:57:35AM +0800, Oder Chiou wrote:
> The patch adds the info of rt5639 to the binding document.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-10  9:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-10  2:57 [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs Oder Chiou
2014-04-10  2:57 ` [PATCH 2/2] ASoC: rt5640: Add the info of rt5639 to the binding document Oder Chiou
2014-04-10  9:13   ` Mark Brown
2014-04-10  9:13 ` [PATCH 1/2] ASoC: rt5640: Add the string "rt5639" to the list of I2C device IDs Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox