Re: [PATCH 4/6] arm64: dts: rockchip: Add devicetree for Pine64 Pinetab2

Diederik de Haas
2023-12-22T16:49:47Z

[-- Attachment #1.1: Type: text/plain, Size: 2232 bytes --]

On Friday, 22 December 2023 12:05:44 CET Manuel Traut wrote:
> + rk817-sound {
> + compatible = "simple-audio-card";
> + pinctrl-names = "default";
> + pinctrl-0 = <&hp_det_l>;
> + simple-audio-card,format = "i2s";
> + simple-audio-card,name = "PineTab2";
> + simple-audio-card,mclk-fs = <256>;
> +
> + simple-audio-card,widgets =
> + "Microphone", "Mic Jack",
> + "Headphone", "Headphones",
> + "Microphone", "Microphone",
> + "Speaker", "Speakers";
> +
> + simple-audio-card,routing =
> + "MICL", "Microphone",
> + "MICR", "Mic Jack",
> + "Headphones", "HPOL",
> + "Headphones", "HPOR",
> + "Speaker Amplifier INL", "HPOL",
> + "Speaker Amplifier INR", "HPOR",
> + "Speakers", "Speaker Amplifier OUTL",
> + "Speakers", "Speaker Amplifier OUTR";
> +
> + simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6
> GPIO_ACTIVE_HIGH>; + simple-audio-card,aux-devs =
> <&speaker_amp>;
> + simple-audio-card,pin-switches = "Speakers", "Microphone";
> +
> + simple-audio-card,cpu {
> + sound-dai = <&i2s1_8ch>;
> + };
> +
> + simple-audio-card,codec {
> + sound-dai = <&rk817>;
> + };
> + };

Not sure if it's right (or allowed) to post a different patch as attachment,
but I have been using a different audio configuration (see attachment).
I haven't yet tried if/how it works via HDMI yet, but the speakers and
headphones work fine.
This patch is based on the following commit:
https://github.com/TuxThePenguin0/linux/commit/
872b829a3511cfa853bd3af3bd4f30be1cb3d1ab

I've added 'Danct12' to the To list as they are the maintainer of the primary
PT2 image and we worked together to get to this audio config.
I don't if they still use it.
(I've been using my own kernel/image for a while now).

Cheers,
Diederik

[-- Attachment #1.2: 0003-arm64-dts-rk3566-pinetab2-Fix-audio-configuration.patch --]
[-- Type: text/x-patch, Size: 2291 bytes --]

From 17efeb0ae766886345ff0574c534079742539b56 Mon Sep 17 00:00:00 2001
From: Scott Santucci <ScottFreeCode@users.noreply.github.com>
Date: Mon, 17 Jul 2023 13:06:20 +0200
Subject: [PATCH 3/8] arm64: dts: rk3566-pinetab2: Fix audio configuration

The audio configuration of the PineTab2 matches the `rk817_ext` alsa
ucm2 profile, so switch the configuration to that. Use `rk817_ext` and
not `rk817_int` as the PineTab2 uses an external amplifier.

Also the headphones plugged/unplugged detection is backwards, so apply
the fix provided by Danct12 <danct12@disroot.org>.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
Link: https://github.com/dreemurrs-embedded/Pine64-Arch/pull/555
---
arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
index a766f21bd6f8..59e4bf2f77c7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
@@ -116,14 +116,14 @@ rk817-sound {
pinctrl-names = "default";
pinctrl-0 = <&hp_det_l>;
simple-audio-card,format = "i2s";
- simple-audio-card,name = "PineTab2";
+ simple-audio-card,name = "rk817_ext";
simple-audio-card,mclk-fs = <256>;

simple-audio-card,widgets =
"Microphone", "Mic Jack",
"Headphone", "Headphones",
"Microphone", "Microphone",
- "Speaker", "Speakers";
+ "Speaker", "Internal Speakers";

simple-audio-card,routing =
"MICL", "Microphone",
@@ -132,12 +132,12 @@ rk817-sound {
"Headphones", "HPOR",
"Speaker Amplifier INL", "HPOL",
"Speaker Amplifier INR", "HPOR",
- "Speakers", "Speaker Amplifier OUTL",
- "Speakers", "Speaker Amplifier OUTR";
+ "Internal Speakers", "Speaker Amplifier OUTL",
+ "Internal Speakers", "Speaker Amplifier OUTR";

- simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_HIGH>;
+ simple-audio-card,hp-det-gpio = <&gpio4 RK_PC6 GPIO_ACTIVE_LOW>;
simple-audio-card,aux-devs = <&speaker_amp>;
- simple-audio-card,pin-switches = "Speakers", "Microphone";
+ simple-audio-card,pin-switches = "Internal Speakers", "Microphone";

simple-audio-card,cpu {
sound-dai = <&i2s1_8ch>;
--
2.42.0

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 228 bytes --]