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 <redacted>
---
.../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
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.
Signed-off-by: Alex Bee <redacted>
---
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
@@ -0,0 +1,14 @@+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)+/*+*Copyright(c)2019AkashGajjar<Akash_Gajjar@mentor.com>+*Copyright(c)2019PragneshPatel<Pragnesh_Patel@mentor.com>+*/++/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";+};
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rock 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.
Signed-off-by: Alex Bee <redacted>
---
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
@@ -0,0 +1,47 @@+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)+/*+*Copyright(c)2019AkashGajjar<Akash_Gajjar@mentor.com>+*Copyright(c)2019PragneshPatel<Pragnesh_Patel@mentor.com>+*/++/dts-v1/;+#include"rk3399-rock-pi-4.dtsi"+#include"rk3399-op1-opp.dtsi"++/{+model="Radxa ROCK Pi 4B plus";+compatible="radxa,rockpi4b","radxa,rockpi4","rockchip,rk3399";++aliases{+mmc2=&sdio0;+};+};++&sdio0{+status="okay";++brcmf:wifi@1{+compatible="brcm,bcm4329-fmac";+reg=<1>;+interrupt-parent=<&gpio0>;+interrupts=<RK_PA3GPIO_ACTIVE_HIGH>;+interrupt-names="host-wake";+pinctrl-names="default";+pinctrl-0=<&wifi_host_wake_l>;+};+};++&uart0{+status="okay";++bluetooth{+compatible="brcm,bcm43438-bt";+clocks=<&rk8081>;+clock-names="ext_clock";+device-wakeup-gpios=<&gpio2RK_PD3GPIO_ACTIVE_HIGH>;+host-wakeup-gpios=<&gpio0RK_PA4GPIO_ACTIVE_HIGH>;+shutdown-gpios=<&gpio0RK_PB1GPIO_ACTIVE_HIGH>;+pinctrl-names="default";+pinctrl-0=<&bt_host_wake_l&bt_wake_l&bt_enable_h>;+};+};
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
From: Johan Jonker <hidden> Date: 2021-06-18 09:55:06
Hi Alex,
On 6/17/21 6:49 AM, Alex Bee wrote:
quoted hunk
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 <redacted>
---
.../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
See previous discussion:
https://lore.kernel.org/linux-rockchip/e5ab2c62-ad00-4cdf-8b0a-24fda59c980b@gmail.com/
It seems that aplay/linux? adds "-1" to it and removes the comma and
"-", so we get:
hdmisound
rockchiprk3399
rockchiprk339_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/20210110151913.3615326-1-katsuhiro@katsuster.net/
===
Johan
Am Donnerstag, 17. Juni 2021, 06:49:54 CEST schrieb Alex Bee:
quoted hunk
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.
Signed-off-by: Alex Bee <redacted>
---
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
@@ -0,0 +1,14 @@+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)+/*+*Copyright(c)2019AkashGajjar<Akash_Gajjar@mentor.com>+*Copyright(c)2019PragneshPatel<Pragnesh_Patel@mentor.com>+*/++/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
Hi Johan,
Am 18.06.21 um 11:54 schrieb Johan Jonker:
Hi Alex,
On 6/17/21 6:49 AM, Alex Bee wrote:
quoted
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 <redacted>
---
.../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
See previous discussion:
https://lore.kernel.org/linux-rockchip/e5ab2c62-ad00-4cdf-8b0a-24fda59c980b@gmail.com/
It seems that aplay/linux? adds "-1" to it and removes the comma and
"-", so we get:
hdmisound
rockchiprk3399
rockchiprk339_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
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.
Hi Heiko,
Am 18.06.21 um 15:08 schrieb Heiko Stübner:
Am Donnerstag, 17. Juni 2021, 06:49:54 CEST schrieb Alex Bee:
quoted
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.
Signed-off-by: Alex Bee <redacted>
---
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
@@ -0,0 +1,14 @@+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)+/*+*Copyright(c)2019AkashGajjar<Akash_Gajjar@mentor.com>+*Copyright(c)2019PragneshPatel<Pragnesh_Patel@mentor.com>+*/++/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?
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.
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.