e8cbdf6682
* meson-6.7: Copy patches from 6.6
Commit f852beca0a ("Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy") bump to linux 6.7 but forget to copy patches.
* meson-6.7: Refresh patches
97 lines
1.9 KiB
Diff
97 lines
1.9 KiB
Diff
From 40100240a3702be8f8ceb88ec6643af669bd6de8 Mon Sep 17 00:00:00 2001
|
|
From: hzy <hzyitc@outlook.com>
|
|
Date: Sat, 1 Apr 2023 10:26:14 +0800
|
|
Subject: [PATCH 2/2] ARM: dts: meson8b: onecloud: Support HDMI
|
|
|
|
Signed-off-by: hzy <hzyitc@outlook.com>
|
|
---
|
|
.../arm/boot/dts/amlogic/meson8b-onecloud.dts | 58 +++++++++++++++++++
|
|
1 file changed, 58 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
|
|
index 1fa5420f..6ed19522 100644
|
|
--- a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
|
|
+++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
|
|
@@ -80,6 +80,48 @@ blue {
|
|
};
|
|
};
|
|
|
|
+ hdmi-connector {
|
|
+ compatible = "hdmi-connector";
|
|
+ type = "a";
|
|
+
|
|
+ port {
|
|
+ hdmi_connector_in: endpoint {
|
|
+ remote-endpoint = <&hdmi_tx_tmds_out>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ sound {
|
|
+ compatible = "amlogic,gx-sound-card";
|
|
+
|
|
+ assigned-clocks = <&clkc CLKID_MPLL0>,
|
|
+ <&clkc CLKID_MPLL1>;
|
|
+ assigned-clock-rates = <294912000>,
|
|
+ <270950400>;
|
|
+
|
|
+ dai-link-0 {
|
|
+ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
|
|
+ };
|
|
+
|
|
+ dai-link-1 {
|
|
+ sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
|
|
+ dai-format = "i2s";
|
|
+ mclk-fs = <256>;
|
|
+
|
|
+ codec-0 {
|
|
+ sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ dai-link-2 {
|
|
+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
|
|
+
|
|
+ codec-0 {
|
|
+ sound-dai = <&hdmi_tx 0>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
p12v: regulator-p12v {
|
|
compatible = "regulator-fixed";
|
|
|
|
@@ -199,6 +241,10 @@ &mali {
|
|
// mali-supply = <&vcc_core>;
|
|
};
|
|
|
|
+&aiu {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&gpio {
|
|
gpio-line-names =
|
|
/* 0 */ "WIFI_SDIO_D0 PIN18 (GPIOX_0)",
|
|
@@ -403,6 +449,18 @@ &usb1_phy {
|
|
status = "okay";
|
|
};
|
|
|
|
+&hdmi_tx {
|
|
+ status = "okay";
|
|
+ pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
|
|
+ pinctrl-names = "default";
|
|
+};
|
|
+
|
|
+&hdmi_tx_tmds_port {
|
|
+ hdmi_tx_tmds_out: endpoint {
|
|
+ remote-endpoint = <&hdmi_connector_in>;
|
|
+ };
|
|
+};
|
|
+
|
|
&ir_receiver {
|
|
status = "okay";
|
|
pinctrl-0 = <&ir_recv_pins>;
|
|
--
|
|
2.34.1
|
|
|