mirror of
https://github.com/Fishwaldo/build.git
synced 2025-04-13 17:41:26 +00:00
118 lines
3.6 KiB
Diff
118 lines
3.6 KiB
Diff
RockPI 4B has AP6256 Wifi/BT, so enable them in 4B dts
|
|
instead of enable in common dtsi.
|
|
|
|
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
|
---
|
|
Changes for v3:
|
|
- none
|
|
Changes for v2:
|
|
- update commit message
|
|
- add radxa,rockpi4b
|
|
|
|
arch/arm64/boot/dts/rockchip/Makefile | 1 +
|
|
.../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 23 ----------
|
|
.../boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++
|
|
3 files changed, 43 insertions(+), 23 deletions(-)
|
|
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
|
index 42f9e1861461..8832d05c2571 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
|
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
|
@@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
|
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
|
index e163f438f836..678a336010bf 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
|
@@ -584,17 +584,6 @@ &sdio0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
|
sd-uhs-sdr104;
|
|
- status = "okay";
|
|
-
|
|
- brcmf: wifi@1 {
|
|
- compatible = "brcm,bcm4329-fmac";
|
|
- reg = <1>;
|
|
- interrupt-parent = <&gpio0>;
|
|
- interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
|
|
- interrupt-names = "host-wake";
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&wifi_host_wake_l>;
|
|
- };
|
|
};
|
|
|
|
&sdmmc {
|
|
@@ -663,18 +652,6 @@ u2phy1_host: host-port {
|
|
&uart0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
|
|
- status = "okay";
|
|
-
|
|
- bluetooth {
|
|
- compatible = "brcm,bcm43438-bt";
|
|
- clocks = <&rk808 1>;
|
|
- clock-names = "ext_clock";
|
|
- device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
|
|
- host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
|
|
- shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
|
- };
|
|
};
|
|
|
|
&uart2 {
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
|
|
new file mode 100644
|
|
index 000000000000..f0055ce2fda0
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts
|
|
@@ -0,0 +1,42 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+/*
|
|
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
|
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+#include "rk3399-rock-pi-4.dtsi"
|
|
+
|
|
+/ {
|
|
+ model = "Radxa ROCK Pi 4B";
|
|
+ compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399";
|
|
+};
|
|
+
|
|
+&sdio0 {
|
|
+ status = "okay";
|
|
+
|
|
+ brcmf: wifi@1 {
|
|
+ compatible = "brcm,bcm4329-fmac";
|
|
+ reg = <1>;
|
|
+ interrupt-parent = <&gpio0>;
|
|
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
|
|
+ interrupt-names = "host-wake";
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&wifi_host_wake_l>;
|
|
+ };
|
|
+};
|
|
+
|
|
+&uart0 {
|
|
+ status = "okay";
|
|
+
|
|
+ bluetooth {
|
|
+ compatible = "brcm,bcm43438-bt";
|
|
+ clocks = <&rk808 1>;
|
|
+ clock-names = "ext_clock";
|
|
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
|
|
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
|
|
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
|
+ };
|
|
+};
|