* [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-12 7:26 [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Jianqun
@ 2014-09-12 7:30 ` Jianqun
2014-09-12 9:10 ` Jianqun
2014-09-12 13:44 ` Mark Brown
2014-09-12 7:32 ` [PATCH 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090 Jianqun
` (3 subsequent siblings)
4 siblings, 2 replies; 18+ messages in thread
From: Jianqun @ 2014-09-12 7:30 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, broonie, perex, tiwai, grant.likely, jay.xu,
devicetree, linux-kernel, linux-arm-kernel
Cc: huangtao, cf
Add documentation for rockchip-max98090 driver, which is need by rockchip
board using a max98090.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
.../sound/rockchip,rockchip-audio-max98090.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt
new file mode 100644
index 0000000..1aa300e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt
@@ -0,0 +1,23 @@
+ROCKCHIP audio complex, with MAX98090 CODEC
+
+Required properties:
+- compatible : must be "rockchip,rockchip-audio-max98090"
+- rockchip,model : the user-visible name of this sound complex
+- rockchip,i2s-controller : The phandle of the Tegra I2S controller that's
+ connected to the CODEC.
+- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
+
+Optional properties:
+- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
+- rockchip,mic-det-gpios : The GPIO that detect micphones are plugged in
+
+Example:
+
+sound {
+ compatible = "rockchip,rockchip-audio-max98090";
+ rockchip,model = "ROCKCHIP-I2S";
+ rockchip,i2s-controller = <&i2s>;
+ rockchip,audio-codec = <&max98090>;
+ rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
+ rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
+};
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-12 7:30 ` [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver Jianqun
@ 2014-09-12 9:10 ` Jianqun
2014-09-12 10:04 ` Heiko Stübner
2014-09-12 13:44 ` Mark Brown
1 sibling, 1 reply; 18+ messages in thread
From: Jianqun @ 2014-09-12 9:10 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, broonie, perex, tiwai, grant.likely, jay.xu,
devicetree, linux-kernel, linux-arm-kernel
Cc: huangtao, cf
Add documentation for rockchip-max98090 driver, which is need by rockchip
board using a max98090.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
changes since v1:
- modify error text from "Tegra" to "rockchip"
.../sound/rockchip,rockchip-audio-max98090.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt
new file mode 100644
index 0000000..e12d1a0
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.txt
@@ -0,0 +1,23 @@
+ROCKCHIP audio complex, with MAX98090 CODEC
+
+Required properties:
+- compatible : must be "rockchip,rockchip-audio-max98090"
+- rockchip,model : the user-visible name of this sound complex
+- rockchip,i2s-controller : The phandle of the rockchip I2S controller
+ that's connected to the CODEC.
+- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
+
+Optional properties:
+- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
+- rockchip,mic-det-gpios : The GPIO that detect micphones are plugged in
+
+Example:
+
+sound {
+ compatible = "rockchip,rockchip-audio-max98090";
+ rockchip,model = "ROCKCHIP-I2S";
+ rockchip,i2s-controller = <&i2s>;
+ rockchip,audio-codec = <&max98090>;
+ rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
+ rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
+};
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-12 9:10 ` Jianqun
@ 2014-09-12 10:04 ` Heiko Stübner
2014-09-12 10:12 ` Jianqun
0 siblings, 1 reply; 18+ messages in thread
From: Heiko Stübner @ 2014-09-12 10:04 UTC (permalink / raw)
To: Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
lgirdwood, broonie, perex, tiwai, grant.likely, devicetree,
linux-kernel, linux-arm-kernel, huangtao, cf
Hi Jianqun,
Am Freitag, 12. September 2014, 17:10:55 schrieb Jianqun:
> Add documentation for rockchip-max98090 driver, which is need by rockchip
> board using a max98090.
>
> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
> ---
> changes since v1:
please make sure to also include the version in the patch subject, so that
people can always see which is which. This one should've been
[PATCH v2 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
Because without this identification, people can only try to guess which one is the
newest version.
Heiko
> - modify error text from "Tegra" to "rockchip"
>
> .../sound/rockchip,rockchip-audio-max98090.txt | 23
> ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
> create mode 100644
> Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.tx
> t
>
> diff --git
> a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.
> txt
> b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.
> txt new file mode 100644
> index 0000000..e12d1a0
> --- /dev/null
> +++
> b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.
> txt @@ -0,0 +1,23 @@
> +ROCKCHIP audio complex, with MAX98090 CODEC
> +
> +Required properties:
> +- compatible : must be "rockchip,rockchip-audio-max98090"
> +- rockchip,model : the user-visible name of this sound complex
> +- rockchip,i2s-controller : The phandle of the rockchip I2S controller
> + that's connected to the CODEC.
> +- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
> +
> +Optional properties:
> +- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
> +- rockchip,mic-det-gpios : The GPIO that detect micphones are plugged in
> +
> +Example:
> +
> +sound {
> + compatible = "rockchip,rockchip-audio-max98090";
> + rockchip,model = "ROCKCHIP-I2S";
> + rockchip,i2s-controller = <&i2s>;
> + rockchip,audio-codec = <&max98090>;
> + rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
> + rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
> +};
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-12 10:04 ` Heiko Stübner
@ 2014-09-12 10:12 ` Jianqun
0 siblings, 0 replies; 18+ messages in thread
From: Jianqun @ 2014-09-12 10:12 UTC (permalink / raw)
To: Heiko Stübner, Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
lgirdwood, broonie, perex, tiwai, grant.likely, devicetree,
linux-kernel, linux-arm-kernel, huangtao, cf
在 09/12/2014 06:04 PM, Heiko Stübner 写道:
> Hi Jianqun,
>
> Am Freitag, 12. September 2014, 17:10:55 schrieb Jianqun:
>> Add documentation for rockchip-max98090 driver, which is need by rockchip
>> board using a max98090.
>>
>> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
>> ---
>> changes since v1:
>
> please make sure to also include the version in the patch subject, so that
> people can always see which is which. This one should've been
>
> [PATCH v2 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
>
> Because without this identification, people can only try to guess which one is the
> newest version.
>
ok, thanks, I will notice this in the future
>
> Heiko
>
>> - modify error text from "Tegra" to "rockchip"
>>
>> .../sound/rockchip,rockchip-audio-max98090.txt | 23
>> ++++++++++++++++++++++ 1 file changed, 23 insertions(+)
>> create mode 100644
>> Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.tx
>> t
>>
>> diff --git
>> a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.
>> txt
>> b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.
>> txt new file mode 100644
>> index 0000000..e12d1a0
>> --- /dev/null
>> +++
>> b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.
>> txt @@ -0,0 +1,23 @@
>> +ROCKCHIP audio complex, with MAX98090 CODEC
>> +
>> +Required properties:
>> +- compatible : must be "rockchip,rockchip-audio-max98090"
>> +- rockchip,model : the user-visible name of this sound complex
>> +- rockchip,i2s-controller : The phandle of the rockchip I2S controller
>> + that's connected to the CODEC.
>> +- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
>> +
>> +Optional properties:
>> +- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
>> +- rockchip,mic-det-gpios : The GPIO that detect micphones are plugged in
>> +
>> +Example:
>> +
>> +sound {
>> + compatible = "rockchip,rockchip-audio-max98090";
>> + rockchip,model = "ROCKCHIP-I2S";
>> + rockchip,i2s-controller = <&i2s>;
>> + rockchip,audio-codec = <&max98090>;
>> + rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
>> + rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
>> +};
>
>
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-12 7:30 ` [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver Jianqun
2014-09-12 9:10 ` Jianqun
@ 2014-09-12 13:44 ` Mark Brown
2014-09-28 0:54 ` Jianqun
1 sibling, 1 reply; 18+ messages in thread
From: Mark Brown @ 2014-09-12 13:44 UTC (permalink / raw)
To: Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
[-- Attachment #1: Type: text/plain, Size: 892 bytes --]
On Fri, Sep 12, 2014 at 03:30:36PM +0800, Jianqun wrote:
> Add documentation for rockchip-max98090 driver, which is need by rockchip
> board using a max98090.
Can this use simple-card (perhaps after a bit of extension)?
> +- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
Is the driver really specific to this CODEC?
> +
> +Optional properties:
> +- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
> +- rockchip,mic-det-gpios : The GPIO that detect micphones are plugged in
> +
> +Example:
> +
> +sound {
> + compatible = "rockchip,rockchip-audio-max98090";
> + rockchip,model = "ROCKCHIP-I2S";
> + rockchip,i2s-controller = <&i2s>;
> + rockchip,audio-codec = <&max98090>;
> + rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
> + rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
> +};
> --
> 1.9.1
>
>
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-12 13:44 ` Mark Brown
@ 2014-09-28 0:54 ` Jianqun
2014-09-28 10:48 ` Mark Brown
0 siblings, 1 reply; 18+ messages in thread
From: Jianqun @ 2014-09-28 0:54 UTC (permalink / raw)
To: Mark Brown, Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
在 09/12/2014 09:44 PM, Mark Brown 写道:
> On Fri, Sep 12, 2014 at 03:30:36PM +0800, Jianqun wrote:
>> Add documentation for rockchip-max98090 driver, which is need by rockchip
>> board using a max98090.
>
> Can this use simple-card (perhaps after a bit of extension)?
I haven't ever try simple-card, is there any sample usage for me from other vendor ?
>
>> +- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
>
> Is the driver really specific to this CODEC?
I think yes, we need to add two gpio for mic and hp detect, but simple-card driver hasn't them
>
>> +
>> +Optional properties:
>> +- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
>> +- rockchip,mic-det-gpios : The GPIO that detect micphones are plugged in
>> +
>> +Example:
>> +
>> +sound {
>> + compatible = "rockchip,rockchip-audio-max98090";
>> + rockchip,model = "ROCKCHIP-I2S";
>> + rockchip,i2s-controller = <&i2s>;
>> + rockchip,audio-codec = <&max98090>;
>> + rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;
>> + rockchip,mic-det-gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
>> +};
>> --
>> 1.9.1
>>
>>
>>
--
Jianqun Xu
****************************************************************************
*IMPORTANT NOTICE:*This email is from Fuzhou Rockchip Electronics Co.,
Ltd .The contents of this email and any attachments may contain
information that is privileged, confidential and/or exempt from
disclosure under applicable law and relevant NDA. If you are not the
intended recipient, you are hereby notified that any disclosure,
copying, distribution, or use of the information is STRICTLY PROHIBITED.
Please immediately contact the sender as soon as possible and destroy
the material in its entirety in any format. Thank you.
****************************************************************************
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-28 0:54 ` Jianqun
@ 2014-09-28 10:48 ` Mark Brown
2014-09-28 11:05 ` Jianqun
0 siblings, 1 reply; 18+ messages in thread
From: Mark Brown @ 2014-09-28 10:48 UTC (permalink / raw)
To: Jianqun
Cc: Jianqun, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, heiko, lgirdwood, perex, tiwai, grant.likely, devicetree,
linux-kernel, linux-arm-kernel, huangtao, cf
[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]
On Sun, Sep 28, 2014 at 08:54:27AM +0800, Jianqun wrote:
Please fix your mailer to word wrap within paragraphs.
> 在 09/12/2014 09:44 PM, Mark Brown 写道:
> > On Fri, Sep 12, 2014 at 03:30:36PM +0800, Jianqun wrote:
> >> Add documentation for rockchip-max98090 driver, which is need by rockchip
> >> board using a max98090.
> > Can this use simple-card (perhaps after a bit of extension)?
> I haven't ever try simple-card, is there any sample usage for me from other vendor ?
$ git grep -l simple-audio-card
Documentation/devicetree/bindings/sound/simple-card.txt
arch/arm/boot/dts/kirkwood-openrd-client.dts
arch/arm/boot/dts/kirkwood-t5325.dts
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
arch/arm/boot/dts/vf610-twr.dts
sound/soc/generic/simple-card.c
> >> +- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
> > Is the driver really specific to this CODEC?
> I think yes, we need to add two gpio for mic and hp detect, but simple-card driver hasn't them
That'd be the "possibly with some extensions" bit then... if they're
just isolated GPIOs there's not really much board specific about having
them.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver
2014-09-28 10:48 ` Mark Brown
@ 2014-09-28 11:05 ` Jianqun
0 siblings, 0 replies; 18+ messages in thread
From: Jianqun @ 2014-09-28 11:05 UTC (permalink / raw)
To: Mark Brown
Cc: Jianqun, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, heiko, lgirdwood, perex, tiwai, grant.likely, devicetree,
linux-kernel, linux-arm-kernel, huangtao, cf
在 09/28/2014 06:48 PM, Mark Brown 写道:
> On Sun, Sep 28, 2014 at 08:54:27AM +0800, Jianqun wrote:
>
> Please fix your mailer to word wrap within paragraphs.
>
>> 在 09/12/2014 09:44 PM, Mark Brown 写道:
>>> On Fri, Sep 12, 2014 at 03:30:36PM +0800, Jianqun wrote:
>>>> Add documentation for rockchip-max98090 driver, which is need by rockchip
>>>> board using a max98090.
>
>>> Can this use simple-card (perhaps after a bit of extension)?
>> I haven't ever try simple-card, is there any sample usage for me from other vendor ?
>
> $ git grep -l simple-audio-card
> Documentation/devicetree/bindings/sound/simple-card.txt
> arch/arm/boot/dts/kirkwood-openrd-client.dts
> arch/arm/boot/dts/kirkwood-t5325.dts
> arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
> arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
> arch/arm/boot/dts/vf610-twr.dts
> sound/soc/generic/simple-card.c
>
thanks
>>>> +- rockchip,audio-codec : The phandle of the MAX98090 audio codec.
>
>>> Is the driver really specific to this CODEC?
>
>> I think yes, we need to add two gpio for mic and hp detect, but simple-card driver hasn't them
>
> That'd be the "possibly with some extensions" bit then... if they're
> just isolated GPIOs there's not really much board specific about having
> them.
>
I'll try it first, thanks Mark
--
Jianqun Xu
****************************************************************************
*IMPORTANT NOTICE:*This email is from Fuzhou Rockchip Electronics Co.,
Ltd .The contents of this email and any attachments may contain
information that is privileged, confidential and/or exempt from
disclosure under applicable law and relevant NDA. If you are not the
intended recipient, you are hereby notified that any disclosure,
copying, distribution, or use of the information is STRICTLY PROHIBITED.
Please immediately contact the sender as soon as possible and destroy
the material in its entirety in any format. Thank you.
****************************************************************************
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-09-12 7:26 [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Jianqun
2014-09-12 7:30 ` [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver Jianqun
@ 2014-09-12 7:32 ` Jianqun
2014-09-12 7:39 ` [PATCH] " Jianqun
` (2 subsequent siblings)
4 siblings, 0 replies; 18+ messages in thread
From: Jianqun @ 2014-09-12 7:32 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, broonie, perex, tiwai, grant.likely, jay.xu,
devicetree, linux-kernel, linux-arm-kernel
Cc: huangtao, cf
The driver is used for rockchip board using a max98090.
Test on RK3288 with max98090.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
sound/soc/rockchip/Kconfig | 9 +
sound/soc/rockchip/Makefile | 5 +-
sound/soc/rockchip/rockchip_max98090.c | 308 +++++++++++++++++++++++++++++++++
3 files changed, 321 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/rockchip/rockchip_max98090.c
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 78fc159..f82fbf5 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -9,3 +9,12 @@ config SND_SOC_ROCKCHIP
config SND_SOC_ROCKCHIP_I2S
tristate
+
+config SND_SOC_ROCKCHIP_MAX98090
+ tristate "ASoC support for Rockchip boards using a MAX98090 codec"
+ depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB
+ select SND_SOC_ROCKCHIP_I2S
+ select SND_SOC_MAX98090
+ help
+ Say Y or M here if you want to add support for SoC audio on Rockchip
+ boards using the MAX98090 codec, such as Veyron.
diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile
index b921909..c324411 100644
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
@@ -1,4 +1,7 @@
# ROCKCHIP Platform Support
snd-soc-i2s-objs := rockchip_i2s.o
-
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-i2s.o
+
+# ROCKCHIP Machine Support
+snd-soc-rockchip-max98090-objs := rockchip_max98090.o
+obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
new file mode 100644
index 0000000..8a7b7ba
--- /dev/null
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -0,0 +1,308 @@
+/*
+ * Rockchip machine ASoC driver for boards using a MAX90809 CODEC.
+ *
+ * Copyright (c) 2014, ROCKCHIP CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include "rockchip_i2s.h"
+
+#define DRV_NAME "rockchip-snd-max98090"
+
+struct rockchip_max98090 {
+ int gpio_hp_det;
+ int gpio_mic_det;
+};
+
+static int rockchip_max98090_asoc_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ struct snd_soc_codec *codec = codec_dai->codec;
+ struct snd_soc_card *card = codec->card;
+ int mclk, ret;
+ unsigned int dai_fmt = rtd->dai_link->dai_fmt;
+
+ /* set codec DAI configuration */
+ ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
+ if (ret < 0) {
+ dev_err(card->dev, "codec_dai format not set, %d\n", ret);
+ return ret;
+ }
+
+ /* set cpu DAI configuration */
+ ret = snd_soc_dai_set_fmt(cpu_dai, dai_fmt);
+ if (ret < 0) {
+ dev_err(card->dev, "cpu_dai format not set, %d\n", ret);
+ return ret;
+ }
+
+ switch (params_rate(params)) {
+ case 8000:
+ case 16000:
+ case 24000:
+ case 32000:
+ case 48000:
+ case 64000:
+ case 96000:
+ mclk = 12288000;
+ break;
+ case 11025:
+ case 22050:
+ case 44100:
+ case 88200:
+ mclk = 11289600;
+ break;
+ default:
+ return -EINVAL;
+ }
+ mclk = 12000000;
+ ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk,
+ SND_SOC_CLOCK_OUT);
+ if (ret < 0) {
+ dev_err(card->dev, "cpu_dai clock not set, %d\n", ret);
+ return ret;
+ }
+
+ ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,
+ SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(card->dev, "codec_dai clock not set, %d\n", ret);
+ return ret;
+ }
+
+ return ret;
+}
+
+static struct snd_soc_ops rockchip_max98090_ops = {
+ .hw_params = rockchip_max98090_asoc_hw_params,
+};
+
+static struct snd_soc_jack rockchip_max98090_hp_jack;
+static struct snd_soc_jack_pin rockchip_max98090_hp_jack_pins[] = {
+ {
+ .pin = "Headphones",
+ .mask = SND_JACK_HEADPHONE,
+ },
+};
+
+static struct snd_soc_jack_gpio rockchip_max98090_hp_jack_gpio = {
+ .name = "Headphone detection",
+ .report = SND_JACK_HEADPHONE,
+ .debounce_time = 150,
+ .invert = 1,
+};
+
+static struct snd_soc_jack rockchip_max98090_mic_jack;
+static struct snd_soc_jack_pin rockchip_max98090_mic_jack_pins[] = {
+ {
+ .pin = "Mic Jack",
+ .mask = SND_JACK_MICROPHONE,
+ },
+};
+
+static struct snd_soc_jack_gpio rockchip_max98090_mic_jack_gpio = {
+ .name = "mic detect",
+ .report = SND_JACK_MICROPHONE,
+ .debounce_time = 150,
+ .invert = 0,
+};
+
+static const struct snd_soc_dapm_widget rockchip_max98090_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphones", NULL),
+ SND_SOC_DAPM_SPK("Speakers", NULL),
+ SND_SOC_DAPM_MIC("Mic Jack", NULL),
+};
+
+static const struct snd_kcontrol_new rockchip_max98090_controls[] = {
+ SOC_DAPM_PIN_SWITCH("Speakers"),
+};
+
+static int rockchip_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
+{
+ struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_card *card = codec->card;
+ struct device_node *dn = card->dev->of_node;
+
+ if (dn) {
+ enum of_gpio_flags flags;
+
+ rockchip_max98090_mic_jack_gpio.gpio = of_get_named_gpio_flags(
+ dn, "rockchip,mic-det-gpios", 0, &flags);
+ rockchip_max98090_mic_jack_gpio.invert =
+ !!(flags & OF_GPIO_ACTIVE_LOW);
+
+ rockchip_max98090_hp_jack_gpio.gpio = of_get_named_gpio_flags(
+ dn, "rockchip,hp-det-gpios", 0, &flags);
+ rockchip_max98090_hp_jack_gpio.invert =
+ !!(flags & OF_GPIO_ACTIVE_LOW);
+ }
+
+ if (gpio_is_valid(rockchip_max98090_mic_jack_gpio.gpio)) {
+ snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
+ &rockchip_max98090_mic_jack);
+ snd_soc_jack_add_pins(&rockchip_max98090_mic_jack,
+ 1, rockchip_max98090_mic_jack_pins);
+ snd_soc_jack_add_gpios(&rockchip_max98090_mic_jack, 1,
+ &rockchip_max98090_mic_jack_gpio);
+ }
+
+ if (gpio_is_valid(rockchip_max98090_hp_jack_gpio.gpio)) {
+ snd_soc_jack_new(codec, "Headphone Jack",
+ SND_JACK_HEADPHONE,
+ &rockchip_max98090_hp_jack);
+ snd_soc_jack_add_pins(&rockchip_max98090_hp_jack,
+ 1, rockchip_max98090_hp_jack_pins);
+ snd_soc_jack_add_gpios(&rockchip_max98090_hp_jack, 1,
+ &rockchip_max98090_hp_jack_gpio);
+ }
+
+ return 0;
+}
+
+static struct snd_soc_dai_link rockchip_max98090_dai = {
+ .name = "max98090",
+ .stream_name = "max98090 PCM",
+ .codec_dai_name = "HiFi",
+ .init = rockchip_max98090_asoc_init,
+ .ops = &rockchip_max98090_ops,
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct snd_soc_card snd_soc_rockchip_max98090 = {
+ .name = "ROCKCHIP-I2S",
+ .owner = THIS_MODULE,
+ .dai_link = &rockchip_max98090_dai,
+ .num_links = 1,
+ .controls = rockchip_max98090_controls,
+ .num_controls = ARRAY_SIZE(rockchip_max98090_controls),
+ .dapm_widgets = rockchip_max98090_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rockchip_max98090_dapm_widgets),
+ .fully_routed = true,
+};
+
+static int rockchip_max98090_probe(struct platform_device *pdev)
+{
+ struct device_node *np = pdev->dev.of_node;
+ struct snd_soc_card *card = &snd_soc_rockchip_max98090;
+ struct rockchip_max98090 *machine;
+ int ret;
+
+ machine = devm_kzalloc(&pdev->dev, sizeof(*machine), GFP_KERNEL);
+ if (!machine) {
+ dev_err(&pdev->dev, "Can't allocate rockchip_max98090\n");
+ return -ENOMEM;
+ }
+
+ card->dev = &pdev->dev;
+ platform_set_drvdata(pdev, card);
+ snd_soc_card_set_drvdata(card, machine);
+
+ machine->gpio_hp_det = of_get_named_gpio(np,
+ "rockchip,hp-det-gpios", 0);
+ if (machine->gpio_hp_det == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ ret = snd_soc_of_parse_card_name(card, "rockchip,model");
+ if (ret)
+ goto err;
+
+ ret = snd_soc_of_parse_audio_routing(card, "rockchip,audio-routing");
+ if (ret)
+ goto err;
+
+ rockchip_max98090_dai.codec_of_node = of_parse_phandle(np,
+ "rockchip,audio-codec", 0);
+ if (!rockchip_max98090_dai.codec_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,audio-codec' missing or invalid\n");
+ ret = -EINVAL;
+ goto err;
+ }
+
+ rockchip_max98090_dai.cpu_of_node = of_parse_phandle(np,
+ "rockchip,i2s-controller", 0);
+ if (!rockchip_max98090_dai.cpu_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,i2s-controller' missing or invalid\n");
+ ret = -EINVAL;
+ goto err;
+ }
+
+ rockchip_max98090_dai.platform_of_node =
+ rockchip_max98090_dai.cpu_of_node;
+
+ ret = snd_soc_register_card(card);
+ if (ret) {
+ dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+ ret);
+ goto err;
+ }
+
+ return 0;
+
+err:
+ return ret;
+}
+
+static int rockchip_max98090_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+ snd_soc_jack_free_gpios(&rockchip_max98090_hp_jack, 1,
+ &rockchip_max98090_hp_jack_gpio);
+
+ snd_soc_unregister_card(card);
+
+ return 0;
+}
+
+static const struct of_device_id rockchip_max98090_of_match[] = {
+ { .compatible = "rockchip,rockchip-audio-max98090", },
+ {},
+};
+
+static struct platform_driver rockchip_max98090_driver = {
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .pm = &snd_soc_pm_ops,
+ .of_match_table = rockchip_max98090_of_match,
+ },
+ .probe = rockchip_max98090_probe,
+ .remove = rockchip_max98090_remove,
+};
+module_platform_driver(rockchip_max98090_driver);
+
+MODULE_AUTHOR("jianqun <xjq@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip max98090 machine ASoC driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, rockchip_max98090_of_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-09-12 7:26 [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Jianqun
2014-09-12 7:30 ` [PATCH 1/2] ASoC: rockchip-max98090: add documentation for rockchip-max98090 driver Jianqun
2014-09-12 7:32 ` [PATCH 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090 Jianqun
@ 2014-09-12 7:39 ` Jianqun
2014-09-12 13:52 ` Mark Brown
2014-09-12 7:43 ` [PATCH 2/2] " Jianqun
2014-09-12 13:42 ` [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Mark Brown
4 siblings, 1 reply; 18+ messages in thread
From: Jianqun @ 2014-09-12 7:39 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, broonie, perex, tiwai, grant.likely, jay.xu,
devicetree, linux-kernel, linux-arm-kernel
Cc: huangtao, cf
The driver is used for rockchip board using a max98090.
Test on RK3288 with max98090.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
sound/soc/rockchip/Kconfig | 9 +
sound/soc/rockchip/Makefile | 5 +-
sound/soc/rockchip/rockchip_max98090.c | 326 +++++++++++++++++++++++++++++++++
3 files changed, 339 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/rockchip/rockchip_max98090.c
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 78fc159..f82fbf5 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -9,3 +9,12 @@ config SND_SOC_ROCKCHIP
config SND_SOC_ROCKCHIP_I2S
tristate
+
+config SND_SOC_ROCKCHIP_MAX98090
+ tristate "ASoC support for Rockchip boards using a MAX98090 codec"
+ depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB
+ select SND_SOC_ROCKCHIP_I2S
+ select SND_SOC_MAX98090
+ help
+ Say Y or M here if you want to add support for SoC audio on Rockchip
+ boards using the MAX98090 codec, such as Veyron.
diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile
index b921909..c324411 100644
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
@@ -1,4 +1,7 @@
# ROCKCHIP Platform Support
snd-soc-i2s-objs := rockchip_i2s.o
-
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-i2s.o
+
+# ROCKCHIP Machine Support
+snd-soc-rockchip-max98090-objs := rockchip_max98090.o
+obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
new file mode 100644
index 0000000..eb99ae7
--- /dev/null
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -0,0 +1,326 @@
+/*
+ * Rockchip machine ASoC driver for boards using a MAX90809 CODEC.
+ *
+ * Copyright (c) 2014, ROCKCHIP CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include "rockchip_i2s.h"
+
+#define DRV_NAME "rockchip-snd-max98090"
+#define RK_PLAT_CLK_12M 12000000
+
+struct rk_mc_private {
+ struct snd_soc_jack hp_jack;
+ struct snd_soc_jack mic_jack;
+};
+
+static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", NULL),
+ SND_SOC_DAPM_MIC("Headset Mic", NULL),
+ SND_SOC_DAPM_MIC("Int Mic", NULL),
+ SND_SOC_DAPM_SPK("Ext Spk", NULL),
+};
+
+static const struct snd_soc_dapm_route rk_audio_map[] = {
+ {"IN34", NULL, "Headset Mic"},
+ {"IN34", NULL, "MICBIAS"},
+ {"MICBIAS", NULL, "Headset Mic"},
+ {"DMICL", NULL, "Int Mic"},
+ {"Headphone", NULL, "HPL"},
+ {"Headphone", NULL, "HPR"},
+ {"Ext Spk", NULL, "SPKL"},
+ {"Ext Spk", NULL, "SPKR"},
+};
+
+static const struct snd_kcontrol_new rk_mc_controls[] = {
+ SOC_DAPM_PIN_SWITCH("Headphone"),
+ SOC_DAPM_PIN_SWITCH("Headset Mic"),
+ SOC_DAPM_PIN_SWITCH("Int Mic"),
+ SOC_DAPM_PIN_SWITCH("Ext Spk"),
+};
+
+static int rk_aif1_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ int ret = 0;
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+
+/* Set max98090 as master, i2s clock output 12MHz for max98090 */
+ ret = snd_soc_dai_set_sysclk(cpu_dai, 0,
+ RK_PLAT_CLK_12M,
+ SND_SOC_CLOCK_OUT);
+ if (ret < 0) {
+ dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);
+ return ret;
+ }
+
+/* Max98090 receive 12MHz as source clock for internel pll */
+ ret = snd_soc_dai_set_sysclk(codec_dai, 0,
+ RK_PLAT_CLK_12M,
+ SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);
+ return ret;
+ }
+
+ return ret;
+}
+
+static struct snd_soc_jack_pin hp_jack_pin = {
+ .pin = "Headphone",
+ .mask = SND_JACK_HEADPHONE,
+};
+
+static struct snd_soc_jack_pin mic_jack_pin = {
+ .pin = "Headset Mic",
+ .mask = SND_JACK_MICROPHONE,
+};
+
+static struct snd_soc_jack_gpio hp_jack_gpio = {
+ .name = "hp-gpio",
+ .report = SND_JACK_HEADPHONE,
+ .debounce_time = 200,
+ .invert = 1,
+};
+
+static struct snd_soc_jack_gpio mic_jack_gpio = {
+ .name = "mic-gpio",
+ .report = SND_JACK_MICROPHONE,
+ .debounce_time = 200,
+ .invert = 1,
+};
+
+static int rk_init(struct snd_soc_pcm_runtime *runtime)
+{
+ int ret = 0;
+ struct snd_soc_codec *codec = runtime->codec;
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
+ struct snd_soc_card *card = runtime->card;
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+ struct snd_soc_jack *hp_jack = &drv->hp_jack;
+ struct snd_soc_jack *mic_jack = &drv->mic_jack;
+
+ card->dapm.idle_bias_off = true;
+
+ ret = snd_soc_add_card_controls(card, rk_mc_controls,
+ ARRAY_SIZE(rk_mc_controls));
+ if (ret) {
+ pr_err("unable to add card controls\n");
+ return ret;
+ }
+
+ snd_soc_dapm_enable_pin(dapm, "Headset Mic");
+ snd_soc_dapm_enable_pin(dapm, "Headphone");
+ snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+ snd_soc_dapm_enable_pin(dapm, "Int Mic");
+
+ snd_soc_dapm_sync(dapm);
+
+ /* Enable headphone jack detection */
+ ret = snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
+ hp_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(hp_jack, 1, &hp_jack_pin);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_gpios(hp_jack, 1, &hp_jack_gpio);
+ if (ret)
+ return ret;
+
+ /* Enable mic jack detection */
+ ret = snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
+ mic_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(mic_jack, 1, &mic_jack_pin);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_gpios(mic_jack, 1, &mic_jack_gpio);
+ if (ret)
+ return ret;
+
+ return ret;
+}
+
+static struct snd_soc_ops rk_aif1_ops = {
+ .hw_params = rk_aif1_hw_params,
+};
+
+static struct snd_soc_dai_link rk_dailink = {
+ .name = "max98090",
+ .stream_name = "Audio",
+ .codec_dai_name = "HiFi",
+ .init = rk_init,
+ .ops = &rk_aif1_ops,
+ /* set max98090 as master */
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct snd_soc_card snd_soc_card_rk = {
+ .name = "ROCKCHIP-I2S",
+ .dai_link = &rk_dailink,
+ .num_links = 1,
+ .dapm_widgets = rk_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk_dapm_widgets),
+ .dapm_routes = rk_audio_map,
+ .num_dapm_routes = ARRAY_SIZE(rk_audio_map),
+ .controls = rk_mc_controls,
+ .num_controls = ARRAY_SIZE(rk_mc_controls),
+};
+
+#ifdef CONFIG_PM_SLEEP
+static int snd_rk_prepare(struct device *dev)
+{
+ struct snd_soc_card *card = dev_get_drvdata(dev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+
+ snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ return snd_soc_suspend(dev);
+}
+
+static void snd_rk_complete(struct device *dev)
+{
+ struct snd_soc_card *card = dev_get_drvdata(dev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+
+ snd_soc_jack_add_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_add_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ snd_soc_resume(dev);
+}
+
+static const struct dev_pm_ops rk_max98090_pm_ops = {
+ .prepare = snd_rk_prepare,
+ .complete = snd_rk_complete,
+};
+
+#define RK_MAX98090_PM_OPS (&rk_max98090_pm_ops)
+#else
+#define RK_MAX98090_PM_OPS NULL
+#endif
+
+static int snd_rk_mc_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct rk_mc_private *drv;
+ struct snd_soc_card *card = &snd_soc_card_rk;
+ struct device_node *np = pdev->dev.of_node;
+
+ drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
+ if (!drv)
+ return -ENOMEM;
+
+ hp_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,hp-det-gpios", 0);
+ if (hp_jack_gpio.gpio == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ mic_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,mic-det-gpios", 0);
+ if (mic_jack_gpio.gpio == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ /* register the soc card */
+ card->dev = &pdev->dev;
+ platform_set_drvdata(pdev, card);
+ snd_soc_card_set_drvdata(card, drv);
+
+ rk_dailink.codec_of_node = of_parse_phandle(np,
+ "rockchip,audio-codec", 0);
+ if (!rk_dailink.codec_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,audio-codec' missing or invalid\n");
+ return -EINVAL;
+ }
+
+ rk_dailink.cpu_of_node = of_parse_phandle(np,
+ "rockchip,i2s-controller", 0);
+ if (!rk_dailink.cpu_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,i2s-controller' missing or invalid\n");
+ return -EINVAL;
+ }
+
+ rk_dailink.platform_of_node = rk_dailink.cpu_of_node;
+
+ ret = snd_soc_register_card(card);
+ if (ret) {
+ pr_err("snd_soc_register_card failed %d\n", ret);
+ return ret;
+ }
+ platform_set_drvdata(pdev, &card);
+
+ ret = snd_soc_of_parse_card_name(card, "rockchip,model");
+ if (ret)
+ return ret;
+
+ return ret;
+}
+
+static int snd_rk_mc_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *soc_card = platform_get_drvdata(pdev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(soc_card);
+
+ snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ snd_soc_card_set_drvdata(soc_card, NULL);
+ snd_soc_unregister_card(soc_card);
+ platform_set_drvdata(pdev, NULL);
+ return 0;
+}
+
+static const struct of_device_id rockchip_max98090_of_match[] = {
+ { .compatible = "rockchip,rockchip-audio-max98090", },
+ {},
+};
+
+static struct platform_driver snd_rk_mc_driver = {
+ .probe = snd_rk_mc_probe,
+ .remove = snd_rk_mc_remove,
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .pm = RK_MAX98090_PM_OPS,
+ .of_match_table = rockchip_max98090_of_match,
+ },
+};
+
+module_platform_driver(snd_rk_mc_driver);
+MODULE_AUTHOR("jianqun <jay.xu@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip max98090 machine ASoC driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, rockchip_max98090_of_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-09-12 7:39 ` [PATCH] " Jianqun
@ 2014-09-12 13:52 ` Mark Brown
2014-10-02 8:06 ` Jianqun
0 siblings, 1 reply; 18+ messages in thread
From: Mark Brown @ 2014-09-12 13:52 UTC (permalink / raw)
To: Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
[-- Attachment #1: Type: text/plain, Size: 2255 bytes --]
On Fri, Sep 12, 2014 at 03:39:48PM +0800, Jianqun wrote:
> +#define RK_PLAT_CLK_12M 12000000
I'm not sure a define is adding anything here... it's just a define
saying 12MHz that has the value 12MHz.
> + struct snd_soc_dai *codec_dai = rtd->codec_dai;
> +
> +/* Set max98090 as master, i2s clock output 12MHz for max98090 */
> + ret = snd_soc_dai_set_sysclk(cpu_dai, 0,
Coding style, comments aren't aligned with the code.
> + ret = snd_soc_add_card_controls(card, rk_mc_controls,
> + ARRAY_SIZE(rk_mc_controls));
> + if (ret) {
> + pr_err("unable to add card controls\n");
> + return ret;
> + }
Use card->controls.
> + snd_soc_dapm_enable_pin(dapm, "Headset Mic");
> + snd_soc_dapm_enable_pin(dapm, "Headphone");
> + snd_soc_dapm_enable_pin(dapm, "Ext Spk");
> + snd_soc_dapm_enable_pin(dapm, "Int Mic");
> +
> + snd_soc_dapm_sync(dapm);
All pins are enabled by default and sync doesn't do anything during
init.
> +#ifdef CONFIG_PM_SLEEP
> +static int snd_rk_prepare(struct device *dev)
> +{
> + struct snd_soc_card *card = dev_get_drvdata(dev);
> + struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
> +
> + snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
> + snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
> +
> + return snd_soc_suspend(dev);
> +}
Why are you freeing the GPIOs over suspend, that doesn't seem good?
> + hp_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,hp-det-gpios", 0);
> + if (hp_jack_gpio.gpio == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
> +
> + mic_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,mic-det-gpios", 0);
> + if (mic_jack_gpio.gpio == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
This ignores errors other than probe deferral but the init code assumed
that these would've succeeded. Either the init code should handle
failure or all errors should be treated as fatal.
> + platform_set_drvdata(pdev, &card);
> +
> + ret = snd_soc_of_parse_card_name(card, "rockchip,model");
> + if (ret)
> + return ret;
These need to happen before we register the card since they could be
used as soon as we probe.
> + snd_soc_card_set_drvdata(soc_card, NULL);
No need to clear driver data, the core will do it anyway and anything
relying on pre-set driver data is broken.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-09-12 13:52 ` Mark Brown
@ 2014-10-02 8:06 ` Jianqun
0 siblings, 0 replies; 18+ messages in thread
From: Jianqun @ 2014-10-02 8:06 UTC (permalink / raw)
To: Mark Brown, Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
Hi Mark:
I'm still try to use simple-card driver but it hasn't do work from now on,
could I to update rockchip-max98090.c at the same time ?
在 09/12/2014 09:52 PM, Mark Brown 写道:
> On Fri, Sep 12, 2014 at 03:39:48PM +0800, Jianqun wrote:
>
>> +#define RK_PLAT_CLK_12M 12000000
> I'm not sure a define is adding anything here... it's just a define
> saying 12MHz that has the value 12MHz.
>
Okay
>> + struct snd_soc_dai *codec_dai = rtd->codec_dai;
>> +
>> +/* Set max98090 as master, i2s clock output 12MHz for max98090 */
>> + ret = snd_soc_dai_set_sysclk(cpu_dai, 0,
> Coding style, comments aren't aligned with the code.
Okay
>
>> + ret = snd_soc_add_card_controls(card, rk_mc_controls,
>> + ARRAY_SIZE(rk_mc_controls));
>> + if (ret) {
>> + pr_err("unable to add card controls\n");
>> + return ret;
>> + }
> Use card->controls.
Okay
>
>> + snd_soc_dapm_enable_pin(dapm, "Headset Mic");
>> + snd_soc_dapm_enable_pin(dapm, "Headphone");
>> + snd_soc_dapm_enable_pin(dapm, "Ext Spk");
>> + snd_soc_dapm_enable_pin(dapm, "Int Mic");
>> +
>> + snd_soc_dapm_sync(dapm);
> All pins are enabled by default and sync doesn't do anything during
> init.
okay, will to remove sync in next version
>> +#ifdef CONFIG_PM_SLEEP
>> +static int snd_rk_prepare(struct device *dev)
>> +{
>> + struct snd_soc_card *card = dev_get_drvdata(dev);
>> + struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
>> +
>> + snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
>> + snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
>> +
>> + return snd_soc_suspend(dev);
>> +}
> Why are you freeing the GPIOs over suspend, that doesn't seem good?
Okay , will to remove them in next version
>
>> + hp_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,hp-det-gpios", 0);
>> + if (hp_jack_gpio.gpio == -EPROBE_DEFER)
>> + return -EPROBE_DEFER;
>> +
>> + mic_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,mic-det-gpios", 0);
>> + if (mic_jack_gpio.gpio == -EPROBE_DEFER)
>> + return -EPROBE_DEFER;
> This ignores errors other than probe deferral but the init code assumed
> that these would've succeeded. Either the init code should handle
> failure or all errors should be treated as fatal.
dev_warn will be ok ?
>> + platform_set_drvdata(pdev, &card);
>> +
>> + ret = snd_soc_of_parse_card_name(card, "rockchip,model");
>> + if (ret)
>> + return ret;
> These need to happen before we register the card since they could be
> used as soon as we probe.
okay
>> + snd_soc_card_set_drvdata(soc_card, NULL);
> No need to clear driver data, the core will do it anyway and anything
> relying on pre-set driver data is broken.
okay
--
Jianqun Xu
****************************************************************************
*IMPORTANT NOTICE:*This email is from Fuzhou Rockchip Electronics Co.,
Ltd .The contents of this email and any attachments may contain
information that is privileged, confidential and/or exempt from
disclosure under applicable law and relevant NDA. If you are not the
intended recipient, you are hereby notified that any disclosure,
copying, distribution, or use of the information is STRICTLY PROHIBITED.
Please immediately contact the sender as soon as possible and destroy
the material in its entirety in any format. Thank you.
****************************************************************************
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-09-12 7:26 [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Jianqun
` (2 preceding siblings ...)
2014-09-12 7:39 ` [PATCH] " Jianqun
@ 2014-09-12 7:43 ` Jianqun
2014-10-02 8:36 ` [PATCH v2 " Jianqun
2014-09-12 13:42 ` [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Mark Brown
4 siblings, 1 reply; 18+ messages in thread
From: Jianqun @ 2014-09-12 7:43 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, broonie, perex, tiwai, grant.likely, jay.xu,
devicetree, linux-kernel, linux-arm-kernel
Cc: huangtao, cf
The driver is used for rockchip board using a max98090.
Test on RK3288 with max98090.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
sound/soc/rockchip/Kconfig | 9 +
sound/soc/rockchip/Makefile | 5 +-
sound/soc/rockchip/rockchip_max98090.c | 326 +++++++++++++++++++++++++++++++++
3 files changed, 339 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/rockchip/rockchip_max98090.c
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 78fc159..f82fbf5 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -9,3 +9,12 @@ config SND_SOC_ROCKCHIP
config SND_SOC_ROCKCHIP_I2S
tristate
+
+config SND_SOC_ROCKCHIP_MAX98090
+ tristate "ASoC support for Rockchip boards using a MAX98090 codec"
+ depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB
+ select SND_SOC_ROCKCHIP_I2S
+ select SND_SOC_MAX98090
+ help
+ Say Y or M here if you want to add support for SoC audio on Rockchip
+ boards using the MAX98090 codec, such as Veyron.
diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile
index b921909..c324411 100644
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
@@ -1,4 +1,7 @@
# ROCKCHIP Platform Support
snd-soc-i2s-objs := rockchip_i2s.o
-
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-i2s.o
+
+# ROCKCHIP Machine Support
+snd-soc-rockchip-max98090-objs := rockchip_max98090.o
+obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
new file mode 100644
index 0000000..eb99ae7
--- /dev/null
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -0,0 +1,326 @@
+/*
+ * Rockchip machine ASoC driver for boards using a MAX90809 CODEC.
+ *
+ * Copyright (c) 2014, ROCKCHIP CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include "rockchip_i2s.h"
+
+#define DRV_NAME "rockchip-snd-max98090"
+#define RK_PLAT_CLK_12M 12000000
+
+struct rk_mc_private {
+ struct snd_soc_jack hp_jack;
+ struct snd_soc_jack mic_jack;
+};
+
+static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", NULL),
+ SND_SOC_DAPM_MIC("Headset Mic", NULL),
+ SND_SOC_DAPM_MIC("Int Mic", NULL),
+ SND_SOC_DAPM_SPK("Ext Spk", NULL),
+};
+
+static const struct snd_soc_dapm_route rk_audio_map[] = {
+ {"IN34", NULL, "Headset Mic"},
+ {"IN34", NULL, "MICBIAS"},
+ {"MICBIAS", NULL, "Headset Mic"},
+ {"DMICL", NULL, "Int Mic"},
+ {"Headphone", NULL, "HPL"},
+ {"Headphone", NULL, "HPR"},
+ {"Ext Spk", NULL, "SPKL"},
+ {"Ext Spk", NULL, "SPKR"},
+};
+
+static const struct snd_kcontrol_new rk_mc_controls[] = {
+ SOC_DAPM_PIN_SWITCH("Headphone"),
+ SOC_DAPM_PIN_SWITCH("Headset Mic"),
+ SOC_DAPM_PIN_SWITCH("Int Mic"),
+ SOC_DAPM_PIN_SWITCH("Ext Spk"),
+};
+
+static int rk_aif1_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ int ret = 0;
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+
+/* Set max98090 as master, i2s clock output 12MHz for max98090 */
+ ret = snd_soc_dai_set_sysclk(cpu_dai, 0,
+ RK_PLAT_CLK_12M,
+ SND_SOC_CLOCK_OUT);
+ if (ret < 0) {
+ dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);
+ return ret;
+ }
+
+/* Max98090 receive 12MHz as source clock for internel pll */
+ ret = snd_soc_dai_set_sysclk(codec_dai, 0,
+ RK_PLAT_CLK_12M,
+ SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);
+ return ret;
+ }
+
+ return ret;
+}
+
+static struct snd_soc_jack_pin hp_jack_pin = {
+ .pin = "Headphone",
+ .mask = SND_JACK_HEADPHONE,
+};
+
+static struct snd_soc_jack_pin mic_jack_pin = {
+ .pin = "Headset Mic",
+ .mask = SND_JACK_MICROPHONE,
+};
+
+static struct snd_soc_jack_gpio hp_jack_gpio = {
+ .name = "hp-gpio",
+ .report = SND_JACK_HEADPHONE,
+ .debounce_time = 200,
+ .invert = 1,
+};
+
+static struct snd_soc_jack_gpio mic_jack_gpio = {
+ .name = "mic-gpio",
+ .report = SND_JACK_MICROPHONE,
+ .debounce_time = 200,
+ .invert = 1,
+};
+
+static int rk_init(struct snd_soc_pcm_runtime *runtime)
+{
+ int ret = 0;
+ struct snd_soc_codec *codec = runtime->codec;
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
+ struct snd_soc_card *card = runtime->card;
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+ struct snd_soc_jack *hp_jack = &drv->hp_jack;
+ struct snd_soc_jack *mic_jack = &drv->mic_jack;
+
+ card->dapm.idle_bias_off = true;
+
+ ret = snd_soc_add_card_controls(card, rk_mc_controls,
+ ARRAY_SIZE(rk_mc_controls));
+ if (ret) {
+ pr_err("unable to add card controls\n");
+ return ret;
+ }
+
+ snd_soc_dapm_enable_pin(dapm, "Headset Mic");
+ snd_soc_dapm_enable_pin(dapm, "Headphone");
+ snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+ snd_soc_dapm_enable_pin(dapm, "Int Mic");
+
+ snd_soc_dapm_sync(dapm);
+
+ /* Enable headphone jack detection */
+ ret = snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
+ hp_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(hp_jack, 1, &hp_jack_pin);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_gpios(hp_jack, 1, &hp_jack_gpio);
+ if (ret)
+ return ret;
+
+ /* Enable mic jack detection */
+ ret = snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
+ mic_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(mic_jack, 1, &mic_jack_pin);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_gpios(mic_jack, 1, &mic_jack_gpio);
+ if (ret)
+ return ret;
+
+ return ret;
+}
+
+static struct snd_soc_ops rk_aif1_ops = {
+ .hw_params = rk_aif1_hw_params,
+};
+
+static struct snd_soc_dai_link rk_dailink = {
+ .name = "max98090",
+ .stream_name = "Audio",
+ .codec_dai_name = "HiFi",
+ .init = rk_init,
+ .ops = &rk_aif1_ops,
+ /* set max98090 as master */
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct snd_soc_card snd_soc_card_rk = {
+ .name = "ROCKCHIP-I2S",
+ .dai_link = &rk_dailink,
+ .num_links = 1,
+ .dapm_widgets = rk_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk_dapm_widgets),
+ .dapm_routes = rk_audio_map,
+ .num_dapm_routes = ARRAY_SIZE(rk_audio_map),
+ .controls = rk_mc_controls,
+ .num_controls = ARRAY_SIZE(rk_mc_controls),
+};
+
+#ifdef CONFIG_PM_SLEEP
+static int snd_rk_prepare(struct device *dev)
+{
+ struct snd_soc_card *card = dev_get_drvdata(dev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+
+ snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ return snd_soc_suspend(dev);
+}
+
+static void snd_rk_complete(struct device *dev)
+{
+ struct snd_soc_card *card = dev_get_drvdata(dev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+
+ snd_soc_jack_add_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_add_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ snd_soc_resume(dev);
+}
+
+static const struct dev_pm_ops rk_max98090_pm_ops = {
+ .prepare = snd_rk_prepare,
+ .complete = snd_rk_complete,
+};
+
+#define RK_MAX98090_PM_OPS (&rk_max98090_pm_ops)
+#else
+#define RK_MAX98090_PM_OPS NULL
+#endif
+
+static int snd_rk_mc_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct rk_mc_private *drv;
+ struct snd_soc_card *card = &snd_soc_card_rk;
+ struct device_node *np = pdev->dev.of_node;
+
+ drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
+ if (!drv)
+ return -ENOMEM;
+
+ hp_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,hp-det-gpios", 0);
+ if (hp_jack_gpio.gpio == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ mic_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,mic-det-gpios", 0);
+ if (mic_jack_gpio.gpio == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+
+ /* register the soc card */
+ card->dev = &pdev->dev;
+ platform_set_drvdata(pdev, card);
+ snd_soc_card_set_drvdata(card, drv);
+
+ rk_dailink.codec_of_node = of_parse_phandle(np,
+ "rockchip,audio-codec", 0);
+ if (!rk_dailink.codec_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,audio-codec' missing or invalid\n");
+ return -EINVAL;
+ }
+
+ rk_dailink.cpu_of_node = of_parse_phandle(np,
+ "rockchip,i2s-controller", 0);
+ if (!rk_dailink.cpu_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,i2s-controller' missing or invalid\n");
+ return -EINVAL;
+ }
+
+ rk_dailink.platform_of_node = rk_dailink.cpu_of_node;
+
+ ret = snd_soc_register_card(card);
+ if (ret) {
+ pr_err("snd_soc_register_card failed %d\n", ret);
+ return ret;
+ }
+ platform_set_drvdata(pdev, &card);
+
+ ret = snd_soc_of_parse_card_name(card, "rockchip,model");
+ if (ret)
+ return ret;
+
+ return ret;
+}
+
+static int snd_rk_mc_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *soc_card = platform_get_drvdata(pdev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(soc_card);
+
+ snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ snd_soc_card_set_drvdata(soc_card, NULL);
+ snd_soc_unregister_card(soc_card);
+ platform_set_drvdata(pdev, NULL);
+ return 0;
+}
+
+static const struct of_device_id rockchip_max98090_of_match[] = {
+ { .compatible = "rockchip,rockchip-audio-max98090", },
+ {},
+};
+
+static struct platform_driver snd_rk_mc_driver = {
+ .probe = snd_rk_mc_probe,
+ .remove = snd_rk_mc_remove,
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .pm = RK_MAX98090_PM_OPS,
+ .of_match_table = rockchip_max98090_of_match,
+ },
+};
+
+module_platform_driver(snd_rk_mc_driver);
+MODULE_AUTHOR("jianqun <jay.xu@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip max98090 machine ASoC driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, rockchip_max98090_of_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH v2 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-09-12 7:43 ` [PATCH 2/2] " Jianqun
@ 2014-10-02 8:36 ` Jianqun
2014-10-02 10:22 ` Mark Brown
0 siblings, 1 reply; 18+ messages in thread
From: Jianqun @ 2014-10-02 8:36 UTC (permalink / raw)
To: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, broonie, perex, tiwai, grant.likely, jay.xu,
devicetree, linux-kernel, linux-arm-kernel
Cc: huangtao, cf
The driver is used for rockchip board using a max98090.
Test on RK3288 board with max98090.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
changes since v1:
- remove unused defination RK_PLAT_CLK_12M, suggested by Mark
- set master clock according to sample rate, suggested by Mark
- set i2s as master mode for better performance
- dapm sync do nothing so remove it, suggested by Mark
- treat error when to get detect gpios as warning, suggested by Mark
- parse card name before to register card, suggested by Mark
- no need to clear driver data, suggested by Mark
sound/soc/rockchip/Kconfig | 9 +
sound/soc/rockchip/Makefile | 5 +-
sound/soc/rockchip/rockchip_max98090.c | 346 +++++++++++++++++++++++++++++++++
3 files changed, 359 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/rockchip/rockchip_max98090.c
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 78fc159..f82fbf5 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -9,3 +9,12 @@ config SND_SOC_ROCKCHIP
config SND_SOC_ROCKCHIP_I2S
tristate
+
+config SND_SOC_ROCKCHIP_MAX98090
+ tristate "ASoC support for Rockchip boards using a MAX98090 codec"
+ depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB
+ select SND_SOC_ROCKCHIP_I2S
+ select SND_SOC_MAX98090
+ help
+ Say Y or M here if you want to add support for SoC audio on Rockchip
+ boards using the MAX98090 codec, such as Veyron.
diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile
index b921909..c324411 100644
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
@@ -1,4 +1,7 @@
# ROCKCHIP Platform Support
snd-soc-i2s-objs := rockchip_i2s.o
-
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-i2s.o
+
+# ROCKCHIP Machine Support
+snd-soc-rockchip-max98090-objs := rockchip_max98090.o
+obj-$(CONFIG_SND_SOC_ROCKCHIP_MAX98090) += snd-soc-rockchip-max98090.o
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
new file mode 100644
index 0000000..928b161
--- /dev/null
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -0,0 +1,346 @@
+/*
+ * Rockchip machine ASoC driver for boards using a MAX90809 CODEC.
+ *
+ * Copyright (c) 2014, ROCKCHIP CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include "rockchip_i2s.h"
+
+#define DRV_NAME "rockchip-snd-max98090"
+
+struct rk_mc_private {
+ struct snd_soc_jack hp_jack;
+ struct snd_soc_jack mic_jack;
+};
+
+static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", NULL),
+ SND_SOC_DAPM_MIC("Headset Mic", NULL),
+ SND_SOC_DAPM_MIC("Int Mic", NULL),
+ SND_SOC_DAPM_SPK("Ext Spk", NULL),
+};
+
+static const struct snd_soc_dapm_route rk_audio_map[] = {
+ {"IN34", NULL, "Headset Mic"},
+ {"IN34", NULL, "MICBIAS"},
+ {"MICBIAS", NULL, "Headset Mic"},
+ {"DMICL", NULL, "Int Mic"},
+ {"Headphone", NULL, "HPL"},
+ {"Headphone", NULL, "HPR"},
+ {"Ext Spk", NULL, "SPKL"},
+ {"Ext Spk", NULL, "SPKR"},
+};
+
+static const struct snd_kcontrol_new rk_mc_controls[] = {
+ SOC_DAPM_PIN_SWITCH("Headphone"),
+ SOC_DAPM_PIN_SWITCH("Headset Mic"),
+ SOC_DAPM_PIN_SWITCH("Int Mic"),
+ SOC_DAPM_PIN_SWITCH("Ext Spk"),
+};
+
+static int rk_aif1_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ int ret = 0;
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+ int srate, mclk;
+
+ srate = params_rate(params);
+ switch (srate) {
+ case 8000:
+ case 16000:
+ case 24000:
+ case 32000:
+ case 48000:
+ case 64000:
+ case 96000:
+ mclk = 12288000;
+ break;
+ case 11025:
+ case 22050:
+ case 44100:
+ case 88200:
+ mclk = 11289600;
+ break;
+ default:
+ mclk = 12000000;
+ break;
+ }
+
+ ret = snd_soc_dai_set_sysclk(cpu_dai, 0,
+ mclk,
+ SND_SOC_CLOCK_OUT);
+ if (ret < 0) {
+ dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);
+ return ret;
+ }
+
+ ret = snd_soc_dai_set_sysclk(codec_dai, 0,
+ mclk,
+ SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);
+ return ret;
+ }
+
+ return ret;
+}
+
+static struct snd_soc_jack_pin hp_jack_pin = {
+ .pin = "Headphone",
+ .mask = SND_JACK_HEADPHONE,
+};
+
+static struct snd_soc_jack_pin mic_jack_pin = {
+ .pin = "Headset Mic",
+ .mask = SND_JACK_MICROPHONE,
+};
+
+static struct snd_soc_jack_gpio hp_jack_gpio = {
+ .name = "hp-gpio",
+ .report = SND_JACK_HEADPHONE,
+ .debounce_time = 200,
+ .invert = 1,
+};
+
+static struct snd_soc_jack_gpio mic_jack_gpio = {
+ .name = "mic-gpio",
+ .report = SND_JACK_MICROPHONE,
+ .debounce_time = 200,
+ .invert = 1,
+};
+
+static int rk_init(struct snd_soc_pcm_runtime *runtime)
+{
+ int ret = 0;
+ struct snd_soc_codec *codec = runtime->codec;
+ struct snd_soc_dapm_context *dapm = &codec->dapm;
+ struct snd_soc_card *card = runtime->card;
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+ struct snd_soc_jack *hp_jack = &drv->hp_jack;
+ struct snd_soc_jack *mic_jack = &drv->mic_jack;
+
+ card->dapm.idle_bias_off = true;
+
+ ret = snd_soc_add_card_controls(card, rk_mc_controls,
+ ARRAY_SIZE(rk_mc_controls));
+ if (ret) {
+ pr_err("unable to add card->controls\n");
+ return ret;
+ }
+
+ snd_soc_dapm_enable_pin(dapm, "Headset Mic");
+ snd_soc_dapm_enable_pin(dapm, "Headphone");
+ snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+ snd_soc_dapm_enable_pin(dapm, "Int Mic");
+
+ /* Enable headphone jack detection */
+ ret = snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
+ hp_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(hp_jack, 1, &hp_jack_pin);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_gpios(hp_jack, 1, &hp_jack_gpio);
+ if (ret)
+ return ret;
+
+ /* Enable mic jack detection */
+ ret = snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
+ mic_jack);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_pins(mic_jack, 1, &mic_jack_pin);
+ if (ret)
+ return ret;
+
+ ret = snd_soc_jack_add_gpios(mic_jack, 1, &mic_jack_gpio);
+ if (ret)
+ return ret;
+
+ return ret;
+}
+
+static struct snd_soc_ops rk_aif1_ops = {
+ .hw_params = rk_aif1_hw_params,
+};
+
+static struct snd_soc_dai_link rk_dailink = {
+ .name = "max98090",
+ .stream_name = "Audio",
+ .codec_dai_name = "HiFi",
+ .init = rk_init,
+ .ops = &rk_aif1_ops,
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct snd_soc_card snd_soc_card_rk = {
+ .name = "ROCKCHIP-I2S",
+ .dai_link = &rk_dailink,
+ .num_links = 1,
+ .dapm_widgets = rk_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk_dapm_widgets),
+ .dapm_routes = rk_audio_map,
+ .num_dapm_routes = ARRAY_SIZE(rk_audio_map),
+ .controls = rk_mc_controls,
+ .num_controls = ARRAY_SIZE(rk_mc_controls),
+};
+
+#ifdef CONFIG_PM_SLEEP
+static int snd_rk_prepare(struct device *dev)
+{
+ struct snd_soc_card *card = dev_get_drvdata(dev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+
+ snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ return snd_soc_suspend(dev);
+}
+
+static void snd_rk_complete(struct device *dev)
+{
+ struct snd_soc_card *card = dev_get_drvdata(dev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(card);
+
+ snd_soc_jack_add_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_add_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ snd_soc_resume(dev);
+}
+
+static const struct dev_pm_ops rk_max98090_pm_ops = {
+ .prepare = snd_rk_prepare,
+ .complete = snd_rk_complete,
+};
+
+#define RK_MAX98090_PM_OPS (&rk_max98090_pm_ops)
+#else
+#define RK_MAX98090_PM_OPS NULL
+#endif
+
+static int snd_rk_mc_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+ struct rk_mc_private *drv;
+ struct snd_soc_card *card = &snd_soc_card_rk;
+ struct device_node *np = pdev->dev.of_node;
+
+ drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
+ if (!drv)
+ return -ENOMEM;
+
+ hp_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,hp-det-gpios", 0);
+ if (gpio_is_valid(hp_jack_gpio.gpio))
+ dev_warn(&pdev->dev,
+ "Property 'rockchip,hp-det-gpios' missing or invalid\n");
+
+ mic_jack_gpio.gpio = of_get_named_gpio(np, "rockchip,mic-det-gpios", 0);
+ if (gpio_is_valid(mic_jack_gpio.gpio))
+ dev_warn(&pdev->dev,
+ "Property 'rockchip,mic-det-gpios' missing or invalid\n");
+
+ /* register the soc card */
+ card->dev = &pdev->dev;
+ platform_set_drvdata(pdev, card);
+ snd_soc_card_set_drvdata(card, drv);
+
+ rk_dailink.codec_of_node = of_parse_phandle(np,
+ "rockchip,audio-codec", 0);
+ if (!rk_dailink.codec_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,audio-codec' missing or invalid\n");
+ return -EINVAL;
+ }
+
+ rk_dailink.cpu_of_node = of_parse_phandle(np,
+ "rockchip,i2s-controller", 0);
+ if (!rk_dailink.cpu_of_node) {
+ dev_err(&pdev->dev,
+ "Property 'rockchip,i2s-controller' missing or invalid\n");
+ return -EINVAL;
+ }
+
+ rk_dailink.platform_of_node = rk_dailink.cpu_of_node;
+
+ ret = snd_soc_of_parse_card_name(card, "rockchip,model");
+ if (ret)
+ return ret;
+
+ ret = snd_soc_register_card(card);
+ if (ret) {
+ pr_err("snd_soc_register_card failed %d\n", ret);
+ return ret;
+ }
+
+ platform_set_drvdata(pdev, &card);
+
+ return ret;
+}
+
+static int snd_rk_mc_remove(struct platform_device *pdev)
+{
+ struct snd_soc_card *soc_card = platform_get_drvdata(pdev);
+ struct rk_mc_private *drv = snd_soc_card_get_drvdata(soc_card);
+
+ snd_soc_jack_free_gpios(&drv->hp_jack, 1, &hp_jack_gpio);
+ snd_soc_jack_free_gpios(&drv->mic_jack, 1, &mic_jack_gpio);
+
+ snd_soc_unregister_card(soc_card);
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+static const struct of_device_id rockchip_max98090_of_match[] = {
+ { .compatible = "rockchip,rockchip-audio-max98090", },
+ {},
+};
+
+static struct platform_driver snd_rk_mc_driver = {
+ .probe = snd_rk_mc_probe,
+ .remove = snd_rk_mc_remove,
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .pm = RK_MAX98090_PM_OPS,
+ .of_match_table = rockchip_max98090_of_match,
+ },
+};
+
+module_platform_driver(snd_rk_mc_driver);
+MODULE_AUTHOR("jianqun <jay.xu@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip max98090 machine ASoC driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, rockchip_max98090_of_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 2/2] ASoC: rockchip-max98090: add driver for rockchip board using a max98090
2014-10-02 8:36 ` [PATCH v2 " Jianqun
@ 2014-10-02 10:22 ` Mark Brown
0 siblings, 0 replies; 18+ messages in thread
From: Mark Brown @ 2014-10-02 10:22 UTC (permalink / raw)
To: Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
On Thu, Oct 02, 2014 at 04:36:00PM +0800, Jianqun wrote:
> The driver is used for rockchip board using a max98090.
> Test on RK3288 board with max98090.
I'm missing patch 1?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090
2014-09-12 7:26 [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Jianqun
` (3 preceding siblings ...)
2014-09-12 7:43 ` [PATCH 2/2] " Jianqun
@ 2014-09-12 13:42 ` Mark Brown
2014-09-14 3:00 ` Jianqun
4 siblings, 1 reply; 18+ messages in thread
From: Mark Brown @ 2014-09-12 13:42 UTC (permalink / raw)
To: Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
On Fri, Sep 12, 2014 at 03:26:46PM +0800, Jianqun wrote:
> This patch to add driver for rockchip board using a max98090.
>
> Tested on RK3288 using a max98090.
This appears to have two slightly different copies of the patches
threaded to it... that's a bit confusing.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090
2014-09-12 13:42 ` [PATCH 0/2] rockchip-max98090: add driver for rockchip board with max98090 Mark Brown
@ 2014-09-14 3:00 ` Jianqun
0 siblings, 0 replies; 18+ messages in thread
From: Jianqun @ 2014-09-14 3:00 UTC (permalink / raw)
To: Mark Brown, Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, heiko,
lgirdwood, perex, tiwai, grant.likely, devicetree, linux-kernel,
linux-arm-kernel, huangtao, cf
在 09/12/2014 09:42 PM, Mark Brown 写道:
> On Fri, Sep 12, 2014 at 03:26:46PM +0800, Jianqun wrote:
>> This patch to add driver for rockchip board using a max98090.
>>
>> Tested on RK3288 using a max98090.
>
> This appears to have two slightly different copies of the patches
> threaded to it... that's a bit confusing.
>
So sorry for all in the mail thread, I have made a stupid thing ~ since I made many
patches at a meantime ~
^ permalink raw reply [flat|nested] 18+ messages in thread