Skip to content

Commit 224a648

Browse files
committed
arm64: dts: rockchip: add NanoPC-T6 Plus, retire stray LTS Plus
Add the real FriendlyElec NanoPC-T6 Plus variant: rk3588-nanopc-t6-plus.dts, based on rk3588-nanopc-t6.dts, swapping the base T6's RT5616 audio codec for the ES8389 found on the Plus, and adding the dedicated 5V regulator on the USB host port (vcc5v0_host_20 / u2phy3_host). The previously committed 'NanoPC-T6 LTS Plus' (45533e9) refers to a product that does not actually exist — it was added by mistake. Rather than delete the .dts and break any existing image referencing rk3588-nanopc-t6-lts-plus.dtb, turn it into a symlink pointing at the new Plus dts so the artifact name keeps building. New deployments should use rk3588-nanopc-t6-plus.dtb.
1 parent 9389e31 commit 224a648

3 files changed

Lines changed: 79 additions & 77 deletions

File tree

arch/arm64/boot/dts/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-cm3588-nas.dtb
388388
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
389389
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts.dtb
390390
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-lts-plus.dtb
391+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6-plus.dtb
391392
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10.dtb
392393
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10-android.dtb
393394
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nvr-demo-v10-ipc-4x-linux.dtb

arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts-plus.dts

Lines changed: 0 additions & 77 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rk3588-nanopc-t6-plus.dts
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2025 FriendlyElec Computer Tech. Co., Ltd.
4+
* (http://www.friendlyelec.com)
5+
* Copyright (c) 2025 Armbian <igor@armbian.com>
6+
*/
7+
8+
/dts-v1/;
9+
#include "rk3588-nanopc-t6.dts"
10+
11+
/delete-node/ &rt5616;
12+
/delete-node/ &rt5616_sound;
13+
14+
/ {
15+
model = "FriendlyElec NanoPC-T6 Plus";
16+
compatible = "friendlyelec,nanopc-t6", "rockchip,rk3588";
17+
18+
es8389_sound: es8389-sound {
19+
status = "okay";
20+
compatible = "simple-audio-card";
21+
pinctrl-names = "default";
22+
pinctrl-0 = <&hp_det>;
23+
24+
simple-audio-card,name = "everest,es8389-codec";
25+
simple-audio-card,format = "i2s";
26+
simple-audio-card,mclk-fs = <256>;
27+
28+
simple-audio-card,hp-det-gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>;
29+
30+
simple-audio-card,widgets =
31+
"Headphone", "Headphones",
32+
"Microphone", "Microphone Jack";
33+
simple-audio-card,routing =
34+
"Headphones", "HPOL",
35+
"Headphones", "HPOR",
36+
"INPUT1", "Microphone Jack",
37+
"INPUT2", "Microphone Jack";
38+
39+
simple-audio-card,cpu {
40+
sound-dai = <&i2s0_8ch>;
41+
};
42+
simple-audio-card,codec {
43+
sound-dai = <&es8389>;
44+
};
45+
};
46+
47+
vcc5v0_host_20: vcc5v0-host-20 {
48+
compatible = "regulator-fixed";
49+
enable-active-high;
50+
gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
51+
pinctrl-names = "default";
52+
pinctrl-0 = <&vcc5v0_host20_en>;
53+
regulator-name = "vcc5v0_host_20";
54+
regulator-min-microvolt = <5000000>;
55+
regulator-max-microvolt = <5000000>;
56+
vin-supply = <&vcc5v0_usb>;
57+
};
58+
};
59+
60+
&i2c7 {
61+
es8389: es8389@10 {
62+
status = "okay";
63+
#sound-dai-cells = <0>;
64+
compatible = "everest,es8389";
65+
reg = <0x10>;
66+
clocks = <&mclkout_i2s0>;
67+
clock-names = "mclk";
68+
assigned-clocks = <&mclkout_i2s0>;
69+
assigned-clock-rates = <12288000>;
70+
pinctrl-names = "default";
71+
pinctrl-0 = <&i2s0_mclk>;
72+
};
73+
};
74+
75+
&u2phy3_host {
76+
phy-supply = <&vcc5v0_host_20>;
77+
};

0 commit comments

Comments
 (0)