Skip to content

Commit

Permalink
Update to v7 patch series
Browse files Browse the repository at this point in the history 
https://patchwork.kernel.org/project/linux-arm-kernel/cover/20250222193332.1761-1-honyuenkwun@gmail.com/
  • Loading branch information
@EvilOlaf
EvilOlaf authored Feb 23, 2025
1 parent 662fbba commit d4279f4
Showing 1 changed file with 76 additions and 54 deletions.
130 changes: 76 additions & 54 deletions patch/kernel/archive/rockchip64-6.12/dt/rk3588-orangepi-5-ultra.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@

firmware {

optee: optee {
compatible = "linaro,optee-tz";
method = "smc";
};

scmi: scmi {
compatible = "arm,scmi-smc";

Expand All @@ -201,6 +196,19 @@
};
};

hdmi0_sound: hdmi0-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "hdmi0";
status = "disabled";

simple-audio-card,codec {
};

simple-audio-card,cpu {
};
};

pmu-a55 {
compatible = "arm,cortex-a55-pmu";
};
Expand Down Expand Up @@ -576,7 +584,7 @@
};

vpu121: video-codec@fdb50000 {
compatible = "rockchip,rk3588-vpu121", "rockchip,rk3328-vpu";
compatible = "rockchip,rk3588-vpu121", "rockchip,rk3568-vpu";
interrupt-names = "vdpu";
clock-names = "aclk", "hclk";
};
Expand Down Expand Up @@ -642,7 +650,6 @@
compatible = "rockchip,rk3588-vop";
reg-names = "vop", "gamma-lut";
clock-names = "aclk", "hclk", "dclk_vp0", "dclk_vp1", "dclk_vp2", "dclk_vp3", "pclk_vop", "pll_hdmiphy0", "pll_hdmiphy1";
reset-names = "dclk_vp0", "dclk_vp1", "dclk_vp2", "dclk_vp3";
status = "okay";

vop_out: ports {
Expand Down Expand Up @@ -670,6 +677,13 @@
status = "okay";
};

spdif_tx2: spdif-tx@fddb0000 {
compatible = "rockchip,rk3588-spdif", "rockchip,rk3568-spdif";
clock-names = "mclk", "hclk";
dma-names = "tx";
status = "disabled";
};

i2s4_8ch: i2s@fddc0000 {
compatible = "rockchip,rk3588-i2s-tdm";
clock-names = "mclk_tx", "mclk_rx", "hclk";
Expand All @@ -678,6 +692,13 @@
status = "disabled";
};

spdif_tx3: spdif-tx@fdde0000 {
compatible = "rockchip,rk3588-spdif", "rockchip,rk3568-spdif";
clock-names = "mclk", "hclk";
dma-names = "tx";
status = "disabled";
};

i2s5_8ch: i2s@fddf0000 {
compatible = "rockchip,rk3588-i2s-tdm";
clock-names = "mclk_tx", "mclk_rx", "hclk";
Expand Down Expand Up @@ -1036,13 +1057,6 @@
mmc-hs400-enhanced-strobe;
};

crypto: crypto@fe370000 {
compatible = "rockchip,rk3588-crypto";
clock-names = "core", "aclk", "hclk";
reset-names = "core";
status = "okay";
};

i2s0_8ch: i2s@fe470000 {
compatible = "rockchip,rk3588-i2s-tdm";
clock-names = "mclk_tx", "mclk_rx", "hclk";
Expand Down Expand Up @@ -1079,19 +1093,38 @@
status = "disabled";
};

spdif_tx0: spdif-tx@fe4e0000 {
compatible = "rockchip,rk3588-spdif", "rockchip,rk3568-spdif";
clock-names = "mclk", "hclk";
dma-names = "tx";
pinctrl-names = "default";
status = "disabled";
};

spdif_tx1: spdif-tx@fe4f0000 {
compatible = "rockchip,rk3588-spdif", "rockchip,rk3568-spdif";
clock-names = "mclk", "hclk";
dma-names = "tx";
pinctrl-names = "default";
status = "disabled";
};

