mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2025-03-01 04:31:30 +00:00
663 lines
18 KiB
Diff
663 lines
18 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Demetris Ierokipides <ierokipides.dem@gmail.com>
|
|
Date: Fri, 8 Jan 2021 17:10:35 +0200
|
|
Subject: [PATCH] ARM: dts: rockchip: add gpu node to rk3288-miqi
|
|
|
|
Add the Mali GPU node to the MiQi device-tree.
|
|
|
|
Signed-off-by: Demetris Ierokipides <ierokipides.dem@gmail.com>
|
|
Link: https://lore.kernel.org/r/20210108151036.36434-2-ierokipides.dem@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk3288-miqi.dts | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
index cf54d5ffff2f..713f55e143c6 100644
|
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
@@ -123,6 +123,11 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&gpu {
|
|
+ mali-supply = <&vdd_gpu>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&hdmi {
|
|
ddc-i2c-bus = <&i2c5>;
|
|
status = "okay";
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
|
Date: Sat, 19 Dec 2020 22:05:00 +0100
|
|
Subject: [PATCH] arm64: dts: rockchip: assign a fixed index to mmc devices on
|
|
rk3328 boards
|
|
|
|
Recently introduced async probe on mmc devices can shuffle block IDs.
|
|
Pin them to fixed values to ease booting in environments where UUIDs
|
|
are not practical. Use newly introduced aliases for mmcblk devices from [1].
|
|
|
|
[1] https://patchwork.kernel.org/patch/11747669/
|
|
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
|
Link: https://lore.kernel.org/r/20201219210500.3855-1-jbx6244@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
index 72112fe05a5c..4a04ca9dd344 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
@@ -27,6 +27,9 @@
|
|
i2c1 = &i2c1;
|
|
i2c2 = &i2c2;
|
|
i2c3 = &i2c3;
|
|
+ mmc0 = &sdmmc;
|
|
+ mmc1 = &sdio;
|
|
+ mmc2 = &emmc;
|
|
ethernet0 = &gmac2io;
|
|
ethernet1 = &gmac2phy;
|
|
};
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jagan Teki <jagan@amarulasolutions.com>
|
|
Date: Fri, 31 Jul 2020 21:33:24 +0530
|
|
Subject: [PATCH] arm64: defconfig: Enable REGULATOR_MP8859
|
|
|
|
RK3399 boards like ROC-RK3399-PC is using MP8859 DC/DC converter
|
|
for 12V supply.
|
|
|
|
roc-rk3399-pc initially used 12V fixed regulator for this supply,
|
|
but the below commit has switched to use MP8859.
|
|
|
|
commit <1fc61ed04d309b0b8b3562acf701ab988eee12de> "arm64: dts: rockchip:
|
|
Enable mp8859 regulator on rk3399-roc-pc"
|
|
|
|
So, enable by default on the defconfig.
|
|
|
|
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
|
Tested-by: Suniel Mahesh <sunil@amarulasolutions.com>
|
|
Link: https://lore.kernel.org/r/20200731160324.142097-1-jagan@amarulasolutions.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm64/configs/defconfig | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
|
|
index 699c204090b8..9365213589bb 100644
|
|
--- a/arch/arm64/configs/defconfig
|
|
+++ b/arch/arm64/configs/defconfig
|
|
@@ -588,6 +588,7 @@ CONFIG_REGULATOR_HI6421V530=y
|
|
CONFIG_REGULATOR_HI655X=y
|
|
CONFIG_REGULATOR_MAX77620=y
|
|
CONFIG_REGULATOR_MAX8973=y
|
|
+CONFIG_REGULATOR_MP8859=y
|
|
CONFIG_REGULATOR_PCA9450=y
|
|
CONFIG_REGULATOR_PFUZE100=y
|
|
CONFIG_REGULATOR_PWM=y
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
|
Date: Sun, 6 Dec 2020 11:37:08 +0100
|
|
Subject: [PATCH] ARM: dts: rockchip: add QoS register compatibles for
|
|
rk3066/rk3188
|
|
|
|
With the conversion of syscon.yaml minItems for compatibles
|
|
was set to 2. Current Rockchip dtsi files only use "syscon" for
|
|
QoS registers. Add Rockchip QoS compatibles for rk3066/rk3188
|
|
to reduce notifications produced with:
|
|
|
|
make ARCH=arm dtbs_check
|
|
DT_SCHEMA_FILES=Documentation/devicetree/bindings/mfd/syscon.yaml
|
|
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
|
Link: https://lore.kernel.org/r/20201206103711.7465-1-jbx6244@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk3xxx.dtsi | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
|
|
index 859a7477909f..49bcdf46d03c 100644
|
|
--- a/arch/arm/boot/dts/rk3xxx.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
|
|
@@ -151,42 +151,42 @@
|
|
};
|
|
|
|
qos_gpu: qos@1012d000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012d000 0x20>;
|
|
};
|
|
|
|
qos_vpu: qos@1012e000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012e000 0x20>;
|
|
};
|
|
|
|
qos_lcdc0: qos@1012f000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012f000 0x20>;
|
|
};
|
|
|
|
qos_cif0: qos@1012f080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012f080 0x20>;
|
|
};
|
|
|
|
qos_ipp: qos@1012f100 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012f100 0x20>;
|
|
};
|
|
|
|
qos_lcdc1: qos@1012f180 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012f180 0x20>;
|
|
};
|
|
|
|
qos_cif1: qos@1012f200 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012f200 0x20>;
|
|
};
|
|
|
|
qos_rga: qos@1012f280 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3066-qos", "syscon";
|
|
reg = <0x1012f280 0x20>;
|
|
};
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
|
Date: Sun, 6 Dec 2020 11:37:09 +0100
|
|
Subject: [PATCH] ARM: dts: rockchip: add QoS register compatibles for rk3288
|
|
|
|
With the conversion of syscon.yaml minItems for compatibles
|
|
was set to 2. Current Rockchip dtsi files only use "syscon" for
|
|
QoS registers. Add Rockchip QoS compatibles for rk3288
|
|
to reduce notifications produced with:
|
|
|
|
make ARCH=arm dtbs_check
|
|
DT_SCHEMA_FILES=Documentation/devicetree/bindings/mfd/syscon.yaml
|
|
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
|
Link: https://lore.kernel.org/r/20201206103711.7465-2-jbx6244@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk3288.dtsi | 28 ++++++++++++++--------------
|
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
index 0d89ad274268..94f691f16944 100644
|
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
@@ -1329,72 +1329,72 @@
|
|
};
|
|
|
|
qos_gpu_r: qos@ffaa0000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffaa0000 0x0 0x20>;
|
|
};
|
|
|
|
qos_gpu_w: qos@ffaa0080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffaa0080 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio1_vop: qos@ffad0000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0000 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio1_isp_w0: qos@ffad0100 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0100 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio1_isp_w1: qos@ffad0180 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0180 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio0_vop: qos@ffad0400 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0400 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio0_vip: qos@ffad0480 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0480 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio0_iep: qos@ffad0500 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0500 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio2_rga_r: qos@ffad0800 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0800 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio2_rga_w: qos@ffad0880 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0880 0x0 0x20>;
|
|
};
|
|
|
|
qos_vio1_isp_r: qos@ffad0900 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffad0900 0x0 0x20>;
|
|
};
|
|
|
|
qos_video: qos@ffae0000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffae0000 0x0 0x20>;
|
|
};
|
|
|
|
qos_hevc_r: qos@ffaf0000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffaf0000 0x0 0x20>;
|
|
};
|
|
|
|
qos_hevc_w: qos@ffaf0080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,rk3288-qos", "syscon";
|
|
reg = <0x0 0xffaf0080 0x0 0x20>;
|
|
};
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Johan Jonker <jbx6244@gmail.com>
|
|
Date: Sun, 6 Dec 2020 11:37:11 +0100
|
|
Subject: [PATCH] arm64: dts: rockchip: add QoS register compatibles for px30
|
|
|
|
With the conversion of syscon.yaml minItems for compatibles
|
|
was set to 2. Current Rockchip dtsi files only use "syscon" for
|
|
QoS registers. Add Rockchip QoS compatibles for px30
|
|
to reduce notifications produced with:
|
|
|
|
make ARCH=arm64 dtbs_check
|
|
DT_SCHEMA_FILES=Documentation/devicetree/bindings/mfd/syscon.yaml
|
|
|
|
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
|
|
Link: https://lore.kernel.org/r/20201206103711.7465-4-jbx6244@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/px30.dtsi | 40 +++++++++++++-------------
|
|
1 file changed, 20 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi
|
|
index 0d6761074b11..3ece5344574d 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/px30.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/px30.dtsi
|
|
@@ -1107,102 +1107,102 @@
|
|
};
|
|
|
|
qos_gmac: qos@ff518000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff518000 0x0 0x20>;
|
|
};
|
|
|
|
qos_gpu: qos@ff520000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff520000 0x0 0x20>;
|
|
};
|
|
|
|
qos_sdmmc: qos@ff52c000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff52c000 0x0 0x20>;
|
|
};
|
|
|
|
qos_emmc: qos@ff538000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff538000 0x0 0x20>;
|
|
};
|
|
|
|
qos_nand: qos@ff538080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff538080 0x0 0x20>;
|
|
};
|
|
|
|
qos_sdio: qos@ff538100 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff538100 0x0 0x20>;
|
|
};
|
|
|
|
qos_sfc: qos@ff538180 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff538180 0x0 0x20>;
|
|
};
|
|
|
|
qos_usb_host: qos@ff540000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff540000 0x0 0x20>;
|
|
};
|
|
|
|
qos_usb_otg: qos@ff540080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff540080 0x0 0x20>;
|
|
};
|
|
|
|
qos_isp_128: qos@ff548000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff548000 0x0 0x20>;
|
|
};
|
|
|
|
qos_isp_rd: qos@ff548080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff548080 0x0 0x20>;
|
|
};
|
|
|
|
qos_isp_wr: qos@ff548100 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff548100 0x0 0x20>;
|
|
};
|
|
|
|
qos_isp_m1: qos@ff548180 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff548180 0x0 0x20>;
|
|
};
|
|
|
|
qos_vip: qos@ff548200 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff548200 0x0 0x20>;
|
|
};
|
|
|
|
qos_rga_rd: qos@ff550000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff550000 0x0 0x20>;
|
|
};
|
|
|
|
qos_rga_wr: qos@ff550080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff550080 0x0 0x20>;
|
|
};
|
|
|
|
qos_vop_m0: qos@ff550100 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff550100 0x0 0x20>;
|
|
};
|
|
|
|
qos_vop_m1: qos@ff550180 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff550180 0x0 0x20>;
|
|
};
|
|
|
|
qos_vpu: qos@ff558000 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff558000 0x0 0x20>;
|
|
};
|
|
|
|
qos_vpu_r128: qos@ff558080 {
|
|
- compatible = "syscon";
|
|
+ compatible = "rockchip,px30-qos", "syscon";
|
|
reg = <0x0 0xff558080 0x0 0x20>;
|
|
};
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Katsuhiro Suzuki <katsuhiro@katsuster.net>
|
|
Date: Mon, 3 Aug 2020 00:42:31 +0900
|
|
Subject: [PATCH] arm64: dts: rockchip: enable HDMI sound nodes for
|
|
rk3328-rock64
|
|
|
|
This patch enables HDMI sound (I2S0) and Analog sound (I2S1) which
|
|
are defined in rk3328.dtsi, and replace SPDIF nodes.
|
|
|
|
We can use SPDIF pass-through with suitable ALSA settings and on
|
|
mpv or other media players.
|
|
- Settings: https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/Rockchip/filesystem/usr/share/alsa/cards/SPDIF.conf
|
|
- Ex.: mpv foo.ac3 --audio-spdif=ac3 --audio-device='alsa/SPDIF.pcm.iec958.0:SPDIF'
|
|
|
|
[Why use simple-audio-card for SPDIF?]
|
|
|
|
For newly adding nodes, ASoC guys recommend to use audio-graph-card.
|
|
But all other sound nodes for rk3328 have already been defined by
|
|
simple-audio-card. In this time, I chose for consistent sound nodes.
|
|
|
|
[DMA allocation problem]
|
|
|
|
After this patch is applied, UART2 will fail to allocate DMA resources
|
|
but UART driver can work fine without DMA.
|
|
|
|
This error is related to the DMAC of rk3328 (pl330 or compatible).
|
|
DMAC connected to 16 DMA sources. Each sources have ID number that is
|
|
called 'Req number' in rk3328 TRM. After this patch is applied total 7
|
|
of DMA sources will be activated as follows:
|
|
|
|
| Req number | Source | Required |
|
|
| | | channels |
|
|
|------------+--------+-----------|
|
|
| 8, 9 | SPI0 | 2ch |
|
|
| 11, 12 | I2S0 | 2ch |
|
|
| 14, 15 | I2S1 | 2ch |
|
|
| 10 | SPDIF | 1ch |
|
|
|------------+--------+-----------|
|
|
| | Total | 7ch |
|
|
|------------+--------+-----------|
|
|
| 6, 7 | UART2 | 2ch | -> cannot get DMA channels
|
|
|
|
Due to rk3328 DMAC specification we can use max 8 channels at same
|
|
time. If SPI0/I2S0/I2S1/SPDIF will be activated by this patch,
|
|
required DMAC channels reach to 7. So the last two channels (for
|
|
UART2) cannot get DMA resources.
|
|
|
|
Virt-dma mechanism for pl0330 DMAC driver is needed to fix this
|
|
problem.
|
|
|
|
Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
|
|
Link: https://lore.kernel.org/r/20200802154231.2639186-1-katsuhiro@katsuster.net
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
.../arm64/boot/dts/rockchip/rk3328-rock64.dts | 56 ++++++++-----------
|
|
1 file changed, 24 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
index 95ab6928cfd4..ecf3fcf24ff3 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
@@ -84,34 +84,32 @@
|
|
};
|
|
};
|
|
|
|
- sound {
|
|
- compatible = "audio-graph-card";
|
|
- label = "rockchip,rk3328";
|
|
- dais = <&i2s1_p0
|
|
- &spdif_p0>;
|
|
+ spdif_sound: spdif-sound {
|
|
+ compatible = "simple-audio-card";
|
|
+ simple-audio-card,name = "SPDIF";
|
|
+
|
|
+ simple-audio-card,cpu {
|
|
+ sound-dai = <&spdif>;
|
|
+ };
|
|
+
|
|
+ simple-audio-card,codec {
|
|
+ sound-dai = <&spdif_dit>;
|
|
+ };
|
|
};
|
|
|
|
- spdif-dit {
|
|
+ spdif_dit: spdif-dit {
|
|
compatible = "linux,spdif-dit";
|
|
#sound-dai-cells = <0>;
|
|
-
|
|
- port {
|
|
- dit_p0_0: endpoint {
|
|
- remote-endpoint = <&spdif_p0_0>;
|
|
- };
|
|
- };
|
|
};
|
|
};
|
|
|
|
+&analog_sound {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&codec {
|
|
mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>;
|
|
status = "okay";
|
|
-
|
|
- port@0 {
|
|
- codec_p0_0: endpoint {
|
|
- remote-endpoint = <&i2s1_p0_0>;
|
|
- };
|
|
- };
|
|
};
|
|
|
|
&cpu0 {
|
|
@@ -163,6 +161,10 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&hdmi_sound {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&hdmiphy {
|
|
status = "okay";
|
|
};
|
|
@@ -278,16 +280,12 @@
|
|
};
|
|
};
|
|
|
|
-&i2s1 {
|
|
+&i2s0 {
|
|
status = "okay";
|
|
+};
|
|
|
|
- i2s1_p0: port {
|
|
- i2s1_p0_0: endpoint {
|
|
- dai-format = "i2s";
|
|
- mclk-fs = <256>;
|
|
- remote-endpoint = <&codec_p0_0>;
|
|
- };
|
|
- };
|
|
+&i2s1 {
|
|
+ status = "okay";
|
|
};
|
|
|
|
&io_domains {
|
|
@@ -337,12 +335,6 @@
|
|
&spdif {
|
|
pinctrl-0 = <&spdifm0_tx>;
|
|
status = "okay";
|
|
-
|
|
- spdif_p0: port {
|
|
- spdif_p0_0: endpoint {
|
|
- remote-endpoint = <&dit_p0_0>;
|
|
- };
|
|
- };
|
|
};
|
|
|
|
&spi0 {
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Katsuhiro Suzuki <katsuhiro@katsuster.net>
|
|
Date: Mon, 10 Aug 2020 18:16:19 +0900
|
|
Subject: [PATCH] arm64: dts: rockchip: add SPDIF node for rk3399-rockpro64
|
|
|
|
This patch adds 'disabled' SPDIF sound node and related settings
|
|
for rk3399-rockpro64.
|
|
|
|
There are 2 reasons:
|
|
- All RK3399 dma-bus channels have been already used by I2S0/1/2
|
|
- RockPro64 does not have SPDIF optical nor coaxial connector,
|
|
just have 3pins
|
|
|
|
Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
|
|
Link: https://lore.kernel.org/r/20200810091619.3170534-1-katsuhiro@katsuster.net
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
.../boot/dts/rockchip/rk3399-rockpro64.dtsi | 27 +++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
|
index 6e553ff47534..58097245994a 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
|
|
@@ -76,6 +76,23 @@
|
|
dais = <&i2s1_p0>;
|
|
};
|
|
|
|
+ sound-dit {
|
|
+ compatible = "audio-graph-card";
|
|
+ label = "rockchip,rk3399";
|
|
+ dais = <&spdif_p0>;
|
|
+ };
|
|
+
|
|
+ spdif-dit {
|
|
+ compatible = "linux,spdif-dit";
|
|
+ #sound-dai-cells = <0>;
|
|
+
|
|
+ port {
|
|
+ dit_p0_0: endpoint {
|
|
+ remote-endpoint = <&spdif_p0_0>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
vcc12v_dcin: vcc12v-dcin {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "vcc12v_dcin";
|
|
@@ -698,6 +715,16 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&spdif {
|
|
+ pinctrl-0 = <&spdif_bus_1>;
|
|
+
|
|
+ spdif_p0: port {
|
|
+ spdif_p0_0: endpoint {
|
|
+ remote-endpoint = <&dit_p0_0>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
+
|
|
&spi1 {
|
|
status = "okay";
|
|
|