* [PATCH v12 1/2] ASoC: rt5514: Add devicetree binding support for rt5514-spi @ 2017-09-19 2:54 Jeffy Chen 2017-09-19 2:54 ` Jeffy Chen 0 siblings, 1 reply; 9+ messages in thread From: Jeffy Chen @ 2017-09-19 2:54 UTC (permalink / raw) To: linux-kernel, dgreid, heiko Cc: briannorris, broonie, mka, dianders, Jeffy Chen, devicetree, alsa-devel, Liam Girdwood, Rob Herring, Mark Rutland Add devicetree binding support for rt5514 spi dsp codec. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- Changes in v12: None Changes in v11: Use same compatible for rt5514-i2c & rt5514-spi. Changes in v10: Put rt5514-i2c doc & rt5514-spi doc together. Changes in v9: Address comments from Brian. Documentation/devicetree/bindings/sound/rt5514.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rt5514.txt b/Documentation/devicetree/bindings/sound/rt5514.txt index 929ca6756b02..4f33b0d96afe 100644 --- a/Documentation/devicetree/bindings/sound/rt5514.txt +++ b/Documentation/devicetree/bindings/sound/rt5514.txt @@ -1,22 +1,27 @@ RT5514 audio CODEC -This device supports I2C only. +This device supports both I2C and SPI. Required properties: - compatible : "realtek,rt5514". -- reg : The I2C address of the device. +- reg : the I2C address of the device for I2C, the chip select + number for SPI. Optional properties: - clocks: The phandle of the master clock to the CODEC - clock-names: Should be "mclk" +- interrupt-parent: The phandle for the interrupt controller. +- interrupts: The interrupt number to the cpu. The interrupt specifier format + depends on the interrupt controller. + - realtek,dmic-init-delay-ms - Set the DMIC initial delay (ms) to wait it ready. + Set the DMIC initial delay (ms) to wait it ready for I2C. -Pins on the device (for linking into audio routes) for RT5514: +Pins on the device (for linking into audio routes) for I2C: * DMIC1L * DMIC1R -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec 2017-09-19 2:54 [PATCH v12 1/2] ASoC: rt5514: Add devicetree binding support for rt5514-spi Jeffy Chen @ 2017-09-19 2:54 ` Jeffy Chen 0 siblings, 0 replies; 9+ messages in thread From: Jeffy Chen @ 2017-09-19 2:54 UTC (permalink / raw) To: linux-kernel, dgreid, heiko Cc: briannorris, broonie, mka, dianders, Jeffy Chen, Jaroslav Kysela, alsa-devel, linux-rockchip, Takashi Iwai, Liam Girdwood, linux-arm-kernel Currently rt5514 dsp and rt5514 codec are sharing the same compatible. Use bus_type to distinguish rt5514 dsp from rt5514 codec. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v12: Fix device leak. Changes in v11: None Changes in v10: None Changes in v9: None sound/soc/rockchip/rk3399_gru_sound.c | 61 ++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 0513fe480353..b7759f3d2aac 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -23,6 +23,7 @@ #include <linux/of_gpio.h> #include <linux/delay.h> #include <linux/spi/spi.h> +#include <linux/i2c.h> #include <linux/input.h> #include <sound/core.h> #include <sound/jack.h> @@ -329,15 +330,6 @@ enum { DAILINK_RT5514_DSP, }; -static const char * const dailink_compat[] = { - [DAILINK_CDNDP] = "rockchip,rk3399-cdn-dp", - [DAILINK_DA7219] = "dlg,da7219", - [DAILINK_DMIC] = "dmic-codec", - [DAILINK_MAX98357A] = "maxim,max98357a", - [DAILINK_RT5514] = "realtek,rt5514-i2c", - [DAILINK_RT5514_DSP] = "realtek,rt5514-spi", -}; - static const struct snd_soc_dai_link rockchip_dais[] = { [DAILINK_CDNDP] = { .name = "DP", @@ -391,13 +383,58 @@ static const struct snd_soc_dai_link rockchip_dais[] = { }, }; +struct dailink_match_data { + const char *compatible; + struct bus_type *bus_type; +}; + +static const struct dailink_match_data dailink_match[] = { + [DAILINK_CDNDP] = { + .compatible = "rockchip,rk3399-cdn-dp", + }, + [DAILINK_DA7219] = { + .compatible = "dlg,da7219", + }, + [DAILINK_DMIC] = { + .compatible = "dmic-codec", + }, + [DAILINK_MAX98357A] = { + .compatible = "maxim,max98357a", + }, + [DAILINK_RT5514] = { + .compatible = "realtek,rt5514", + .bus_type = &i2c_bus_type, + }, + [DAILINK_RT5514_DSP] = { + .compatible = "realtek,rt5514", + .bus_type = &spi_bus_type, + }, +}; + +static int of_dev_node_match(struct device *dev, void *data) +{ + return dev->of_node == data; +} + static int rockchip_sound_codec_node_match(struct device_node *np_codec) { + struct device *dev; int i; - for (i = 0; i < ARRAY_SIZE(dailink_compat); i++) { - if (of_device_is_compatible(np_codec, dailink_compat[i])) - return i; + for (i = 0; i < ARRAY_SIZE(dailink_match); i++) { + if (!of_device_is_compatible(np_codec, + dailink_match[i].compatible)) + continue; + + if (dailink_match[i].bus_type) { + dev = bus_find_device(dailink_match[i].bus_type, NULL, + np_codec, of_dev_node_match); + if (!dev) + continue; + put_device(dev); + } + + return i; } return -1; } -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec @ 2017-09-19 2:54 ` Jeffy Chen 0 siblings, 0 replies; 9+ messages in thread From: Jeffy Chen @ 2017-09-19 2:54 UTC (permalink / raw) To: linux-arm-kernel Currently rt5514 dsp and rt5514 codec are sharing the same compatible. Use bus_type to distinguish rt5514 dsp from rt5514 codec. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v12: Fix device leak. Changes in v11: None Changes in v10: None Changes in v9: None sound/soc/rockchip/rk3399_gru_sound.c | 61 ++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 0513fe480353..b7759f3d2aac 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -23,6 +23,7 @@ #include <linux/of_gpio.h> #include <linux/delay.h> #include <linux/spi/spi.h> +#include <linux/i2c.h> #include <linux/input.h> #include <sound/core.h> #include <sound/jack.h> @@ -329,15 +330,6 @@ enum { DAILINK_RT5514_DSP, }; -static const char * const dailink_compat[] = { - [DAILINK_CDNDP] = "rockchip,rk3399-cdn-dp", - [DAILINK_DA7219] = "dlg,da7219", - [DAILINK_DMIC] = "dmic-codec", - [DAILINK_MAX98357A] = "maxim,max98357a", - [DAILINK_RT5514] = "realtek,rt5514-i2c", - [DAILINK_RT5514_DSP] = "realtek,rt5514-spi", -}; - static const struct snd_soc_dai_link rockchip_dais[] = { [DAILINK_CDNDP] = { .name = "DP", @@ -391,13 +383,58 @@ static const struct snd_soc_dai_link rockchip_dais[] = { }, }; +struct dailink_match_data { + const char *compatible; + struct bus_type *bus_type; +}; + +static const struct dailink_match_data dailink_match[] = { + [DAILINK_CDNDP] = { + .compatible = "rockchip,rk3399-cdn-dp", + }, + [DAILINK_DA7219] = { + .compatible = "dlg,da7219", + }, + [DAILINK_DMIC] = { + .compatible = "dmic-codec", + }, + [DAILINK_MAX98357A] = { + .compatible = "maxim,max98357a", + }, + [DAILINK_RT5514] = { + .compatible = "realtek,rt5514", + .bus_type = &i2c_bus_type, + }, + [DAILINK_RT5514_DSP] = { + .compatible = "realtek,rt5514", + .bus_type = &spi_bus_type, + }, +}; + +static int of_dev_node_match(struct device *dev, void *data) +{ + return dev->of_node == data; +} + static int rockchip_sound_codec_node_match(struct device_node *np_codec) { + struct device *dev; int i; - for (i = 0; i < ARRAY_SIZE(dailink_compat); i++) { - if (of_device_is_compatible(np_codec, dailink_compat[i])) - return i; + for (i = 0; i < ARRAY_SIZE(dailink_match); i++) { + if (!of_device_is_compatible(np_codec, + dailink_match[i].compatible)) + continue; + + if (dailink_match[i].bus_type) { + dev = bus_find_device(dailink_match[i].bus_type, NULL, + np_codec, of_dev_node_match); + if (!dev) + continue; + put_device(dev); + } + + return i; } return -1; } -- 2.11.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec 2017-09-19 2:54 ` Jeffy Chen (?) @ 2017-09-19 12:46 ` Mark Brown -1 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2017-09-19 12:46 UTC (permalink / raw) To: Jeffy Chen Cc: linux-kernel, dgreid, heiko, briannorris, mka, dianders, Jaroslav Kysela, alsa-devel, linux-rockchip, Takashi Iwai, Liam Girdwood, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 260 bytes --] On Tue, Sep 19, 2017 at 10:54:39AM +0800, Jeffy Chen wrote: > Currently rt5514 dsp and rt5514 codec are sharing the same compatible. > Use bus_type to distinguish rt5514 dsp from rt5514 codec. This doens't apply against current code, please check and resend. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec @ 2017-09-19 12:46 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2017-09-19 12:46 UTC (permalink / raw) To: linux-arm-kernel On Tue, Sep 19, 2017 at 10:54:39AM +0800, Jeffy Chen wrote: > Currently rt5514 dsp and rt5514 codec are sharing the same compatible. > Use bus_type to distinguish rt5514 dsp from rt5514 codec. This doens't apply against current code, please check and resend. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170919/d78ab1f9/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec @ 2017-09-19 12:46 ` Mark Brown 0 siblings, 0 replies; 9+ messages in thread From: Mark Brown @ 2017-09-19 12:46 UTC (permalink / raw) To: Jeffy Chen Cc: alsa-devel, heiko, Liam Girdwood, briannorris, dianders, linux-kernel, linux-rockchip, mka, Takashi Iwai, dgreid, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 260 bytes --] On Tue, Sep 19, 2017 at 10:54:39AM +0800, Jeffy Chen wrote: > Currently rt5514 dsp and rt5514 codec are sharing the same compatible. > Use bus_type to distinguish rt5514 dsp from rt5514 codec. This doens't apply against current code, please check and resend. [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec 2017-09-19 12:46 ` Mark Brown (?) @ 2017-09-19 13:04 ` jeffy -1 siblings, 0 replies; 9+ messages in thread From: jeffy @ 2017-09-19 13:04 UTC (permalink / raw) To: Mark Brown Cc: linux-kernel, dgreid, heiko, briannorris, mka, dianders, Jaroslav Kysela, alsa-devel, linux-rockchip, Takashi Iwai, Liam Girdwood, linux-arm-kernel Hi Mark, On 09/19/2017 08:46 PM, Mark Brown wrote: > On Tue, Sep 19, 2017 at 10:54:39AM +0800, Jeffy Chen wrote: >> Currently rt5514 dsp and rt5514 codec are sharing the same compatible. >> Use bus_type to distinguish rt5514 dsp from rt5514 codec. > > This doens't apply against current code, please check and resend. > i sent a new series which contains all my patches and base on 840cc455c5f5 Add linux-next specific files for 20170919 please help to check, thanks :) https://py3.patchwork.dja.id.au/patch/66384/ ... https://py3.patchwork.dja.id.au/patch/66389/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec @ 2017-09-19 13:04 ` jeffy 0 siblings, 0 replies; 9+ messages in thread From: jeffy @ 2017-09-19 13:04 UTC (permalink / raw) To: linux-arm-kernel Hi Mark, On 09/19/2017 08:46 PM, Mark Brown wrote: > On Tue, Sep 19, 2017 at 10:54:39AM +0800, Jeffy Chen wrote: >> Currently rt5514 dsp and rt5514 codec are sharing the same compatible. >> Use bus_type to distinguish rt5514 dsp from rt5514 codec. > > This doens't apply against current code, please check and resend. > i sent a new series which contains all my patches and base on 840cc455c5f5 Add linux-next specific files for 20170919 please help to check, thanks :) https://py3.patchwork.dja.id.au/patch/66384/ ... https://py3.patchwork.dja.id.au/patch/66389/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec @ 2017-09-19 13:04 ` jeffy 0 siblings, 0 replies; 9+ messages in thread From: jeffy @ 2017-09-19 13:04 UTC (permalink / raw) To: Mark Brown Cc: alsa-devel, heiko, Liam Girdwood, briannorris, dianders, linux-kernel, linux-rockchip, mka, Takashi Iwai, dgreid, linux-arm-kernel Hi Mark, On 09/19/2017 08:46 PM, Mark Brown wrote: > On Tue, Sep 19, 2017 at 10:54:39AM +0800, Jeffy Chen wrote: >> Currently rt5514 dsp and rt5514 codec are sharing the same compatible. >> Use bus_type to distinguish rt5514 dsp from rt5514 codec. > > This doens't apply against current code, please check and resend. > i sent a new series which contains all my patches and base on 840cc455c5f5 Add linux-next specific files for 20170919 please help to check, thanks :) https://py3.patchwork.dja.id.au/patch/66384/ ... https://py3.patchwork.dja.id.au/patch/66389/ ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-09-19 13:04 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-09-19 2:54 [PATCH v12 1/2] ASoC: rt5514: Add devicetree binding support for rt5514-spi Jeffy Chen 2017-09-19 2:54 ` [PATCH v12 2/2] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec Jeffy Chen 2017-09-19 2:54 ` Jeffy Chen 2017-09-19 12:46 ` Mark Brown 2017-09-19 12:46 ` Mark Brown 2017-09-19 12:46 ` Mark Brown 2017-09-19 13:04 ` jeffy 2017-09-19 13:04 ` jeffy 2017-09-19 13:04 ` jeffy
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.