gic: interrupt-controller@fe600000 {
compatible = "arm,gic-v3";
interrupt-controller;
dma-noncoherent;
msi-controller;
ranges;

its0: msi-controller@fe640000 {
compatible = "arm,gic-v3-its";
dma-noncoherent;
msi-controller;
};

its1: msi-controller@fe660000 {
compatible = "arm,gic-v3-its";
dma-noncoherent;
msi-controller;
};

Expand Down Expand Up @@ -1841,14 +1874,6 @@

system_sram2: sram@ff001000 {
compatible = "mmio-sram";

vdec0_sram: rkvdec-sram@0 {
pool;
};

vdec1_sram: rkvdec-sram@1 {
pool;
};
};

pinctrl: pinctrl {
Expand Down Expand Up @@ -2006,9 +2031,6 @@
hdmim0_tx1_hpd: hdmim0-tx1-hpd {
};

hdmim1_rx: hdmim1-rx {
};

hdmim1_tx1_scl: hdmim1-tx1-scl {
};

Expand Down Expand Up @@ -2332,9 +2354,15 @@
};

spdif0 {

spdif0m0_tx: spdif0m0-tx {
};
};

spdif1 {

spdif1m0_tx: spdif1m0-tx {
};
};

spi0 {
Expand Down Expand Up @@ -2500,27 +2528,16 @@
};
};

vdec0: video-decoder@fdc38000 {
compatible = "rockchip,rk3588-vdec";
reg-names = "link", "function", "cache";
clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac";
reset-names = "rst_axi", "rst_ahb", "rst_cabac", "rst_core", "rst_hevc_cabac";
};

vdec1: video-decoder@fdc40000 {
compatible = "rockchip,rk3588-vdec";
reg-names = "link", "function", "cache";
clock-names = "axi", "ahb", "cabac", "core", "hevc_cabac";
reset-names = "rst_axi", "rst_ahb", "rst_cabac", "rst_core", "rst_hevc_cabac";
};
hdmi1_sound: hdmi1-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "hdmi1";
status = "okay";

reserved-memory {
ranges;
simple-audio-card,codec {
};

hdmi_receiver_cma: hdmi-receiver-cma {
compatible = "shared-dma-pool";
no-map;
status = "disabled";
simple-audio-card,cpu {
};
};

Expand Down Expand Up @@ -2569,6 +2586,13 @@
compatible = "rockchip,rk3588-hdptxphy-grf", "syscon";
};

spdif_tx5: spdif-tx@fddb8000 {
compatible = "rockchip,rk3588-spdif", "rockchip,rk3568-spdif";
clock-names = "mclk", "hclk";
dma-names = "tx";
status = "disabled";
};

i2s8_8ch: i2s@fddc8000 {
compatible = "rockchip,rk3588-i2s-tdm";
clock-names = "mclk_tx", "mclk_rx", "hclk";
Expand All @@ -2577,6 +2601,13 @@
status = "disabled";
};

spdif_tx4: spdif-tx@fdde8000 {
compatible = "rockchip,rk3588-spdif", "rockchip,rk3568-spdif";
clock-names = "mclk", "hclk";
dma-names = "tx";
status = "disabled";
};

i2s6_8ch: i2s@fddf4000 {
compatible = "rockchip,rk3588-i2s-tdm";
clock-names = "mclk_tx", "mclk_rx", "hclk";
Expand All @@ -2601,15 +2632,6 @@
status = "disabled";
};

hdmi_receiver: hdmi_receiver@fdee0000 {
compatible = "rockchip,rk3588-hdmirx-ctrler", "snps,dw-hdmi-rx";
interrupt-names = "cec", "hdmi", "dma";
clock-names = "aclk", "audio", "cr_para", "pclk", "ref", "hclk_s_hdmirx", "hclk_vo1";
reset-names = "axi", "apb", "ref", "biu";
pinctrl-names = "default";
status = "disabled";
};

hdmi1: hdmi@fdea0000 {
compatible = "rockchip,rk3588-dw-hdmi-qp";
clock-names = "pclk", "earc", "ref", "aud", "hdp", "hclk_vo1";
Expand Down Expand Up @@ -2947,7 +2969,7 @@
};

led_green_pwm: led-2 {
function = "heartbeat";
function = "indicator";
};
};

Expand Down

0 comments on commit d4279f4

Please sign in to comment.