Skip to content

Commit b89c940

Browse files
arndbarndb
committed
Merge tag 'v6.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New boards are the NanoPC T6, Firefly Station P2, Radxa Rock 4SE. Many new peripherals for the still only basic supported rk3588 soc (PCIe2, PCIe3, USB2, SATA, Combo-Phys). Improvements to the Rock-5a development board based on this soc (saradc, i2c on dsi and csi, fan, eeprom, analog audio, leds, sd-card, some regulators, pmic). Improvements for the edgeble-neu6b (rs485, rs232, pwm-fan, rtc, sata, sata, sd-card, pmic) RK3399 got the PCIe endpoint node when used as a PCIe-client. And some minor changes for some boards: spi-flash for RockPi 4, SATA and fixed PCIe regulators for Radxa E25 and using enable-gpios on engicam and gru boards. * tag 'v6.6-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (46 commits) arm64: dts: rockchip: Add NanoPC T6 PCIe Ethernet support arm64: dts: rockchip: add rk3588 PCIe2 support arm64: dts: rockchip: Enable internal SPI flash for ROCK Pi 4A/B/C arm64: dts: rockchip: Add NanoPC T6 dt-bindings: arm: rockchip: Add NanoPC T6 arm64: dts: rockchip: Enable SATA on Radxa E25 arm64: dts: rockchip: Fix PCIe regulators on Radxa E25 arm64: dts: rockchip: switch px30-engicam to enable-gpios arm64: dts: rockchip: switch rk3399-gru boards to enable-gpios arm64: dts: rockchip: add PCIe3 support for rk3588 arm64: dts: rockchip: fix/update sdmmc properties for rock-5a and -5b arm64: dts: rockchip: add USB2 to rk3588s-rock5a arm64: dts: rockchip: add USB2 to rk3588-rock5b arm64: dts: rockchip: add USB2 to rk3588-evb1 arm64: dts: rockchip: add USB2 support for rk3588 arm64: dts: rockchip: Enable RS485 for edgeble-neu6b arm64: dts: rockchip: Enable RS232 for edgeble-neu6b arm64: dts: rockchip: Enable PWM FAN for edgeble-neu6b arm64: dts: rockchip: Enable RTC for edgeble-neu6b arm64: dts: rockchip: Enable SATA for edgeble-neu6b ... Link: https://lore.kernel.org/r/7414564.rnE6jSC6OK@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents aa2951a + a721e28 commit b89c940

26 files changed

Lines changed: 3436 additions & 30 deletions

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ properties:
196196
- const: firefly,rk3566-roc-pc
197197
- const: rockchip,rk3566
198198

199+
- description: Firefly Station P2
200+
items:
201+
- const: firefly,rk3568-roc-pc
202+
- const: rockchip,rk3568
203+
199204
- description: FriendlyElec NanoPi R2 series boards
200205
items:
201206
- enum:
@@ -222,6 +227,11 @@ properties:
222227
- friendlyarm,nanopi-r5s
223228
- const: rockchip,rk3568
224229

230+
- description: FriendlyElec NanoPC T6
231+
items:
232+
- const: friendlyarm,nanopc-t6
233+
- const: rockchip,rk3588
234+
225235
- description: GeekBuying GeekBox
226236
items:
227237
- const: geekbuying,geekbox
@@ -694,6 +704,11 @@ properties:
694704
- const: radxa,rock-4c-plus
695705
- const: rockchip,rk3399
696706

707+
- description: Radxa ROCK 4SE
708+
items:
709+
- const: radxa,rock-4se
710+
- const: rockchip,rk3399
711+
697712
- description: Radxa ROCK Pi E
698713
items:
699714
- const: radxa,rockpi-e

