* [PATCH v1 0/2] Patches to add support spdif for rk322x @ 2017-06-09 7:59 Sugar Zhang 2017-06-09 7:59 ` [PATCH v1 1/2] ASoC: rockchip: add bindings for spdif controller Sugar Zhang 2017-06-09 7:59 ` [PATCH v1 2/2] ARM: dts: rk322x: add spdif node Sugar Zhang 0 siblings, 2 replies; 5+ messages in thread From: Sugar Zhang @ 2017-06-09 7:59 UTC (permalink / raw) To: heiko, broonie Cc: Mark Rutland, devicetree, alsa-devel, linux-kernel, Takashi Iwai, Liam Girdwood, Sugar Zhang, linux-rockchip, Rob Herring, Russell King, linux-arm-kernel These patches to add support spdif for rk322x socs. Sugar Zhang (2): ASoC: rockchip: add bindings for spdif controller ARM: dts: rk322x: add spdif node .../devicetree/bindings/sound/rockchip-spdif.txt | 2 ++ arch/arm/boot/dts/rk322x.dtsi | 20 ++++++++++++++++++++ sound/soc/rockchip/rockchip_spdif.c | 4 ++++ 3 files changed, 26 insertions(+) -- 1.9.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v1 1/2] ASoC: rockchip: add bindings for spdif controller 2017-06-09 7:59 [PATCH v1 0/2] Patches to add support spdif for rk322x Sugar Zhang @ 2017-06-09 7:59 ` Sugar Zhang 2017-06-13 21:07 ` Applied "ASoC: rockchip: add bindings for spdif controller" to the asoc tree Mark Brown 2017-06-09 7:59 ` [PATCH v1 2/2] ARM: dts: rk322x: add spdif node Sugar Zhang 1 sibling, 1 reply; 5+ messages in thread From: Sugar Zhang @ 2017-06-09 7:59 UTC (permalink / raw) To: heiko, broonie Cc: Mark Rutland, devicetree, alsa-devel, linux-kernel, Takashi Iwai, Liam Girdwood, Sugar Zhang, linux-rockchip, Rob Herring, linux-arm-kernel this patch add compatible for rk3228/rk3328 spdif, Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> --- Documentation/devicetree/bindings/sound/rockchip-spdif.txt | 2 ++ sound/soc/rockchip/rockchip_spdif.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt index 1104642..4706b96 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt @@ -9,7 +9,9 @@ Required properties: - compatible: should be one of the following: - "rockchip,rk3066-spdif" - "rockchip,rk3188-spdif" + - "rockchip,rk3228-spdif" - "rockchip,rk3288-spdif" + - "rockchip,rk3328-spdif" - "rockchip,rk3366-spdif" - "rockchip,rk3368-spdif" - "rockchip,rk3399-spdif" diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index fa8101d..ee5055d 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -49,8 +49,12 @@ struct rk_spdif_dev { .data = (void *)RK_SPDIF_RK3066 }, { .compatible = "rockchip,rk3188-spdif", .data = (void *)RK_SPDIF_RK3188 }, + { .compatible = "rockchip,rk3228-spdif", + .data = (void *)RK_SPDIF_RK3366 }, { .compatible = "rockchip,rk3288-spdif", .data = (void *)RK_SPDIF_RK3288 }, + { .compatible = "rockchip,rk3328-spdif", + .data = (void *)RK_SPDIF_RK3366 }, { .compatible = "rockchip,rk3366-spdif", .data = (void *)RK_SPDIF_RK3366 }, { .compatible = "rockchip,rk3368-spdif", -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: rockchip: add bindings for spdif controller" to the asoc tree 2017-06-09 7:59 ` [PATCH v1 1/2] ASoC: rockchip: add bindings for spdif controller Sugar Zhang @ 2017-06-13 21:07 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2017-06-13 21:07 UTC (permalink / raw) To: Sugar Zhang; +Cc: Mark Brown, heiko The patch ASoC: rockchip: add bindings for spdif controller 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 55f42d2e28a42b06907c916c3c71ceb6dfb5afc4 Mon Sep 17 00:00:00 2001 From: Sugar Zhang <sugar.zhang@rock-chips.com> Date: Fri, 9 Jun 2017 15:59:32 +0800 Subject: [PATCH] ASoC: rockchip: add bindings for spdif controller this patch add compatible for rk3228/rk3328 spdif, Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- Documentation/devicetree/bindings/sound/rockchip-spdif.txt | 2 ++ sound/soc/rockchip/rockchip_spdif.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt index 11046429a118..4706b96d450b 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt @@ -9,7 +9,9 @@ Required properties: - compatible: should be one of the following: - "rockchip,rk3066-spdif" - "rockchip,rk3188-spdif" + - "rockchip,rk3228-spdif" - "rockchip,rk3288-spdif" + - "rockchip,rk3328-spdif" - "rockchip,rk3366-spdif" - "rockchip,rk3368-spdif" - "rockchip,rk3399-spdif" diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index fa8101d1e16f..ee5055d47d13 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -49,8 +49,12 @@ static const struct of_device_id rk_spdif_match[] = { .data = (void *)RK_SPDIF_RK3066 }, { .compatible = "rockchip,rk3188-spdif", .data = (void *)RK_SPDIF_RK3188 }, + { .compatible = "rockchip,rk3228-spdif", + .data = (void *)RK_SPDIF_RK3366 }, { .compatible = "rockchip,rk3288-spdif", .data = (void *)RK_SPDIF_RK3288 }, + { .compatible = "rockchip,rk3328-spdif", + .data = (void *)RK_SPDIF_RK3366 }, { .compatible = "rockchip,rk3366-spdif", .data = (void *)RK_SPDIF_RK3366 }, { .compatible = "rockchip,rk3368-spdif", -- 2.11.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 2/2] ARM: dts: rk322x: add spdif node 2017-06-09 7:59 [PATCH v1 0/2] Patches to add support spdif for rk322x Sugar Zhang 2017-06-09 7:59 ` [PATCH v1 1/2] ASoC: rockchip: add bindings for spdif controller Sugar Zhang @ 2017-06-09 7:59 ` Sugar Zhang 2017-06-17 17:56 ` Heiko Stuebner 1 sibling, 1 reply; 5+ messages in thread From: Sugar Zhang @ 2017-06-09 7:59 UTC (permalink / raw) To: heiko, broonie Cc: linux-rockchip, Sugar Zhang, Rob Herring, Mark Rutland, Russell King, linux-arm-kernel, devicetree, linux-kernel This patch add spdif node for rk322x. Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> --- arch/arm/boot/dts/rk322x.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index 48a0c1c..56f0842 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -168,6 +168,20 @@ status = "disabled"; }; + spdif: spdif@100d0000 { + compatible = "rockchip,rk3228-spdif"; + reg = <0x100d0000 0x1000>; + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru SCLK_SPDIF>, <&cru HCLK_SPDIF_8CH>; + clock-names = "mclk", "hclk"; + dmas = <&pdma 10>; + #dma-cells = <1>; + dma-names = "tx"; + pinctrl-names = "default"; + pinctrl-0 = <&spdif_tx>; + status = "disabled"; + }; + i2s2: i2s2@100e0000 { compatible = "rockchip,rk3228-i2s", "rockchip,rk3066-i2s"; reg = <0x100e0000 0x4000>; @@ -651,6 +665,12 @@ }; }; + spdif { + spdif_tx: spdif-tx { + rockchip,pins = <3 31 RK_FUNC_2 &pcfg_pull_none>; + }; + }; + tsadc { otp_gpio: otp-gpio { rockchip,pins = <0 24 RK_FUNC_GPIO &pcfg_pull_none>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v1 2/2] ARM: dts: rk322x: add spdif node 2017-06-09 7:59 ` [PATCH v1 2/2] ARM: dts: rk322x: add spdif node Sugar Zhang @ 2017-06-17 17:56 ` Heiko Stuebner 0 siblings, 0 replies; 5+ messages in thread From: Heiko Stuebner @ 2017-06-17 17:56 UTC (permalink / raw) To: Sugar Zhang Cc: broonie, linux-rockchip, Rob Herring, Mark Rutland, Russell King, linux-arm-kernel, devicetree, linux-kernel Am Freitag, 9. Juni 2017, 15:59:33 CEST schrieb Sugar Zhang: > This patch add spdif node for rk322x. > > Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com> applied, after adapting the subject to ARM: dts: rockchip: add rk322x spdif node and dropping the #dma-cells property. #dma-cells is a property of dma-controllers not dma-clients. Heiko ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-17 17:56 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-06-09 7:59 [PATCH v1 0/2] Patches to add support spdif for rk322x Sugar Zhang 2017-06-09 7:59 ` [PATCH v1 1/2] ASoC: rockchip: add bindings for spdif controller Sugar Zhang 2017-06-13 21:07 ` Applied "ASoC: rockchip: add bindings for spdif controller" to the asoc tree Mark Brown 2017-06-09 7:59 ` [PATCH v1 2/2] ARM: dts: rk322x: add spdif node Sugar Zhang 2017-06-17 17:56 ` Heiko Stuebner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).