Skip to content

Commit

Permalink
arm64: dts: nanopi-6-common: Add several features based on vendor dtsi
Browse files Browse the repository at this point in the history
https://github.com/friendlyarm/kernel-rockchip/
The following commits from the vendor dtsi file have been used:

ARM64: dts: rockchip: enable crypto node for nanopi5/6
Signed-off-by: jensen <[email protected]>

arm64: dts: rockchip: update ir-key-table for nanopi6
Signed-off-by: jensen <[email protected]>

ARM64: dts: rockchip: apply the EVB changes to nanopi5/6
Signed-off-by: jensen <[email protected]>

ARM64: dts: rockchip: enable watchdog for nanopi5/6
Signed-off-by: jensen <[email protected]>

Some documentation for the watchdog can be found here:
https://wiki.t-firefly.com/en/ROC-RK3588-PC/usage_watchdog.html

Watchdog and crypto has been successfully tested on CM3588.
  • Loading branch information
ColorfulRhino committed Feb 10, 2024
1 parent f6c51fb commit 8af37f1
Showing 1 changed file with 21 additions and 4 deletions.
25 changes: 21 additions & 4 deletions arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -444,11 +444,11 @@
<0xf1 KEY_VOLUMEDOWN>,
<0xf3 KEY_VOLUMEUP>,
<0xae KEY_MENU>,
<0xeb 172>,
<0xeb KEY_LEFTMETA>,
<0xaf KEY_BACK>,
<0xf7 204>,
<0xf7 KEY_MODE>,
<0xe5 KEY_SYSRQ>,
<0xf5 580>;
<0xf5 KEY_ESC>;
};
};

Expand Down Expand Up @@ -507,6 +507,8 @@
};

&rkvenc0 {
venc-supply = <&vdd_vdenc_s0>;
mem-supply = <&vdd_vdenc_mem_s0>;
status = "okay";
};

Expand All @@ -515,6 +517,8 @@
};

&rkvenc1 {
venc-supply = <&vdd_vdenc_s0>;
mem-supply = <&vdd_vdenc_mem_s0>;
status = "okay";
};

Expand Down Expand Up @@ -557,6 +561,14 @@
connect = <&vp0_out_hdmi0>;
};

&rng {
status = "okay";
};

&crypto {
status = "okay";
};

&saradc {
status = "okay";
vref-supply = <&avcc_1v8_s0>;
Expand All @@ -570,6 +582,7 @@
max-frequency = <200000000>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
full-pwr-cycle-in-suspend;
status = "okay";
};

Expand Down Expand Up @@ -687,7 +700,11 @@
rockchip,primary-plane = <ROCKCHIP_VOP2_CLUSTER3>;
};

&wdt {
status = "okay";
};

&display_subsystem {
clocks = <&hdptxphy_hdmi_clk0>;
clock-names = "hdmi0_phy_pll";
};
};

0 comments on commit 8af37f1

Please sign in to comment.