Skip to content

Commit 13c4068

Browse files
arndbarndb
committed
Merge tag 'v7.1-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/arm
New board, the Khadas Edge 2L. Newly added peripherals are the OTP nvmem controllers for RK3528, RK3562 and RK3566/8, SPDIF on RK3576. The RK3566/8 SoCs now also control the Pipe-clocks on their PCIe controllers and UFSHC controller on RK3576 got an additional reset line. Apart from that are of course individual board changes and fixes for older issues that are not specific to the current development cycle. * tag 'v7.1-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (44 commits) arm64: dts: rockchip: configure hdmirx in Rock 5 ITX arm64: dts: rockchip: assign pipe clock to rk356x PCIe lanes arm64: dts: rockchip: Add mphy reset to ufshc node arm64: dts: rockchip: Enable OTP controller for RK3528 arm64: dts: rockchip: Enable OTP controller for RK356x arm64: dts: rockchip: Enable OTP controller for RK3562 arm64: dts: rockchip: Enable PCIe CLKREQ# for RK3588 on Rock 5b-5bp-5t series arm64: dts: rockchip: add SD/eMMC aliases for ArmSom Sige5 arm64: dts: rockchip: Add SPDIF nodes to RK3576 device tree arm64: dts: rockchip: Add Khadas Edge 2L board dt-bindings: arm: rockchip: Add Khadas Edge 2L board arm64: dts: rockchip: Fix RK3562 EVB2 model name arm64: dts: rockchip: Correct Joystick Axes on Gameforce Ace arm64: dts: rockchip: Correct Fan Supply for Gameforce Ace Revert "arm64: dts: rockchip: add SPDIF audio to Beelink A1" arm64: dts: rockchip: Fix Bluetooth stability on LCKFB TaiShan Pi arm64: dts: rockchip: enable vicap dvp on wolfvision pf5 io expander arm64: dts: rockchip: Add analog audio switches to RK3576 EVB1 arm64: dts: rockchip: Enable GPU on rk3566-pinenote arm64: dts: rockchip: Make Jaguar PCIe-refclk pin use pull-up config ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 44b5179 + 6cb4ec6 commit 13c4068

15 files changed

Lines changed: 303 additions & 42 deletions

‎Documentation/devicetree/bindings/arm/rockchip.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,11 @@ properties:
754754
- const: khadas,edge2
755755
- const: rockchip,rk3588s
756756

757+
- description: Khadas Edge-2L series boards
758+
items:
759+
- const: khadas,edge-2l
760+
- const: rockchip,rk3576
761+
757762
- description: Kobol Helios64
758763
items:
759764
- const: kobol,helios64

‎arch/arm64/boot/dts/rockchip/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-armsom-sige5-v1.2-wifibt.dtbo
170170
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10.dtb
171171
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb1-v10-pcie1.dtbo
172172
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-evb2-v10.dtb
173+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-khadas-edge-2l.dtb
173174
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-luckfox-omni3576.dtb
174175
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-m5.dtb
175176
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3576-nanopi-r76s.dtb

‎arch/arm64/boot/dts/rockchip/rk3328-a1.dts‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,6 @@
5858
gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
5959
linux,rc-map-name = "rc-beelink-gs1";
6060
};
61-
62-
spdif_dit: spdif-dit {
63-
compatible = "linux,spdif-dit";
64-
#sound-dai-cells = <0>;
65-
};
66-
67-
spdif_sound: spdif-sound {
68-
compatible = "simple-audio-card";
69-
simple-audio-card,name = "SPDIF";
70-
71-
simple-audio-card,cpu {
72-
sound-dai = <&spdif>;
73-
};
74-
75-
simple-audio-card,codec {
76-
sound-dai = <&spdif_dit>;
77-
};
78-
};
7961
};
8062

8163
&analog_sound {
@@ -343,11 +325,6 @@
343325
status = "okay";
344326
};
345327

346-
&spdif {
347-
pinctrl-0 = <&spdifm0_tx>;
348-
status = "okay";
349-
};
350-
351328
&tsadc {
352329
rockchip,hw-tshut-mode = <0>;
353330
rockchip,hw-tshut-polarity = <0>;

‎arch/arm64/boot/dts/rockchip/rk3528.dtsi‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,53 @@
11901190
status = "disabled";
11911191
};
11921192

