aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2025-09-15 14:57:53 +0200
committerArnd Bergmann <arnd@arndb.de>2025-09-15 14:57:56 +0200
commit839bef00712dc2d98842838dafa894621bfcfc13 (patch)
tree054b27cc5df8513cb61d56be1da27d0b7ce49d2c /arch/arm
parent46cb19e52ac79d184e1b159ccbb2153dff1aab26 (diff)
parent2a91dcd5be9dde3239c87e4309f5878d3e4fb9d2 (diff)
downloadlinux-839bef00712dc2d98842838dafa894621bfcfc13.tar.gz
Merge tag 'v6.18-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
HDMI-CEC and -audio on RK3288-Miqi * tag 'v6.18-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add HDMI audio to rk3288-miqi ARM: dts: rockchip: add CEC pinctrl to rk3288-miqi Link: https://lore.kernel.org/r/12138356.VV5PYv0bhD@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/rockchip/rk3288-miqi.dts22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
index dd42f8d31f7087..a5f5c6d38f8017 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts
@@ -78,6 +78,21 @@
regulator-always-on;
regulator-boot-on;
};
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,name = "HDMI";
+ simple-audio-card,mclk-fs = <512>;
+
+ simple-audio-card,codec {
+ sound-dai = <&hdmi>;
+ };
+
+ simple-audio-card,cpu {
+ sound-dai = <&i2s>;
+ };
+ };
};
&cpu0 {
@@ -130,6 +145,8 @@
&hdmi {
ddc-i2c-bus = <&i2c5>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_cec_c0>;
status = "okay";
};
@@ -283,6 +300,11 @@
status = "okay";
};
+&i2s {
+ #sound-dai-cells = <0>;
+ status = "okay";
+};
+
&io_domains {
status = "okay";