arm64: dts: rockchip: add ES8316 codec for Rock Pi4
Subsystems (3)
PATCH 1/3 arm64: dts: rockchip: add ES8316 codec for Rock Pi4
Rock Pi4 boards have the codec connected to i2s0 and it is accessible via i2c1 address 0x11.
Add an audio-graph-card it.
--- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +28 -0
@@ -36,6 +36,12 @@ sdio_pwrseq: sdio-pwrseq { reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + sound { + compatible = "audio-graph-card"; + label = "rockchip,rk3399"; + dais = <&i2s0_p0>; + }; + vcc12v_dcin: dc-12v { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin";
@@ -422,6 +428,20 @@ &i2c1 { i2c-scl-rising-time-ns = <300>; i2c-scl-falling-time-ns = <15>; status = "okay"; + + es8316: codec@11 { + compatible = "everest,es8316"; + reg = <0x11>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + + port { + es8316_p0_0: endpoint { + remote-endpoint = <&i2s0_p0_0>; + }; + }; + }; }; &i2c3 {
@@ -441,6 +461,14 @@ &i2s0 { rockchip,capture-channels = <2>; rockchip,playback-channels = <2>; status = "okay"; + + i2s0_p0: port { + i2s0_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; + }; }; &i2s1 {
Signature · 1 line
2.27.0
PATCH 2/3 arm64: dts: rockchip: Add RK3399 Rock Pi 4a plus board
Rock Pi 4a plus board is the successor of Rock Pi 4a board.
Differences to the original version are
- has RK3399 OP1 SoC revision
- has eMMC (16 or 32 GB) soldered on board (no changes required, since it is enabled in rk3399-rock-pi-4.dtsi)
- dev boards have SPI flash soldered, but as per manufacturer response, this won't be the case for mass production boards
I didn't add yet another compatible, since the small set of differences are captured by the device tree.
--- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -43,6 +43,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar <[email protected]> + * Copyright (c) 2019 Pragnesh Patel <[email protected]> + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" +#include "rk3399-op1-opp.dtsi" + +/ { + model = "Radxa ROCK Pi 4A plus"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399"; +};
Signature · 1 line
2.27.0
Heiko Stübner
maintainerRe: [PATCH 2/3] arm64: dts: rockchip: Add RK3399 Rock Pi 4a plus board
Am Donnerstag, 17. Juni 2021, 06:49:54 CEST schrieb Alex Bee:
Quoted 40 lines
Rock Pi 4a plus board is the successor of Rock Pi 4a board.
Differences to the original version are
- has RK3399 OP1 SoC revision
- has eMMC (16 or 32 GB) soldered on board (no changes required, since it is enabled inrk3399-rock-pi-4.dtsi)
- dev boards have SPI flash soldered, but as per manufacturer response, this won't be the case for mass production boardsI didn't add yet another compatible, since the small set of differences are captured by the device tree.
Signed-off-by Alex Bee <[email protected]>--- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dtsarch/arm64/boot/dts/rockchip/Makefile +1
-0@@ -43,6 +43,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtbarch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +3
-0@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar <[email protected]>
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts line 13
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +10
-0+ * Copyright (c) 2019 Pragnesh Patel <[email protected]> + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" +#include "rk3399-op1-opp.dtsi" + +/ { + model = "Radxa ROCK Pi 4A plus"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399";
hmm, I don't really follow why you're re-using the radxa,rockpi4a compatible. I'd assume this should be radxa,rockpi4a+ or something?
I.e. if a bootloader needs to select the matching devicetree from a list of available devicetrees, this could end up running a regular rockpi4a (without +) using the OP1 operating points and thus at way too high frequencies.
Heiko
Quoted 2 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +1
-0+};
Re: [PATCH 2/3] arm64: dts: rockchip: Add RK3399 Rock Pi 4a plus board
Hi Heiko,
Am 18.06.21 um 15:08 schrieb Heiko Stübner:
Quoted 45 lines
Am Donnerstag, 17. Juni 2021, 06:49:54 CEST schrieb Alex Bee:
Quoted 44 lines
Rock Pi 4a plus board is the successor of Rock Pi 4a board.
Differences to the original version are
- has RK3399 OP1 SoC revision
- has eMMC (16 or 32 GB) soldered on board (no changes required, since it is enabled inrk3399-rock-pi-4.dtsi)
- dev boards have SPI flash soldered, but as per manufacturer response, this won't be the case for mass production boardsI didn't add yet another compatible, since the small set of differences are captured by the device tree.
Signed-off-by Alex Bee <[email protected]>--- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 ++++++++++++++ 2 files changed, 15 insertions(+)create mode 100644
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dtsarch/arm64/boot/dts/rockchip/Makefile +1
-0@@ -43,6 +43,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtbarch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +7
-0@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar <[email protected]> + * Copyright (c) 2019 Pragnesh Patel <[email protected]> + */ + +/dts-v1/;
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts line 13
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +6
-0+#include "rk3399-rock-pi-4.dtsi" +#include "rk3399-op1-opp.dtsi" + +/ { + model = "Radxa ROCK Pi 4A plus"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399";hmm, I don't really follow why you're re-using the radxa,rockpi4a compatible. I'd assume this should be radxa,rockpi4a+ or something?
Ah, yes this was part of my cover letter, which obviously got lost somewhere.
Anyways: Reason I thought of was: For example broadcom nvram file names must match the compatible string and they have to be copied/symlinked over and over if we add new compatibles for every minor changed revision of a board. I guess there are more examples for that in userland.
Quoted 5 lines
I.e. if a bootloader needs to select the matching devicetree from a list of available devicetrees, this could end up running a regular rockpi4a (without +) using the OP1 operating points and thus at way too high frequencies.
Besides I wasn't aware, that "a bootloader" can do that already I understand your concerns and will change it.
Alex.
Quoted 9 lines
Heiko
Quoted 2 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file +1
-0+};
PATCH 3/3 arm64: dts: rockchip: Add RK3399 Rock Pi 4b plus board
In reply to Alex BeeRock Pi 4b plus board is the successor of Rock Pi 4b board.
Differences to the original version are
- has RK3399 OP1 SoC revision
- has eMMC (16 or 32 GB) soldered on board (no changes required, since it is enabled in rk3399-rock-pi-4.dtsi)
- dev boards have SPI flash soldered, but as per manufacturer response, this won't be the case for mass production boards
I didn't add yet another compatible, since the small set of differences are captured by the device tree.
--- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
arch/arm64/boot/dts/rockchip/Makefile +1 -0
@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.27.0
Hi Alex,
Quoted 14 lines · Alex Bee
Rock Pi4 boards have the codec connected to i2s0 and it is accessible via i2c1 address
0x11.
Add an audio-graph-card it.Signed-off-by Alex Bee <[email protected]>--- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +0
-0
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi sdio_pwrseq: sdio-pwrseq { · line 42
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +3
-0@@ -36,6 +36,12 @@ sdio_pwrseq: sdio-pwrseq { reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + sound { + compatible = "audio-graph-card"; + label = "rockchip,rk3399";
See previous discussion:
https://lore.kernel.org/linux-rockchip/[email protected]/
It seems that aplay/linux? adds "-1" to it and removes the comma and "-", so we get:
hdmisound
rockchiprk3399rockchiprk339_1
Shouldn't we label it with something that reflect the function/output. Shouldn't we standardize to SPDIF, HDMI and Analog similar to rk3318/rk3328? Make a shorter label without spaces or special chars, so that chars don't get removed?
Proposal:
Analog
HDMI
ES8316 <---
SPDIF
Possible example solutions:
[PATCH] arm64: dts: rockchip: more user friendly name of sound nodes
https://lore.kernel.org/lkml/[email protected]/
===
Johan
Quoted 43 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +3
-0+ dais = <&i2s0_p0>; + }; + vcc12v_dcin: dc-12v { compatible = "regulator-fixed";arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +22
-0regulator-name = "vcc12v_dcin";@@ -422,6 +428,20 @@ &i2c1 { i2c-scl-rising-time-ns = <300>; i2c-scl-falling-time-ns = <15>; status = "okay"; + + es8316: codec@11 { + compatible = "everest,es8316"; + reg = <0x11>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + + port { + es8316_p0_0: endpoint { + remote-endpoint = <&i2s0_p0_0>; + }; + }; + }; }; &i2c3 {@@ -441,6 +461,14 @@ &i2s0 { rockchip,capture-channels = <2>; rockchip,playback-channels = <2>; status = "okay"; + + i2s0_p0: port { + i2s0_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; + }; }; &i2s1 {
Hi Johan,
Am 18.06.21 um 11:54 schrieb Johan Jonker:
Quoted 39 lines
Hi Alex,
Quoted 14 lines · Alex Bee
Rock Pi4 boards have the codec connected to i2s0 and it is accessible via i2c1 address
0x11.
Add an audio-graph-card it.Signed-off-by Alex Bee <[email protected]>--- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +0
-0arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi sdio_pwrseq: sdio-pwrseq { · line 41
Quoted 6 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +3
-0@@ -36,6 +36,12 @@ sdio_pwrseq: sdio-pwrseq { reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + sound { + compatible = "audio-graph-card"; + label = "rockchip,rk3399";See previous discussion:
https://lore.kernel.org/linux-rockchip/[email protected]/
It seems that aplay/linux? adds "-1" to it and removes the comma and "-", so we get:
hdmisound
rockchiprk3399rockchiprk339_1Shouldn't we label it with something that reflect the function/output. Shouldn't we standardize to SPDIF, HDMI and Analog similar to rk3318/rk3328? Make a shorter label without spaces or special chars, so that chars don't get removed?
Quoted 6 lines
Proposal:
Analog
HDMI
ES8316 <---
SPDIF
OK - thanks for that, I wasn't aware.
I'll go for "Analog", since that seems to be the accepted solution for RockPro64 board and I think we should keep it the same across boards (on distro side it can get annoying if you need a couple of alsa configs with the same contents, just because audio card names are different).
Alex.
Quoted 54 lines
Possible example solutions:
[PATCH] arm64: dts: rockchip: more user friendly name of sound nodes
https://lore.kernel.org/lkml/[email protected]/===
Johan
Quoted 43 lines
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +25
-0+ dais = <&i2s0_p0>; + }; + vcc12v_dcin: dc-12v { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin";@@ -422,6 +428,20 @@ &i2c1 { i2c-scl-rising-time-ns = <300>; i2c-scl-falling-time-ns = <15>; status = "okay"; + + es8316: codec@11 { + compatible = "everest,es8316"; + reg = <0x11>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + + port { + es8316_p0_0: endpoint { + remote-endpoint = <&i2s0_p0_0>; + }; + }; + }; }; &i2c3 {@@ -441,6 +461,14 @@ &i2s0 { rockchip,capture-channels = <2>; rockchip,playback-channels = <2>; status = "okay"; + + i2s0_p0: port { + i2s0_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; + }; }; &i2s1 {