From: Quentin Schulz Date: Tue, 18 Feb 2025 11:49:16 +0000 (+0100) Subject: arm64: dts: rockchip: enable I2S0 in Haikou carrierboard, not Puma DTSI X-Git-Tag: v6.15-rc1~159^2~23^2~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a77f317c2936bd9d95569a6e2b70eafda564155;p=thirdparty%2Flinux.git arm64: dts: rockchip: enable I2S0 in Haikou carrierboard, not Puma DTSI I2S0 is routed to the Q7 golden fingers and, on Haikou carrierboard, to an I2S codec. Nothing aside from signal routing is done on the SoM, therefore it's the duty of the carrierboard to enable I2S0 whenever an I2S codec is present. Such is the case of the Haikou carrierboard, therefore let's migrate the enabling of this controller to the carrierboard DTS instead of the SoM DTSI. Signed-off-by: Quentin Schulz Link: https://lore.kernel.org/r/20250218-tsd-align-haikou-v1-5-5c44d1dd8658@cherry.de Signed-off-by: Heiko Stuebner --- diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 06215f43336ec..28d24caffe12f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -189,6 +189,9 @@ }; }; +&i2s0 { + status = "okay"; +}; &i2s2 { status = "okay"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 548bd7b486c18..399c86bcbfefa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -447,7 +447,6 @@ pinctrl-1 = <&i2s0_2ch_bus_bclk_off>; rockchip,playback-channels = <2>; rockchip,capture-channels = <2>; - status = "okay"; }; /*