689 lines
21 KiB
Diff
689 lines
21 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Wed, 2 Sep 2020 19:52:02 +0200
|
|
Subject: [PATCH] arm64: dts: rockchip: add gpu powerdomain, gpu opp-table and
|
|
cooling cell for RK3328
|
|
|
|
Note: since the regulator that supplies the GPU usually also supplies
|
|
other SoC components, we have to make sure voltage is never lower then
|
|
1075 mV - also disable 500 MHz for now, since it will crash if rkvdec
|
|
is running at the same time (voltage to high)
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
.../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 +++
|
|
.../arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 +++
|
|
arch/arm64/boot/dts/rockchip/rk3328.dtsi | 35 +++++++++++++++++++
|
|
3 files changed, 43 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
index aa22a0c22265..51c7723d6762 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
@@ -166,6 +166,10 @@ &gmac2io {
|
|
status = "okay";
|
|
};
|
|
|
|
+&gpu {
|
|
+ mali-supply = <&vdd_logic>;
|
|
+};
|
|
+
|
|
&hdmi {
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
index f69a38f42d2d..c198a8a7f95a 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
|
|
@@ -162,6 +162,10 @@ &gmac2io {
|
|
status = "okay";
|
|
};
|
|
|
|
+&gpu {
|
|
+ mali-supply = <&vdd_logic>;
|
|
+};
|
|
+
|
|
&hdmi {
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
index 431c4ec198be..eec03adf0902 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
|
@@ -300,6 +300,11 @@ power: power-controller {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
+ power-domain@RK3328_PD_GPU {
|
|
+ reg = <RK3328_PD_GPU>;
|
|
+ clocks = <&cru ACLK_GPU>;
|
|
+ #power-domain-cells = <0>;
|
|
+ };
|
|
power-domain@RK3328_PD_HEVC {
|
|
reg = <RK3328_PD_HEVC>;
|
|
#power-domain-cells = <0>;
|
|
@@ -539,6 +544,11 @@ map0 {
|
|
<&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
contribution = <4096>;
|
|
};
|
|
+ map1 {
|
|
+ trip = <&target>;
|
|
+ cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
|
+ contribution = <4096>;
|
|
+ };
|
|
};
|
|
};
|
|
|
|
@@ -620,7 +630,32 @@ gpu: gpu@ff300000 {
|
|
"ppmmu1";
|
|
clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
|
|
clock-names = "bus", "core";
|
|
+ operating-points-v2 = <&gpu_opp_table>;
|
|
+ power-domains = <&power RK3328_PD_GPU>;
|
|
resets = <&cru SRST_GPU_A>;
|
|
+ #cooling-cells = <2>;
|
|
+ };
|
|
+
|
|
+ gpu_opp_table: gpu-opp-table {
|
|
+ compatible = "operating-points-v2";
|
|
+
|
|
+ opp-200000000 {
|
|
+ opp-hz = /bits/ 64 <200000000>;
|
|
+ opp-microvolt = <1075000>;
|
|
+ };
|
|
+ opp-300000000 {
|
|
+ opp-hz = /bits/ 64 <300000000>;
|
|
+ opp-microvolt = <1075000>;
|
|
+ };
|
|
+ opp-400000000 {
|
|
+ opp-hz = /bits/ 64 <400000000>;
|
|
+ opp-microvolt = <1075000>;
|
|
+ };
|
|
+ opp-500000000 {
|
|
+ opp-hz = /bits/ 64 <500000000>;
|
|
+ opp-microvolt = <1150000>;
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
|
|
h265e_mmu: iommu@ff330200 {
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Tue, 2 Feb 2021 17:22:21 +0200
|
|
Subject: [PATCH] ARM: dts: RK3288 miqi add hdmi sound nodes
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/rk3288-miqi.dts | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
index 713f55e143c6..8d30c49f406e 100644
|
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
@@ -78,6 +78,21 @@ vcc_sys: vsys-regulator {
|
|
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 {
|
|
@@ -284,6 +299,11 @@ &i2c5 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&i2s {
|
|
+ #sound-dai-cells = <0>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&io_domains {
|
|
status = "okay";
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Fri, 2 Apr 2021 17:54:22 +0200
|
|
Subject: [PATCH] ARM/arm64: dts: rockchip: align sound card names
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/rk3288-tinker.dtsi | 2 +-
|
|
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
index 09618bb7d872..db9106a3dd22 100644
|
|
--- a/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3288-tinker.dtsi
|
|
@@ -73,7 +73,7 @@ sdio_pwrseq: sdio-pwrseq {
|
|
sound {
|
|
compatible = "simple-audio-card";
|
|
simple-audio-card,format = "i2s";
|
|
- simple-audio-card,name = "rockchip,tinker-codec";
|
|
+ simple-audio-card,name = "HDMI";
|
|
simple-audio-card,mclk-fs = <512>;
|
|
|
|
simple-audio-card,codec {
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
index 093ebe070775..a10fe60b7680 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
@@ -1893,7 +1893,7 @@ hdmi_sound: hdmi-sound {
|
|
compatible = "simple-audio-card";
|
|
simple-audio-card,format = "i2s";
|
|
simple-audio-card,mclk-fs = <256>;
|
|
- simple-audio-card,name = "hdmi-sound";
|
|
+ simple-audio-card,name = "HDMI";
|
|
status = "disabled";
|
|
|
|
simple-audio-card,cpu {
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sun, 25 Mar 2018 22:17:06 +0200
|
|
Subject: [PATCH] ASoC: hdmi-codec: fix channel allocation
|
|
|
|
---
|
|
sound/soc/codecs/hdmi-codec.c | 113 ++++++++++++++++------------------
|
|
1 file changed, 52 insertions(+), 61 deletions(-)
|
|
|
|
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
|
|
index 5679102de91f..f0cd183f7873 100644
|
|
--- a/sound/soc/codecs/hdmi-codec.c
|
|
+++ b/sound/soc/codecs/hdmi-codec.c
|
|
@@ -194,78 +194,69 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {
|
|
*/
|
|
static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
|
|
{ .ca_id = 0x00, .n_ch = 2,
|
|
- .mask = FL | FR},
|
|
- /* 2.1 */
|
|
- { .ca_id = 0x01, .n_ch = 4,
|
|
- .mask = FL | FR | LFE},
|
|
- /* Dolby Surround */
|
|
+ .mask = FL | FR },
|
|
+ { .ca_id = 0x03, .n_ch = 4,
|
|
+ .mask = FL | FR | LFE | FC },
|
|
{ .ca_id = 0x02, .n_ch = 4,
|
|
.mask = FL | FR | FC },
|
|
- /* surround51 */
|
|
+ { .ca_id = 0x01, .n_ch = 4,
|
|
+ .mask = FL | FR | LFE },
|
|
{ .ca_id = 0x0b, .n_ch = 6,
|
|
- .mask = FL | FR | LFE | FC | RL | RR},
|
|
- /* surround40 */
|
|
- { .ca_id = 0x08, .n_ch = 6,
|
|
- .mask = FL | FR | RL | RR },
|
|
- /* surround41 */
|
|
- { .ca_id = 0x09, .n_ch = 6,
|
|
- .mask = FL | FR | LFE | RL | RR },
|
|
- /* surround50 */
|
|
+ .mask = FL | FR | LFE | FC | RL | RR },
|
|
{ .ca_id = 0x0a, .n_ch = 6,
|
|
.mask = FL | FR | FC | RL | RR },
|
|
- /* 6.1 */
|
|
- { .ca_id = 0x0f, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | FC | RL | RR | RC },
|
|
- /* surround71 */
|
|
+ { .ca_id = 0x09, .n_ch = 6,
|
|
+ .mask = FL | FR | LFE | RL | RR },
|
|
+ { .ca_id = 0x08, .n_ch = 6,
|
|
+ .mask = FL | FR | RL | RR },
|
|
+ { .ca_id = 0x07, .n_ch = 6,
|
|
+ .mask = FL | FR | LFE | FC | RC },
|
|
+ { .ca_id = 0x06, .n_ch = 6,
|
|
+ .mask = FL | FR | FC | RC },
|
|
+ { .ca_id = 0x05, .n_ch = 6,
|
|
+ .mask = FL | FR | LFE | RC },
|
|
+ { .ca_id = 0x04, .n_ch = 6,
|
|
+ .mask = FL | FR | RC },
|
|
{ .ca_id = 0x13, .n_ch = 8,
|
|
.mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
|
|
- /* others */
|
|
- { .ca_id = 0x03, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | FC },
|
|
- { .ca_id = 0x04, .n_ch = 8,
|
|
- .mask = FL | FR | RC},
|
|
- { .ca_id = 0x05, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | RC },
|
|
- { .ca_id = 0x06, .n_ch = 8,
|
|
- .mask = FL | FR | FC | RC },
|
|
- { .ca_id = 0x07, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | FC | RC },
|
|
- { .ca_id = 0x0c, .n_ch = 8,
|
|
- .mask = FL | FR | RC | RL | RR },
|
|
- { .ca_id = 0x0d, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | RL | RR | RC },
|
|
- { .ca_id = 0x0e, .n_ch = 8,
|
|
- .mask = FL | FR | FC | RL | RR | RC },
|
|
- { .ca_id = 0x10, .n_ch = 8,
|
|
- .mask = FL | FR | RL | RR | RLC | RRC },
|
|
- { .ca_id = 0x11, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | RL | RR | RLC | RRC },
|
|
+ { .ca_id = 0x1f, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
|
|
{ .ca_id = 0x12, .n_ch = 8,
|
|
.mask = FL | FR | FC | RL | RR | RLC | RRC },
|
|
- { .ca_id = 0x14, .n_ch = 8,
|
|
- .mask = FL | FR | FLC | FRC },
|
|
- { .ca_id = 0x15, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | FLC | FRC },
|
|
- { .ca_id = 0x16, .n_ch = 8,
|
|
- .mask = FL | FR | FC | FLC | FRC },
|
|
- { .ca_id = 0x17, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | FC | FLC | FRC },
|
|
- { .ca_id = 0x18, .n_ch = 8,
|
|
- .mask = FL | FR | RC | FLC | FRC },
|
|
- { .ca_id = 0x19, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | RC | FLC | FRC },
|
|
- { .ca_id = 0x1a, .n_ch = 8,
|
|
- .mask = FL | FR | RC | FC | FLC | FRC },
|
|
- { .ca_id = 0x1b, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | RC | FC | FLC | FRC },
|
|
- { .ca_id = 0x1c, .n_ch = 8,
|
|
- .mask = FL | FR | RL | RR | FLC | FRC },
|
|
- { .ca_id = 0x1d, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | RL | RR | FLC | FRC },
|
|
{ .ca_id = 0x1e, .n_ch = 8,
|
|
.mask = FL | FR | FC | RL | RR | FLC | FRC },
|
|
- { .ca_id = 0x1f, .n_ch = 8,
|
|
- .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
|
|
+ { .ca_id = 0x11, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | RL | RR | RLC | RRC },
|
|
+ { .ca_id = 0x1d, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | RL | RR | FLC | FRC },
|
|
+ { .ca_id = 0x10, .n_ch = 8,
|
|
+ .mask = FL | FR | RL | RR | RLC | RRC },
|
|
+ { .ca_id = 0x1c, .n_ch = 8,
|
|
+ .mask = FL | FR | RL | RR | FLC | FRC },
|
|
+ { .ca_id = 0x0f, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | FC | RL | RR | RC },
|
|
+ { .ca_id = 0x1b, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | RC | FC | FLC | FRC },
|
|
+ { .ca_id = 0x0e, .n_ch = 8,
|
|
+ .mask = FL | FR | FC | RL | RR | RC },
|
|
+ { .ca_id = 0x1a, .n_ch = 8,
|
|
+ .mask = FL | FR | RC | FC | FLC | FRC },
|
|
+ { .ca_id = 0x0d, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | RL | RR | RC },
|
|
+ { .ca_id = 0x19, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | RC | FLC | FRC },
|
|
+ { .ca_id = 0x0c, .n_ch = 8,
|
|
+ .mask = FL | FR | RC | RL | RR },
|
|
+ { .ca_id = 0x18, .n_ch = 8,
|
|
+ .mask = FL | FR | RC | FLC | FRC },
|
|
+ { .ca_id = 0x17, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | FC | FLC | FRC },
|
|
+ { .ca_id = 0x16, .n_ch = 8,
|
|
+ .mask = FL | FR | FC | FLC | FRC },
|
|
+ { .ca_id = 0x15, .n_ch = 8,
|
|
+ .mask = FL | FR | LFE | FLC | FRC },
|
|
+ { .ca_id = 0x14, .n_ch = 8,
|
|
+ .mask = FL | FR | FLC | FRC },
|
|
};
|
|
|
|
struct hdmi_codec_priv {
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Sat, 27 Feb 2021 17:52:02 +0100
|
|
Subject: [PATCH] arm64: dts: rockchip: add SPDIF nodes for RK3328 A1 board
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 ++++++++++++++++++++++
|
|
1 file changed, 23 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
index 40bf808642b9..27a1799027c2 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
@@ -57,6 +57,24 @@ ir-receiver {
|
|
gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
|
|
linux,rc-map-name = "rc-beelink-gs1";
|
|
};
|
|
+
|
|
+ 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 {
|
|
+ compatible = "linux,spdif-dit";
|
|
+ #sound-dai-cells = <0>;
|
|
+ };
|
|
};
|
|
|
|
&analog_sound {
|
|
@@ -325,6 +343,11 @@ &sdmmc {
|
|
status = "okay";
|
|
};
|
|
|
|
+&spdif {
|
|
+ pinctrl-0 = <&spdifm0_tx>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&tsadc {
|
|
rockchip,hw-tshut-mode = <0>;
|
|
rockchip,hw-tshut-polarity = <0>;
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Sat, 27 Feb 2021 18:01:13 +0100
|
|
Subject: [PATCH] arm64: dts: rockchip: Add ir-receiver node for RK3328 ROC CC
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
index 51c7723d6762..cf321302daec 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
|
|
@@ -88,6 +88,13 @@ vcc_phy: vcc-phy-regulator {
|
|
regulator-boot-on;
|
|
};
|
|
|
|
+ ir-receiver {
|
|
+ compatible = "gpio-ir-receiver";
|
|
+ gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
|
|
+ pinctrl-0 = <&ir_int>;
|
|
+ pinctrl-names = "default";
|
|
+ };
|
|
+
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
|
|
@@ -312,6 +319,13 @@ &io_domains {
|
|
};
|
|
|
|
&pinctrl {
|
|
+
|
|
+ ir {
|
|
+ ir_int: ir-int {
|
|
+ rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
+ };
|
|
+ };
|
|
+
|
|
pmic {
|
|
pmic_int_l: pmic-int-l {
|
|
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Mon, 1 Mar 2021 21:24:15 +0100
|
|
Subject: [PATCH] ARM: dts: add cec pinctrl for RK3288 miqi board
|
|
|
|
---
|
|
arch/arm/boot/dts/rk3288-miqi.dts | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
index 8d30c49f406e..6d90db5a3b75 100644
|
|
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
|
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
|
@@ -145,6 +145,8 @@ &gpu {
|
|
|
|
&hdmi {
|
|
ddc-i2c-bus = <&i2c5>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&hdmi_cec_c0>;
|
|
status = "okay";
|
|
};
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Mon, 1 Mar 2021 19:22:15 +0100
|
|
Subject: [PATCH] HACK: arm64: dts: enable FE phy for Beelink A1 also
|
|
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
index 27a1799027c2..7de9dfa71d89 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
@@ -147,6 +147,14 @@ rtl8211f: ethernet-phy@0 {
|
|
};
|
|
};
|
|
|
|
+&gmac2phy {
|
|
+ clock_in_out = "output";
|
|
+ assigned-clock-rate = <50000000>;
|
|
+ assigned-clocks = <&cru SCLK_MAC2PHY>;
|
|
+ assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&gpu {
|
|
mali-supply = <&vdd_logic>;
|
|
};
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Tue, 26 Feb 2019 20:45:14 +0000
|
|
Subject: [PATCH] WIP: dw-hdmi-cec: sleep 100ms on error
|
|
|
|
---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 18 ++++++++++++++++--
|
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
|
|
index c8f44bcb298a..d4280ce4542c 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c
|
|
@@ -4,6 +4,7 @@
|
|
*
|
|
* Copyright (C) 2015-2017 Russell King.
|
|
*/
|
|
+#include <linux/delay.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
@@ -129,8 +130,15 @@ static irqreturn_t dw_hdmi_cec_hardirq(int irq, void *data)
|
|
|
|
dw_hdmi_write(cec, stat, HDMI_IH_CEC_STAT0);
|
|
|
|
- if (stat & CEC_STAT_ERROR_INIT) {
|
|
- cec->tx_status = CEC_TX_STATUS_ERROR;
|
|
+ /* Status with both done and error_initiator bits have been seen
|
|
+ * on Rockchip RK3328 devices, transmit attempt seems to have failed
|
|
+ * when this happens, report as low drive and block cec-framework
|
|
+ * 100ms before core retransmits the failed message, this seems to
|
|
+ * mitigate the issue with failed transmit attempts.
|
|
+ */
|
|
+ if ((stat & (CEC_STAT_DONE|CEC_STAT_ERROR_INIT)) == (CEC_STAT_DONE|CEC_STAT_ERROR_INIT)) {
|
|
+ pr_debug("dw_hdmi_cec_hardirq: stat=%02x LOW_DRIVE\n", stat);
|
|
+ cec->tx_status = CEC_TX_STATUS_LOW_DRIVE;
|
|
cec->tx_done = true;
|
|
ret = IRQ_WAKE_THREAD;
|
|
} else if (stat & CEC_STAT_DONE) {
|
|
@@ -141,6 +149,10 @@ static irqreturn_t dw_hdmi_cec_hardirq(int irq, void *data)
|
|
cec->tx_status = CEC_TX_STATUS_NACK;
|
|
cec->tx_done = true;
|
|
ret = IRQ_WAKE_THREAD;
|
|
+ } else if (stat & CEC_STAT_ERROR_INIT) {
|
|
+ cec->tx_status = CEC_TX_STATUS_ERROR;
|
|
+ cec->tx_done = true;
|
|
+ ret = IRQ_WAKE_THREAD;
|
|
}
|
|
|
|
if (stat & CEC_STAT_EOM) {
|
|
@@ -173,6 +185,8 @@ static irqreturn_t dw_hdmi_cec_thread(int irq, void *data)
|
|
|
|
if (cec->tx_done) {
|
|
cec->tx_done = false;
|
|
+ if (cec->tx_status == CEC_TX_STATUS_LOW_DRIVE)
|
|
+ msleep(100);
|
|
cec_transmit_attempt_done(adap, cec->tx_status);
|
|
}
|
|
if (cec->rx_done) {
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Wed, 5 May 2021 19:11:12 +0200
|
|
Subject: [PATCH] arm64: boot: dts: Increase ACLK_PERILP0 clock rate for RK3399
|
|
|
|
As per vendor kernel. Leaving this clock at the lower rate will
|
|
result in poor DMA controller performance
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
index a10fe60b7680..dbe6a9cb98a5 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
|
@@ -1477,7 +1477,7 @@ cru: clock-controller@ff760000 {
|
|
<1000000000>,
|
|
<150000000>, <75000000>,
|
|
<37500000>,
|
|
- <100000000>, <100000000>,
|
|
+ <300000000>, <100000000>,
|
|
<50000000>, <600000000>,
|
|
<100000000>, <50000000>,
|
|
<400000000>, <400000000>,
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Sat, 21 Aug 2021 17:04:46 +0200
|
|
Subject: [PATCH] arm64: dts: rockchip: Enable USB3 for rk3328 Beelink A1
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
index 7de9dfa71d89..e857e5a727f4 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts
|
|
@@ -389,6 +389,11 @@ &usb_host0_ehci {
|
|
status = "okay";
|
|
};
|
|
|
|
+&usbdrd3 {
|
|
+ dr_mode = "host";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&vop {
|
|
status = "okay";
|
|
};
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Sat, 30 Oct 2021 12:19:19 +0200
|
|
Subject: [PATCH] WIP: drm: bridge: dw-hdmi: switch from .hw_parmas to .prepare
|
|
for i2s
|
|
|
|
Seems to be the only way to get AES bits correctly as set by
|
|
userspace.
|
|
TODO: check other consequences.
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
index a2f0860b20bb..8961f9c7885d 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
@@ -34,9 +34,9 @@ static inline u8 hdmi_read(struct dw_hdmi_i2s_audio_data *audio, int offset)
|
|
return audio->read(hdmi, offset);
|
|
}
|
|
|
|
-static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
|
|
- struct hdmi_codec_daifmt *fmt,
|
|
- struct hdmi_codec_params *hparms)
|
|
+static int dw_hdmi_i2s_prepare(struct device *dev, void *data,
|
|
+ struct hdmi_codec_daifmt *fmt,
|
|
+ struct hdmi_codec_params *hparms)
|
|
{
|
|
struct dw_hdmi_i2s_audio_data *audio = data;
|
|
struct dw_hdmi *hdmi = audio->hdmi;
|
|
@@ -178,7 +178,7 @@ static int dw_hdmi_i2s_hook_plugged_cb(struct device *dev, void *data,
|
|
}
|
|
|
|
static const struct hdmi_codec_ops dw_hdmi_i2s_ops = {
|
|
- .hw_params = dw_hdmi_i2s_hw_params,
|
|
+ .prepare = dw_hdmi_i2s_prepare,
|
|
.audio_startup = dw_hdmi_i2s_audio_startup,
|
|
.audio_shutdown = dw_hdmi_i2s_audio_shutdown,
|
|
.get_eld = dw_hdmi_i2s_get_eld,
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Sun, 18 Sep 2022 10:35:52 +0200
|
|
Subject: [PATCH] arm64: dts: rockchip: Disbake fusb for rk3399-roc-pc
|
|
|
|
As it will lead to an unbootable device in case one if those ports
|
|
is used to power up the device.
|
|
See https://lkml.org/lkml/2022/6/20/413
|
|
---
|
|
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
|
index 2f4b1b2e3ac7..7217ead94d39 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
|
@@ -215,7 +215,7 @@ vdd_log: vdd-log {
|
|
regulator-name = "vdd_log";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
- regulator-min-microvolt = <450000>;
|
|
+ regulator-min-microvolt = <430000>;
|
|
regulator-max-microvolt = <1400000>;
|
|
pwm-supply = <&vcc3v3_sys>;
|
|
};
|
|
@@ -536,7 +536,7 @@ fusb1: usb-typec@22 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&fusb1_int>;
|
|
vbus-supply = <&vcc_vbus_typec1>;
|
|
- status = "okay";
|
|
+ status = "disabled";
|
|
};
|
|
};
|
|
|
|
@@ -553,7 +553,7 @@ fusb0: usb-typec@22 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&fusb0_int>;
|
|
vbus-supply = <&vcc_vbus_typec0>;
|
|
- status = "okay";
|
|
+ status = "disabled";
|
|
};
|
|
|
|
mp8859: regulator@66 {
|