From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA75849BD71; Thu, 10 Sep 2026 13:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047332; cv=none; b=NfD56KUEPVntiSMJbVa9E0fj2usgDBf/6l8ZjhXyimppS3apmW1D+DIMo7+W4zX/GKsNHfdinY/PJioFIQqaAdgfmm6QGGsc/F2XOkvNLc15IjSMimD0a/7OXZaKNQcJwMCuR0YV09DUlMcfLHUU+LOSnd0vBzFJXprO4QDI6n0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047332; c=relaxed/simple; bh=pJmqpcEGREq4W7//BMoI1cMXR4zhI0TzTl2ERbFmqW0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mI/TmpJwcdDKntxSyhXBpVmnJFNnIJ+hung4sU5Uw0zTUFsljjFa0H5USrQI5aCR0VnGj5hQ1tiTCRoqcmv3+Fo1nzetPDZ0MvSSol1KcH4T+xVrLvzzVYHP/6yOReO18WWPwjEkXfaLUgoiRI99hSLjHP3LpvBy1ur+evLjovQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Of2wE9UR; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Of2wE9UR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047328; bh=pJmqpcEGREq4W7//BMoI1cMXR4zhI0TzTl2ERbFmqW0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Of2wE9URLUbLE7WxDya6/0tMSUK+vjkN6nu9Sck24CDFZHxAio4OpNe+msxrfwTC/ WlzNuXWpbbVoVoKjGuJbmqNfxMf+2HJK3XMjiXo8lXhlrVgON+9cMUAiMj2Av5AVhX TAwIc6ImNYEmqy4oqT/6O4OsNl0CE/cuKrxVQ1JYTd2oNx7xmfOQdvUIn0yAd48w6+ MzLJkd5pkwnDcLJ65G4ajc91tpcuPhCSH6917CelSV+EcttUYH1C62Pip07RlqI+gL Sl1dPBPAp9ThKdmNDKc9XJR+bYwBDvk9iRYOIkXRb7lb+G4KvFL0mtAa4lEXKvwoFt DZID8AUED8zzA== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id D882C17E0D43; Thu, 10 Sep 2026 15:35:26 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:43 -0400 Subject: [PATCH v2 1/8] ARM: dts: rockchip: Rename rk3066a HDMI audio card Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-1-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3066a HDMI" so it identifies the SoC in user-visible ALSA fields (shortname / longname / driver) and no longer collides with the identical "HDMI" string used by rk3288, rk3328, rk356x and rk3576. Fixes: 041f240e4df6c ("ARM: dts: rockchip: add hdmi-sound node to rk3066a") Signed-off-by: Detlev Casanova --- arch/arm/boot/dts/rockchip/rk3066a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/ro= ckchip/rk3066a.dtsi index 3f6d49459734..12a3cbdfb481 100644 --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi @@ -55,7 +55,7 @@ display-subsystem { =20 hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3066a HDMI"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; status =3D "disabled"; --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DD7649F134; Thu, 10 Sep 2026 13:35:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047334; cv=none; b=mXGNmssHNf+9iETSzPN3+3QamK2Kl3LKXXSg2kL8n7IgjldCw0z8XGQ5WZQWsmrF0KW7bm8GYYecLBGA6iNAJhovy/Pa61ZVzri9mC1W3VTl10tEtotvxWzb5uhMCfh4p1pWb56k384UqG0HMhBwJqVYgGqfcg7v5ma4ggy62iw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047334; c=relaxed/simple; bh=FhtiaZ2Qzu9sS1DBggkgNh9n1DpPL5VKV7ZWJoFJtDY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RTsl+9oiwgJebGt67dgz3Mu2/vDyt2crQFUPKxBYChl3pp3jySgruiOOcng1pn5lZLnOhjoPdxpV74IyezC+aAPYtbY0OPNWR1l8AfG1JxmooEyCovQZjFCl0lcrfJ8usSzsE8TVmrmwXhZg+slVH7mfZJ2Ky5LKgkbQFg06CMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=duW9rHep; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="duW9rHep" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047331; bh=FhtiaZ2Qzu9sS1DBggkgNh9n1DpPL5VKV7ZWJoFJtDY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=duW9rHep6ao2ePurjh/DT6Xk2AluhQbDbizVdDqBhNGMhbpOh73CEtzYcM4xij5XQ Z6fVzV7l8R0Y6yUOQ2OQGKRKlMySbeSF+48bAwUFRARgad12I9eIc+LrqqXb6J5I+9 AAjtgcwxzq/KQ53xvFCznEqvN8bte5GE/9qlwha9OPUbPob8YAt6yphO6LRdU9flck T895qYGVOF1WegMjoSOuv94fk6p+3nrszsY3ouuO2BRpE3PPOmv5k5gFpOAHDhrPCJ vzLvEBVPH4+2biz0D1XluyTUML/hR078aTMku8mFlvYppzfVmJC4zFmt3PL90rf+ye duzr0IRAGZzog== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 32A8817E0EB0; Thu, 10 Sep 2026 15:35:29 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:44 -0400 Subject: [PATCH v2 2/8] ARM: dts: rockchip: Rename rk3288-miqi HDMI audio card Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-2-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3288 HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 2a91dcd5be9d ("ARM: dts: rockchip: add HDMI audio to rk3288-miqi") Signed-off-by: Detlev Casanova --- arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts= /rockchip/rk3288-miqi.dts index a5f5c6d38f80..090255244c86 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts @@ -82,7 +82,7 @@ vcc_sys: regulator-vsys { sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3288 HDMI"; simple-audio-card,mclk-fs =3D <512>; =20 simple-audio-card,codec { --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 730B249EC76; Thu, 10 Sep 2026 13:35:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047337; cv=none; b=VEi6OSQlYk6mt/QcF9VblUag9LHJ7jOBkfP2ztwivudPrOVXmcmqbVm3KSR/LyGSVoYqUgPFET7E6KROHovWUmfWiY+25PVG0WSXK6kAxGOzc73xoqcYl3GG+7kyL5obMMYu5+nAGEft1Emq7mf5uPE3WWTHELGMy4Apeht5PHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047337; c=relaxed/simple; bh=K3GaWrXHjf2WYX8MKuiARabxEZrrwlOOoHt64IJplh0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P9bSuz7hYoapyJxHQszqV4ffXnnF/ZW47pBYI0wCpyXgBC6Dr42PrXSTRKGjwT/WfdLZSf2UcKAeH2eq6JZTd88jXR+5Bucgm3ME8Ki2Kf5ye1NPBmUCa6l/MNe5QN19qq3vGU1vO8ZMyAxhgeS2+YUU43ihbFLCblLHRo0twr4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=bF2WXemd; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="bF2WXemd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047333; bh=K3GaWrXHjf2WYX8MKuiARabxEZrrwlOOoHt64IJplh0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bF2WXemdZp8jQR07k+8iTE1cRzxyGbzgkZ0JeK6pyL1T4ntVQNPb5ADKg7ll5EOiX F2DOeqJpflMo9BNf0/K9yviqyilyGRkHttIj9CxRQ1vIDyLcxwTpjt0BqIJ+pphYna DRvBFLkVem59zKL7+FyIFVzuEDGmRZHfAPwjLvfGjqpxHQT2DumrE+PkgyMLm14kar gINy4jWWQDt2YAznIL9fWDkk2cWxsHGORvWGZgIpZa3S0BkQdl8/DNDsUtFmvrot/L /kFBEj8R8LMUKOxXxhfi99L70sl8xYQhVOZ7YeWvSPlAILkzc3tDmn4wKo9qx9nlOd kn6eBhQF/RmmA== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8ACB317E120F; Thu, 10 Sep 2026 15:35:31 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:45 -0400 Subject: [PATCH v2 3/8] ARM: dts: rockchip: Rename rk3288-tinker HDMI audio card Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-3-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the audio card to "RK3288 HDMI" so it can be identified user-visible ALSA fields and match the naming scheme used across the rest of the Rockchip family. It gets the same name as the rk3288-miqi, making the sound node identical in both device trees, but won't be moved to rk3288.dtsi as tinker and miqi are the only rk3288 boards with HDMI sound. Fixes: e58c5e739d6f ("ARM: dts: rockchip: move shared tinker-board nodes to= a common dtsi") Signed-off-by: Detlev Casanova --- arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/= dts/rockchip/rk3288-tinker.dtsi index 7e16022c7d9e..1caf49579ae3 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi @@ -73,7 +73,7 @@ sdio_pwrseq: sdio-pwrseq { sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; - simple-audio-card,name =3D "rockchip,tinker-codec"; + simple-audio-card,name =3D "RK3288 HDMI"; simple-audio-card,mclk-fs =3D <512>; =20 simple-audio-card,codec { --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B217549F134; Thu, 10 Sep 2026 13:35:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047339; cv=none; b=o+Dj2REWc3t3ms8qfjCXTRscs7puQSjGxmccDigWFQUetiRy1zuNzqHIusCLcqu2OFRuOwVEx/MlYrRtaF+CofYKQpGSk2VTUYQjbznLmyDP0K3YRF+Mvg0S1Oa/f8nNuPP3ych0ozF7PnbisO/JqPU7VClj/s1o/SpocY8F4bE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047339; c=relaxed/simple; bh=DoGowj4v55nBBEq+iip4Zm4WBOyuRaxvLazd1hFH7tA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kTxPIXF9YzT3W8gnY+f54SeA/kK4Rm1f7OMnXB4PqxMcd7cxNzLwS3oU8Fysei3uTNBqQ0+kpEQ34xXJ9BOn7gWQFXT9jloxE9/21Fu55WAbHymgQMv11mUi7YLfmpaKAr+bcnjLsxu+bRbqlSCa8KsH3rKQe6VJFIf3Js80wZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=IijqPaXd; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="IijqPaXd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047335; bh=DoGowj4v55nBBEq+iip4Zm4WBOyuRaxvLazd1hFH7tA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IijqPaXdt78Q6dSsfKZdgPGhBrtpt3N12vIGOCuuuSICbdVMn/qgZAM7pqQA5Rmga 6ZX7+018QuMwnZmO94i6S5c8IUUDJFvYtQDRWfQzerOCnGSlBqRn9syvv0dZN20ET5 mAJih15I0QFeu7lWi4xvOBnkfZDiXNTnYRpRN0dQa4Fe7mCb5j9ijEsLF0qECNB6VL v0Dji00MTM43Dt11AnmRL5xdL4pIwGmMuAiy6E4K/L6FBJodNHSWTp7+VDhkwA0Pit bEiW+xR4wcwjwW+sK3rNMVzVSyVAYtIZJ/a9cTCaSs4syzpKxoRqZzizftU6lnEMw6 zXSiBobxnamDQ== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id DA7EE17E03E1; Thu, 10 Sep 2026 15:35:33 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:46 -0400 Subject: [PATCH v2 4/8] arm64: dts: rockchip: Rename rk3328 HDMI audio card Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-4-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3328 HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 29e8976e604f1 ("arm64: dts: rockchip: Add RK3328 audio pipelines") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts= /rockchip/rk3328.dtsi index 03b7c4313750..26c9f4558ed9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -207,7 +207,7 @@ hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <128>; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3328 HDMI"; status =3D "disabled"; =20 simple-audio-card,cpu { --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26B1849EC76; Thu, 10 Sep 2026 13:35:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047341; cv=none; b=TEYeH4OmyCJS43FejvSUfAxpSKBLxVBRccs0I8Zm2XZebRaqniwZEDAcDr88+I44uz1erquizVHmAInAaZuh6s9iAlwtggP7oQx0IeW1qWTxXfjPcjRcFWt/RYI4uRfFAVEUQ1HCgu0WggIhhqsTPIy9ZV+MIXU8ka1Vec7RWqw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047341; c=relaxed/simple; bh=BoOMfIFPIGwvljgrOki6vDKw076yvIl6ObzO4+ZHHUc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DKEFMXdRmah2EYpGPWBzK2VCV7XRObzLVSCHNWMM0KDAMLsCRChfNntclbQgBsthOObtHZcLqhQt/KVrrhF5Hocwv7KUb/f31rSI4qNYToO/eK4aiL66VYOLOCJbOpSTx0Mkq6LlXfR9m6SHniOjAy4r6X9k+mmnfOV9LbtnLps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=jM5VKKB2; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="jM5VKKB2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047338; bh=BoOMfIFPIGwvljgrOki6vDKw076yvIl6ObzO4+ZHHUc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jM5VKKB2jyUgY4IYCO7MPurWpDYnR+fBjdroLnWI0Yg0/nbJRpM+9qwo0IzmrV2Oh k527jf+d3ahA1ZQjz+UdRRzW7DEHuaNHBRtkdE09ZGS1SCA6CQ/hYmZGXTZA9cIbx6 Q64dyBTGzEaBstnAnVgeYysW9DzQdVryv141RW5bg526lnpc0d41noBd3bIBhl6c/T DupbVcuzbImxI4ItXqN2ex/8ysyZZosGjUII4E7Al096LQul6OjhP45uFD3Jdbf5Du 2tEUelr/19ewDPT8hHeUx1UdfF8fxZlbuLrDOnPyDQKjqFbZS0vP4V4MbrdYsiAgDm jGjgpGp2+vRhA== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 33D9C17E0EB0; Thu, 10 Sep 2026 15:35:36 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:47 -0400 Subject: [PATCH v2 5/8] arm64: dts: rockchip: Rename rk3399 HDMI audio card Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-5-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "hdmi-sound" to "RK3399 HDMI" so it identifies the SoC in user-visible ALSA fields and matches the naming scheme used across the rest of the Rockchip family. Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk3399-base.dtsi index 49c68fe65de6..c46e58d4af0d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi @@ -2008,7 +2008,7 @@ hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; - simple-audio-card,name =3D "hdmi-sound"; + simple-audio-card,name =3D "RK3399 HDMI"; status =3D "disabled"; =20 simple-audio-card,cpu { --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 548D64A2601; Thu, 10 Sep 2026 13:35:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047343; cv=none; b=Fo0dYSWb4anC6DwNT060vn/3hTWvxKbLOyR+dUZqRowew91V3SRmteTouMkDdD38x5kvhchcSXPsChPgHs93eML/ZycZ+lSBJI33vaiOf/QJXoIbeiUkeV1nuGqcOblgdyTgaHyLNkIjhbCfepR2xjBFvvWJLWOVGlM9ZR/yDh0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047343; c=relaxed/simple; bh=xQ7+XBReyJRczHBUQNd97CLLsbGlPLiZr8fnMEkPsd0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nIGIAVNK2QWnOdpVQq+ixJagXlENOaQEw3Tft9JoXQRdyFzY3OToZmR5PJJ3PVs4JUwRMrJFaZA0BskifLAkZ2ydjD8Fa4J8wWvaIkgE4KVIuZ3aLxgFSTiGciy3UdGQbeOWV4EZssspMk0Vs0sxXcKTHLHlLyGf/REHD5YoC34= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=H+7C0nV7; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="H+7C0nV7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047340; bh=xQ7+XBReyJRczHBUQNd97CLLsbGlPLiZr8fnMEkPsd0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=H+7C0nV7MSLk9Bzvvswv+a0kDAhb5h1smF3IqOEOG9mPaMYDsZyG7BrQRtSot1/WF 1uQ/6F9J5AOX+/ni1iajM5xts+Vqi53x/rX3Pi6yvbABiRikKV/JGpuSt/i5nJDv9b 4w3TDi04+HgM2pBWQoUra1jLjNGhORPE6sDnUPoDeguUvWaSjf7Wb7jdBOUDPAZkNn /HA6t9XUBIsxZs6hE8bh8Tq3ENC3lnMMNOxKFgi7ezwL1QFtAZ+n9ubUuX+ir2m/44 uU++iURtpCa2BLWRYZdZz11DHiDlLRdWiSUUAOkfKBZjBRXX5rSubn2UgtUyxRUY7j GPtl83ireJ6sQ== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8718C17E0D43; Thu, 10 Sep 2026 15:35:38 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:48 -0400 Subject: [PATCH v2 6/8] arm64: dts: rockchip: Rename rk3566 and rk3568 HDMI audio cards Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-6-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Move the HDMI audio card name for RK3566 and RK3568 to their corresponding dtsi files so the name can be set to match the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 697ee8546e241 ("arm64: dts: rockchip: Add HDMI audio nodes to rk356x= ") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3566-base.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 ++++ arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk3566-base.dtsi index e56e0b6ba941..0086ff49fee2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi @@ -6,6 +6,10 @@ / { compatible =3D "rockchip,rk3566"; }; =20 +&hdmi_sound { + simple-audio-card,name =3D "RK3566 HDMI"; +} + &pipegrf { compatible =3D "rockchip,rk3566-pipe-grf", "syscon"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts= /rockchip/rk3568.dtsi index 3bc653f027f1..efc1edff1e15 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -382,6 +382,10 @@ &gpu { operating-points-v2 =3D <&gpu_opp_table>; }; =20 +&hdmi_sound { + simple-audio-card,name =3D "RK3568 HDMI"; +} + &pipegrf { compatible =3D "rockchip,rk3568-pipe-grf", "syscon"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk356x-base.dtsi index a5832895bd39..1a4562df20ee 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi @@ -150,7 +150,6 @@ scmi_clk: protocol@14 { =20 hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; - simple-audio-card,name =3D "HDMI"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; status =3D "disabled"; --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 874E44AEBF9; Thu, 10 Sep 2026 13:35:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047345; cv=none; b=p7OvMtRiYxPFxZnxZu4aKYOsTmMtX2Q+w14u0qns5PIRn83bMWnII/myTQRa7g6Az0LPsHdViLIJEOcv8LkF+h23mXJtuVOjwsi/4oIb12MMYnHlbL1H+SDeKJ9ZLW1rUl+p9AbsFRdmlV1MaOi0QExc7BiQ6XiHQAnhHCJFSCs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047345; c=relaxed/simple; bh=nnQom02Ih1qwesbG7H+t6ImlBeovlhLhrwVE7x/9+zc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s8B+rDksrfQMRjCz4QVnIwZa4nKLHP8wSwSQZb25P9d2h30ivtf9ySLXYlpP0x3BacRnewlM8bs0ZhFhdVkMDc3qWPRvRMgoA3Vy2LytDv/7t4o6JTzAP/T0qYeSehOvEyUo8hNvWrtT+GNZ6hXfMLUld5yleHfRafRZM24boU4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=iSV8ptih; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="iSV8ptih" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047342; bh=nnQom02Ih1qwesbG7H+t6ImlBeovlhLhrwVE7x/9+zc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iSV8ptihFp7WCxm7ch7BNjgbQ3h09TdIlCvHTN7EjvyL/qBbmS1B4V3xf2ZC+R/Oi mVV9fVchze+fEFoCBkAPzGqwQ/6xVGGkLRB/j7WJQSU3DQbqb0fizFTc4ml3U2tI6W btLggQMJ54F1EZEDWRYJvNb95V0iscnLkBnMMliTPSKaGBmQld4WT6fEZPI1VOI2/Y 1/SAsmwXZMBgwMMkFWltScA+Y7+bJ9sN57GAmUS1a23zDQBmpg3Cj2t3EVFW+rT/2v /F5HYwB+BqW9kTbYoLbm4uS7OZ++KB+tZwp9NOCAeFpjshqmvW/FEDeP+59QV+cMN8 kdtxk43r0ZzXg== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id D6A4517E0D81; Thu, 10 Sep 2026 15:35:40 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:49 -0400 Subject: [PATCH v2 7/8] arm64: dts: rockchip: Rename rk3576 HDMI audio card Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-7-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3576 HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 7f1561d82e3d3 ("arm64: dts: rockchip: Add RK3576 HDMI audio") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3576.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts= /rockchip/rk3576.dtsi index b0c0d3c8b1b1..ca9cbf035265 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi @@ -410,7 +410,7 @@ scmi_clk: protocol@14 { =20 hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3576 HDMI"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; status =3D "disabled"; --=20 2.55.0 From nobody Fri Sep 25 16:04:05 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03DB34B5123; Thu, 10 Sep 2026 13:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047348; cv=none; b=cyJAWk5Txedkbm57EagZT9YlNejNUdnDWti3FkjBa3WgAzCrB8foeI6P5ma4o8yzBaDfwcXBjnsQe5LEWPDRiiorVB8xx4jzAOkfi5dMTXJfeWoV9KDo2O5eBLtuzoCEP3BRsl/hp7nbjJxlCk2QChO/3SXJG5dFfZhlkE9VyUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789047348; c=relaxed/simple; bh=WW3bgWtvchm/ZVcwcd6Is+/46qWg55ayuKIPjH66+G4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c5AgCKdSOajPpARccn3bvlTK7ykVjDHs5zB01EAmn/KqwZlqQuhVcKro6KzBwLYdlV0QwI5hzqm7a4n0A6bWeVAmFoQPRQcgTcmqzYll2+vc2WLwVXDcb6vfaaOyqmwkfN5H2U3F+ZFvcS3X/14voV3PP8nV/AwyB9pc3wqmjOQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=WaLMUQSl; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="WaLMUQSl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1789047345; bh=WW3bgWtvchm/ZVcwcd6Is+/46qWg55ayuKIPjH66+G4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WaLMUQSlhh3h07Nbscy1WypZiWeRgCtdUty5bDukiVtUWe+slwf2F+5mwo72TIszm 6T6Q9GhSwTMpD21k4q6ue77OEJJfShmRKASXhWyGIHHquFBLPY/iDfVRqQk4OXHc5J pVYgJ8iLZbH4QE9D5TOqI0qtxsKUJBgF+TWOG4xR76WFh4n0Gbl25hw+KKg6WErh1G 6DVeIKVnsb5hhNcsdjPAKN9gpUAfjTCorZdxvufBadjCL9MIeJ2fTcG8PrJG5byocv XAHTnomjWRar1KzjhajgPr2iG/PREbZllrHeEFekek6serh1cSVAc+rcCnZ++JXJFG R9osiRz2gQf2w== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 2FC8917E03E1; Thu, 10 Sep 2026 15:35:43 +0200 (CEST) From: Detlev Casanova Date: Thu, 10 Sep 2026 09:34:50 -0400 Subject: [PATCH v2 8/8] arm64: dts: rockchip: Rename rk3588 HDMI audio cards Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260910-fix-rockchip-hdmi-audio-names-v2-8-1396a6168e20@collabora.com> References: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> In-Reply-To: <20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto , David Summers Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the two cards from "hdmi0"/"hdmi1" to "RK3588 HDMI0"/"RK3588 HDMI1" so they identify the SoC in user-visible ALSA fields and match the naming scheme used across the rest of the Rockchip family. Fixes: b8c6c136971c0 ("arm64: dts: rockchip: Add HDMI audio outputs for rk3= 588") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk3588-base.dtsi index 376ad04e0786..7892e18a7835 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -376,7 +376,7 @@ hdmi0_sound: hdmi0-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <128>; - simple-audio-card,name =3D "hdmi0"; + simple-audio-card,name =3D "RK3588 HDMI0"; status =3D "disabled"; =20 simple-audio-card,codec { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/bo= ot/dts/rockchip/rk3588-extra.dtsi index b251bb129cdb..2bcf30d8a338 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi @@ -11,7 +11,7 @@ hdmi1_sound: hdmi1-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <128>; - simple-audio-card,name =3D "hdmi1"; + simple-audio-card,name =3D "RK3588 HDMI1"; status =3D "disabled"; =20 simple-audio-card,codec { --=20 2.55.0