‎Documentation/devicetree/bindings/eeprom/at24.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ properties:
101101
pattern: spd$
102102
# These are special cases that don't conform to the above pattern.
103103
# Each requires a standard at24 model as fallback.
104+
- items:
105+
- const: belling,bl24c16a
106+
- const: atmel,24c16
104107
- items:
105108
- enum:
106109
- rohm,br24g01

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ patternProperties:
190190
description: Compass Electronics Group, LLC
191191
"^beagle,.*":
192192
description: BeagleBoard.org Foundation
193+
"^belling,.*":
194+
description: Shanghai Belling Co., Ltd.
193195
"^bhf,.*":
194196
description: Beckhoff Automation GmbH & Co. KG
195197
"^bitmain,.*":

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
5858
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
5959
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
6060
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4c-plus.dtb
61+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-4se.dtb
6162
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
6263
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb
6364
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
@@ -94,10 +95,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5c.dtb
9495
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
9596
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-odroid-m1.dtb
9697
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
98+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.dtb
9799
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
98100
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-io.dtb
99101
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6b-io.dtb
100102
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb1-v10.dtb
103+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-nanopc-t6.dtb
101104
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
102105
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-indiedroid-nova.dtb
103106
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-khadas-edge2.dtb

‎arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
};
2727

2828
&vcc3v3_btreg {
29-
enable-gpio = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;
29+
enable-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;
3030
};

‎arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
};
4040

4141
&vcc3v3_btreg {
42-
enable-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
42+
enable-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
4343
};

‎arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
pinctrl-0 = <&sd_io_pwr_en &sd_pwr_1800_sel>;
251251

252252
enable-active-high;
253-
enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>;
253+
enable-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
254254
gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
255255
states = <1800000 0x1>,
256256
<3000000 0x0>;

‎arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
4+
* Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
5+
*/
6+
7+
/dts-v1/;
8+
#include "rk3399-rock-pi-4.dtsi"
9+
#include "rk3399-t-opp.dtsi"
10+
11+
/ {
12+
model = "Radxa ROCK 4SE";
13+
compatible = "radxa,rock-4se", "rockchip,rk3399";
14+
15+
aliases {
16+
mmc2 = &sdio0;
17+
};
18+
};
19+
20+
&pinctrl {
21+
usb2 {
22+
vcc5v0_host_en: vcc5v0-host-en {
23+
rockchip,pins = <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
24+
};
25+
};
26+
};
27+
28+
&sdio0 {
29+
status = "okay";
30+
31+
brcmf: wifi@1 {
32+
compatible = "brcm,bcm4329-fmac";
33+
reg = <1>;
34+
interrupt-parent = <&gpio0>;
35+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
36+
interrupt-names = "host-wake";
37+
pinctrl-names = "default";
38+
pinctrl-0 = <&wifi_host_wake_l>;
39+
};
40+
};
41+
42+
&uart0 {
43+
status = "okay";
44+
45+
bluetooth {
46+
compatible = "brcm,bcm4345c5";
47+
clocks = <&rk808 1>;
48+
clock-names = "lpo";
49+
device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
50+
host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
51+
shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
52+
max-speed = <1500000>;
53+
pinctrl-names = "default";
54+
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
55+
vbat-supply = <&vcc3v3_sys>;
56+
vddio-supply = <&vcc_1v8>;
57+
};
58+
};
59+
60+
&vcc5v0_host {
61+
enable-active-high;
62+
gpio = <&gpio4 RK_PD1 GPIO_ACTIVE_HIGH>;
63+
pinctrl-names = "default";
64+
pinctrl-0 = <&vcc5v0_host_en>;
65+
};

‎arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <dt-bindings/leds/common.h>
1010
#include <dt-bindings/pwm/pwm.h>
1111
#include "rk3399.dtsi"
12-
#include "rk3399-opp.dtsi"
1312

1413
/ {
1514
aliases {

‎arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@
66

77
/dts-v1/;
88
#include "rk3399-rock-pi-4.dtsi"
9+
#include "rk3399-opp.dtsi"
910

1011
/ {
1112
model = "Radxa ROCK Pi 4A";
1213
compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399";
1314
};
15+
16+
&spi1 {
17+
status = "okay";
18+
19+
flash@0 {
20+
compatible = "jedec,spi-nor";
21+
reg = <0>;
22+
spi-max-frequency = <10000000>;
23+
};
24+
};

0 commit comments

Comments
 (0)