Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit ad82829

Browse files
arndbarndb
committed
Merge tag 'v6.11-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
These are two additional boards, the Xunlong Orange Pi 3B and the Add Radxa ROCK 3B. * tag 'v6.11-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Add Xunlong Orange Pi 3B dt-bindings: arm: rockchip: Add Xunlong Orange Pi 3B arm64: dts: rockchip: Add Radxa ROCK 3B dt-bindings: arm: rockchip: Add Radxa ROCK 3B Link: https://lore.kernel.org/r/2191200.GUh0CODmnK@diego Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6cf4e8f + d79d713 commit ad82829

File tree

6 files changed

+1574
-0
lines changed

6 files changed

+1574
-0
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,11 @@ properties:
811811
- const: radxa,rock3a
812812
- const: rockchip,rk3568
813813

814+
- description: Radxa ROCK 3B
815+
items:
816+
- const: radxa,rock-3b
817+
- const: rockchip,rk3568
818+
814819
- description: Radxa ROCK 3C
815820
items:
816821
- const: radxa,rock-3c
@@ -988,6 +993,14 @@ properties:
988993
- const: wolfvision,rk3568-pf5
989994
- const: rockchip,rk3568
990995

996+
- description: Xunlong Orange Pi 3B
997+
items:
998+
- enum:
999+
- xunlong,orangepi-3b-v1.1
1000+
- xunlong,orangepi-3b-v2.1
1001+
- const: xunlong,orangepi-3b
1002+
- const: rockchip,rk3566
1003+
9911004
- description: Xunlong Orange Pi 5 Plus
9921005
items:
9931006
- const: xunlong,orangepi-5-plus

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353ps.dtb
8181
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353v.dtb
8282
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg353vs.dtb
8383
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-anbernic-rg503.dtb
84+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v1.1.dtb
85+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-orangepi-3b-v2.1.dtb
8486
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.1.dtb
8587
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinenote-v1.2.dtb
8688
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-pinetab2-v0.1.dtb
@@ -114,6 +116,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-qnap-ts433.dtb
114116
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-radxa-e25.dtb
115117
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-roc-pc.dtb
116118
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3a.dtb
119+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-3b.dtb
117120
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5.dtb
118121
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-wolfvision-pf5-io-expander.dtbo
119122
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-armsom-sige7.dtb

‎arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v1.1.dts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
/dts-v1/;
4+
5+
#include "rk3566-orangepi-3b.dtsi"
6+
7+
/ {
8+
model = "Xunlong Orange Pi 3B v1.1";
9+
compatible = "xunlong,orangepi-3b-v1.1", "xunlong,orangepi-3b", "rockchip,rk3566";
10+
};
11+
12+
&pmu_io_domains {
13+
vccio5-supply = <&vcc_3v3>;
14+
};
15+
16+
&gmac1 {
17+
phy-handle = <&rgmii_phy1>;
18+
status = "okay";
19+
};
20+
21+
&mdio1 {
22+
rgmii_phy1: ethernet-phy@1 {
23+
compatible = "ethernet-phy-ieee802.3-c22";
24+
reg = <1>;
25+
reset-assert-us = <20000>;
26+
reset-deassert-us = <50000>;
27+
reset-gpios = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
28+
};
29+
};

‎arch/arm64/boot/dts/rockchip/rk3566-orangepi-3b-v2.1.dts

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
/dts-v1/;
4+
5+
#include "rk3566-orangepi-3b.dtsi"
6+
7+
/ {
8+
model = "Xunlong Orange Pi 3B v2.1";
9+
compatible = "xunlong,orangepi-3b-v2.1", "xunlong,orangepi-3b", "rockchip,rk3566";
10+
11+
vccio_phy1: regulator-1v8-vccio-phy {
12+
compatible = "regulator-fixed";
13+
regulator-name = "vccio_phy1";
14+
regulator-always-on;
15+
regulator-boot-on;
16+
regulator-max-microvolt = <1800000>;
17+
regulator-min-microvolt = <1800000>;
18+
};
19+
};
20+
21+
&pmu_io_domains {
22+
vccio5-supply = <&vccio_phy1>;
23+
};
24+
25+
&gmac1 {
26+
phy-handle = <&rgmii_phy1>;
27+
status = "okay";
28+
};
29+
30+
&mdio1 {
31+
rgmii_phy1: ethernet-phy@1 {
32+
compatible = "ethernet-phy-ieee802.3-c22";
33+
reg = <1>;
34+
reset-assert-us = <20000>;
35+
reset-deassert-us = <50000>;
36+
reset-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
37+
};
38+
};
39+
40+
&sdmmc1 {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
44+
brcmf: wifi@1 {
45+
compatible = "brcm,bcm43456-fmac", "brcm,bcm4329-fmac";
46+
reg = <1>;
47+
interrupt-parent = <&gpio0>;
48+
interrupts = <RK_PD6 IRQ_TYPE_LEVEL_HIGH>;
49+
interrupt-names = "host-wake";
50+
pinctrl-names = "default";
51+
pinctrl-0 = <&wifi_wake_host_h>;
52+
};
53+
};
54+
55+
&uart1 {
56+
bluetooth {
57+
compatible = "brcm,bcm4345c5";
58+
clocks = <&rk809 1>;
59+
clock-names = "lpo";
60+
interrupt-parent = <&gpio2>;
61+
interrupts = <RK_PC0 IRQ_TYPE_LEVEL_HIGH>;
62+
interrupt-names = "host-wakeup";
63+
device-wakeup-gpios = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
64+
shutdown-gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
65+
pinctrl-names = "default";
66+
pinctrl-0 = <&bt_reg_on_h &bt_wake_host_h &host_wake_bt_h>;
67+
vbat-supply = <&vcc_3v3>;
68+
vddio-supply = <&vcc_1v8>;
69+
};
70+
};

0 commit comments

Comments
 (0)