1193+
otp: efuse@ffce0000 {
1194+
compatible = "rockchip,rk3528-otp";
1195+
reg = <0x0 0xffce0000 0x0 0x4000>;
1196+
clocks = <&cru CLK_USER_OTPC_NS>, <&cru PCLK_OTPC_NS>,
1197+
<&cru CLK_SBPI_OTPC_NS>;
1198+
clock-names = "otp", "apb_pclk", "sbpi";
1199+
resets = <&cru SRST_USER_OTPC_NS>, <&cru SRST_P_OTPC_NS>,
1200+
<&cru SRST_SBPI_OTPC_NS>;
1201+
reset-names = "otp", "apb", "sbpi";
1202+
1203+
nvmem-layout {
1204+
compatible = "fixed-layout";
1205+
#address-cells = <1>;
1206+
#size-cells = <1>;
1207+
1208+
cpu_code: cpu-code@2 {
1209+
reg = <0x02 0x2>;
1210+
};
1211+
1212+
otp_cpu_version: cpu-version@8 {
1213+
reg = <0x08 0x1>;
1214+
bits = <3 3>;
1215+
};
1216+
1217+
otp_id: id@a {
1218+
reg = <0x0a 0x10>;
1219+
};
1220+
1221+
cpu_leakage: cpu-leakage@1a {
1222+
reg = <0x1a 0x1>;
1223+
};
1224+
1225+
logic_leakage: logic-leakage@1b {
1226+
reg = <0x1b 0x1>;
1227+
};
1228+
1229+
gpu_leakage: gpu-leakage@1c {
1230+
reg = <0x1c 0x1>;
1231+
};
1232+
1233+
tsadc_trim: tsadc-trim@44 {
1234+
reg = <0x44 0x2>;
1235+
bits = <0 10>;
1236+
};
1237+
};
1238+
};
1239+
11931240
dmac: dma-controller@ffd60000 {
11941241
compatible = "arm,pl330", "arm,primecell";
11951242
reg = <0x0 0xffd60000 0x0 0x4000>;

‎arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "rk3562.dtsi"
1414

1515
/ {
16-
model = "Rockchip RK3562 EVB V20 Board";
16+
model = "Rockchip RK3562 EVB2 V10 Board";
1717
compatible = "rockchip,rk3562-evb2-v10", "rockchip,rk3562";
1818

1919
chosen: chosen {

‎arch/arm64/boot/dts/rockchip/rk3562.dtsi‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,52 @@
10931093
status = "disabled";
10941094
};
10951095

1096+
otp: efuse@ff930000 {
1097+
compatible = "rockchip,rk3562-otp";
1098+
reg = <0x0 0xff930000 0x0 0x4000>;
1099+
clocks = <&cru CLK_USER_OTPC_NS>, <&cru PCLK_OTPC_NS>,
1100+
<&cru PCLK_OTPPHY>, <&cru CLK_SBPI_OTPC_NS>;
1101+
clock-names = "otp", "apb_pclk", "phy", "sbpi";
1102+
resets = <&cru SRST_USER_OTPC_NS>, <&cru SRST_P_OTPC_NS>,
1103+
<&cru SRST_P_OTPPHY>, <&cru SRST_SBPI_OTPC_NS>;
1104+
reset-names = "otp", "apb", "phy", "sbpi";
1105+
1106+
nvmem-layout {
1107+
compatible = "fixed-layout";
1108+
#address-cells = <1>;
1109+
#size-cells = <1>;
1110+
1111+
cpu_code: cpu-code@2 {
1112+
reg = <0x02 0x2>;
1113+
};
1114+
1115+
otp_cpu_version: cpu-version@8 {
1116+
reg = <0x08 0x1>;
1117+
bits = <3 3>;
1118+
};
1119+
1120+
otp_id: id@a {
1121+
reg = <0x0a 0x10>;
1122+
};
1123+
1124+
cpu_leakage: cpu-leakage@1a {
1125+
reg = <0x1a 0x1>;
1126+
};
1127+
1128+
log_leakage: log-leakage@1b {
1129+
reg = <0x1b 0x1>;
1130+
};
1131+
1132+
npu_leakage: npu-leakage@1c {
1133+
reg = <0x1c 0x1>;
1134+
};
1135+
1136+
gpu_leakage: gpu-leakage@1d {
1137+
reg = <0x1d 0x1>;
1138+
};
1139+
};
1140+
};
1141+
10961142
dmac: dma-controller@ff990000 {
10971143
compatible = "arm,pl330", "arm,primecell";
10981144
reg = <0x0 0xff990000 0x0 0x4000>;

‎arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,10 @@
635635
status = "okay";
636636

637637
bluetooth: bluetooth {
638-
compatible = "brcm,bcm43438-bt";
638+
compatible = "brcm,bcm43430a1-bt";
639639
clocks = <&rk809 1>;
640640
clock-names = "lpo";
641-
max-speed = <3000000>;
641+
max-speed = <1500000>;
642642
pinctrl-names = "default";
643643
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
644644
shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;

‎arch/arm64/boot/dts/rockchip/rk3568.dtsi‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,11 @@
155155
bus-range = <0x10 0x1f>;
156156
clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>,
157157
<&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>,
158-
<&cru CLK_PCIE30X1_AUX_NDFT>;
158+
<&cru CLK_PCIE30X1_AUX_NDFT>,
159+
<&cru CLK_PCIE30X1_PIPE_DFT>;
159160
clock-names = "aclk_mst", "aclk_slv",
160-
"aclk_dbi", "pclk", "aux";
161+
"aclk_dbi", "pclk", "aux",
162+
"pipe";
161163
device_type = "pci";
162164
interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
163165
<GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>,
@@ -208,9 +210,11 @@
208210
bus-range = <0x20 0x2f>;
209211
clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>,
210212
<&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>,
211-
<&cru CLK_PCIE30X2_AUX_NDFT>;
213+
<&cru CLK_PCIE30X2_AUX_NDFT>,
214+
<&cru CLK_PCIE30X2_PIPE_DFT>;
212215
clock-names = "aclk_mst", "aclk_slv",
213-
"aclk_dbi", "pclk", "aux";
216+
"aclk_dbi", "pclk", "aux",
217+
"pipe";
214218
device_type = "pci";
215219
interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>,
216220
<GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/rockchip/rk356x-base.dtsi‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,9 +1020,11 @@
10201020
bus-range = <0x0 0xf>;
10211021
clocks = <&cru ACLK_PCIE20_MST>, <&cru ACLK_PCIE20_SLV>,
10221022
<&cru ACLK_PCIE20_DBI>, <&cru PCLK_PCIE20>,
1023-
<&cru CLK_PCIE20_AUX_NDFT>;
1023+
<&cru CLK_PCIE20_AUX_NDFT>,
1024+
<&cru CLK_PCIE20_PIPE_DFT>;
10241025
clock-names = "aclk_mst", "aclk_slv",
1025-
"aclk_dbi", "pclk", "aux";
1026+
"aclk_dbi", "pclk", "aux",
1027+
"pipe";
10261028
device_type = "pci";
10271029
#interrupt-cells = <1>;
10281030
interrupt-map-mask = <0 0 0 7>;
@@ -1123,6 +1125,52 @@
11231125
status = "disabled";
11241126
};
11251127

1128+
otp: efuse@fe38c000 {
1129+
compatible = "rockchip,rk3568-otp";
1130+
reg = <0x0 0xfe38c000 0x0 0x4000>;
1131+
clocks = <&cru CLK_OTPC_NS_USR>, <&cru PCLK_OTPC_NS>,
1132+
<&cru PCLK_OTPPHY>, <&cru CLK_OTPC_NS_SBPI>;
1133+
clock-names = "otp", "apb_pclk", "phy", "sbpi";
1134+
resets = <&cru SRST_OTPC_NS_USR>, <&cru SRST_P_OTPC_NS>,
1135+
<&cru SRST_OTPPHY>, <&cru SRST_OTPC_NS_SBPI>;
1136+
reset-names = "otp", "apb", "phy", "sbpi";
1137+
1138+
nvmem-layout {
1139+
compatible = "fixed-layout";
1140+
#address-cells = <1>;
1141+
#size-cells = <1>;
1142+
1143+
cpu_code: cpu-code@2 {
1144+
reg = <0x02 0x2>;
1145+
};
1146+
1147+
otp_cpu_version: cpu-version@8 {
1148+
reg = <0x08 0x1>;
1149+
bits = <3 3>;
1150+
};
1151+
1152+
otp_id: id@a {
1153+
reg = <0x0a 0x10>;
1154+
};
1155+
1156+
cpu_leakage: cpu-leakage@1a {
1157+
reg = <0x1a 0x1>;
1158+
};
1159+
1160+
log_leakage: log-leakage@1b {
1161+
reg = <0x1b 0x1>;
1162+
};
1163+
1164+
npu_leakage: npu-leakage@1c {
1165+
reg = <0x1c 0x1>;
1166+
};
1167+
1168+
gpu_leakage: gpu-leakage@1d {
1169+
reg = <0x1d 0x1>;
1170+
};
1171+
};
1172+
};
1173+
11261174
i2s0_8ch: i2s@fe400000 {
11271175
compatible = "rockchip,rk3568-i2s-tdm";
11281176
reg = <0x0 0xfe400000 0x0 0x1000>;

‎arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
aliases {
2222
ethernet0 = &gmac0;
2323
ethernet1 = &gmac1;
24+
mmc0 = &sdhci;
25+
mmc1 = &sdmmc;
2426
};
2527

2628
chosen {

0 commit comments

Comments
 (0)