[alsa-devel] [PATCH 1/2] ASoC: rt5616: add an of_match table
Add a device tree match table. This serves to make the driver's support of device tree more explicit.
Signed-off-by: Caesar Wang wxt@rock-chips.com ---
sound/soc/codecs/rt5616.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c index f4005cb..e01a32d 100644 --- a/sound/soc/codecs/rt5616.c +++ b/sound/soc/codecs/rt5616.c @@ -1287,6 +1287,14 @@ static const struct i2c_device_id rt5616_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt5616_i2c_id);
+#if defined(CONFIG_OF) +static const struct of_device_id rt5616_of_match[] = { + { .compatible = "realtek,rt5616", }, + {}, +}; +MODULE_DEVICE_TABLE(of, rt5616_of_match); +#endif + static int rt5616_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1359,6 +1367,7 @@ static void rt5616_i2c_shutdown(struct i2c_client *client) static struct i2c_driver rt5616_i2c_driver = { .driver = { .name = "rt5616", + .of_match_table = of_match_ptr(rt5616_of_match), }, .probe = rt5616_i2c_probe, .remove = rt5616_i2c_remove,
Add the description for rt5616 codec.
Signed-off-by: Caesar Wang wxt@rock-chips.com ---
Documentation/devicetree/bindings/sound/rt5616.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt
diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt new file mode 100644 index 0000000..af96207 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rt5616.txt @@ -0,0 +1,38 @@ +RT5616 audio CODEC + +This device supports I2C only. + +Required properties: + +- compatible : "realtek,rt5616". + +- reg : The I2C address of the device. + +Optional properties: + +Pins on the device (for linking into audio routes) for RT5616: + + * IN1P + * IN2P + * IN2N + * LOUTL + * LOUTR + * CPN2 + * CPP2 + * CPN1 + * CPP1 + * HPO_R + * HPO_L + * ADCDAT1 + * DACDAT1 + * LRCK1 + * BCLK1 + * MCLK + * GPIO1 + +Example: + +rt5616 { + compatible = "realtek,rt5616"; + reg = <0x1b>; +};
Am Montag, 21. Dezember 2015, 21:18:14 schrieb Caesar Wang:
Add the description for rt5616 codec.
Signed-off-by: Caesar Wang wxt@rock-chips.com
Documentation/devicetree/bindings/sound/rt5616.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt
diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt new file mode 100644 index 0000000..af96207 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rt5616.txt @@ -0,0 +1,38 @@ +RT5616 audio CODEC
+This device supports I2C only.
+Required properties:
+- compatible : "realtek,rt5616".
+- reg : The I2C address of the device.
+Optional properties:
you don't have optional properties, so that headline should probably also not be here.
Heiko
在 2015年12月21日 22:10, Heiko Stübner 写道:
Am Montag, 21. Dezember 2015, 21:18:14 schrieb Caesar Wang:
Add the description for rt5616 codec.
Signed-off-by: Caesar Wang wxt@rock-chips.com
Documentation/devicetree/bindings/sound/rt5616.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt
diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt new file mode 100644 index 0000000..af96207 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rt5616.txt @@ -0,0 +1,38 @@ +RT5616 audio CODEC
+This device supports I2C only.
+Required properties:
+- compatible : "realtek,rt5616".
+- reg : The I2C address of the device.
+Optional properties:
you don't have optional properties, so that headline should probably also not be here.
Yep, that should remove in here. :-(
Thanks！
Heiko
Add the description for rt5616 codec.
Signed-off-by: Caesar Wang wxt@rock-chips.com
---
Changes in v1: - As Heiko comments, remove the not exist option properties.
Documentation/devicetree/bindings/sound/rt5616.txt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt
diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt new file mode 100644 index 0000000..2030a22 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rt5616.txt @@ -0,0 +1,36 @@ +RT5616 audio CODEC + +This device supports I2C only. + +Required properties: + +- compatible : "realtek,rt5616". + +- reg : The I2C address of the device. + +Pins on the device (for linking into audio routes) for RT5616: + + * IN1P + * IN2P + * IN2N + * LOUTL + * LOUTR + * CPN2 + * CPP2 + * CPN1 + * CPP1 + * HPO_R + * HPO_L + * ADCDAT1 + * DACDAT1 + * LRCK1 + * BCLK1 + * MCLK + * GPIO1 + +Example: + +rt5616 { + compatible = "realtek,rt5616"; + reg = <0x1b>; +};
-----Original Message----- From: Caesar Wang [mailto:wxt@rock-chips.com] Sent: Monday, December 21, 2015 10:56 PM To: broonie@kernel.org; robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; alsa-devel@alsa-project.org; Bard Liao; heiko@sntech.de; Caesar Wang Subject: [PATCH v1 2/2] dt-bindings: sound: add devicetree document for rt5616
Add the description for rt5616 codec.
Signed-off-by: Caesar Wang wxt@rock-chips.com
Changes in v1:
- As Heiko comments, remove the not exist option properties.
Documentation/devicetree/bindings/sound/rt5616.txt | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt
diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt new file mode 100644 index 0000000..2030a22 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/rt5616.txt @@ -0,0 +1,36 @@ +RT5616 audio CODEC
+This device supports I2C only.
+Required properties:
+- compatible : "realtek,rt5616".
+- reg : The I2C address of the device.
+Pins on the device (for linking into audio routes) for RT5616:
- IN1P
- IN2P
- IN2N
- LOUTL
- LOUTR
These names below seems not defined in rt5616_dapm_widgets. Where are they from?
- CPN2
- CPP2
- CPN1
- CPP1
- HPO_R
- HPO_L
- ADCDAT1
- DACDAT1
- LRCK1
- BCLK1
- MCLK
- GPIO1
+Example:
+rt5616 {
- compatible = "realtek,rt5616";
- reg = <0x1b>;
+};
1.9.1
The patch
ASoC: rt5616: add an of_match table
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From e17ff2de826f8c2153cf23c8bbd9097219a84fa9 Mon Sep 17 00:00:00 2001
From: Caesar Wang wxt@rock-chips.com Date: Tue, 22 Dec 2015 13:45:02 +0800 Subject: [PATCH] ASoC: rt5616: add an of_match table
Add a device tree match table. This serves to make the driver's support of device tree more explicit.
Signed-off-by: Caesar Wang wxt@rock-chips.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/codecs/rt5616.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c index 0e9414abab65..7bb56dddff8e 100644 --- a/sound/soc/codecs/rt5616.c +++ b/sound/soc/codecs/rt5616.c @@ -1287,6 +1287,14 @@ static const struct i2c_device_id rt5616_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt5616_i2c_id);
+#if defined(CONFIG_OF) +static const struct of_device_id rt5616_of_match[] = { + { .compatible = "realtek,rt5616", }, + {}, +}; +MODULE_DEVICE_TABLE(of, rt5616_of_match); +#endif + static int rt5616_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1359,6 +1367,7 @@ static void rt5616_i2c_shutdown(struct i2c_client *client) static struct i2c_driver rt5616_i2c_driver = { .driver = { .name = "rt5616", + .of_match_table = of_match_ptr(rt5616_of_match), }, .probe = rt5616_i2c_probe, .remove = rt5616_i2c_remove,
participants (4)
-
Bard Liao -
Caesar Wang -
Heiko Stübner -
Mark Brown