Patch "arm64: dts: rockchip: fix probe of analog sound card on rock-3a" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    arm64: dts: rockchip: fix probe of analog sound card on rock-3a

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm64-dts-rockchip-fix-probe-of-analog-sound-card-on.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7d4f6e006ef5c51664bcd5f0a19cd2609b4d1f92
Author: Jonas Karlman <jonas@xxxxxxxxx>
Date:   Sun Jan 15 21:15:56 2023 +0000

    arm64: dts: rockchip: fix probe of analog sound card on rock-3a
    
    [ Upstream commit 1104693cdfcd337e73ab585a225f05445ff7a864 ]
    
    The following was observed on my Radxa ROCK 3 Model A board:
    
      rockchip-pinctrl pinctrl: pin gpio1-9 already requested by vcc-cam-regulator; cannot claim for fe410000.i2s
      ...
      platform rk809-sound: deferred probe pending
    
    Fix this by supplying a board specific pinctrl with the i2s1 pins used
    by pmic codec according to the schematic [1].
    
    [1] https://dl.radxa.com/rock3/docs/hw/3a/ROCK-3A-V1.3-SCH.pdf
    
    Signed-off-by: Jonas Karlman <jonas@xxxxxxxxx>
    Acked-by: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230115211553.445007-1-jonas@xxxxxxxxx
    Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index 44313a18e484e..bab46db2b18cd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -521,6 +521,8 @@ &i2s0_8ch {
 };
 
 &i2s1_8ch {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
 	rockchip,trcm-sync-tx-only;
 	status = "okay";
 };



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux