* [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5
@ 2023-04-08 9:11 FUKAUMI Naoki
2023-04-08 9:11 ` [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants FUKAUMI Naoki
2023-04-13 2:18 ` [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 Kever Yang
0 siblings, 2 replies; 6+ messages in thread
From: FUKAUMI Naoki @ 2023-04-08 9:11 UTC (permalink / raw)
To: u-boot; +Cc: sjg, philipp.tomsich, kever.yang, FUKAUMI Naoki
sync *.dts{,i} files for Radxa ROCK Pi 4 series with Linux 6.3-rc5.
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
arch/arm/dts/Makefile | 2 +
arch/arm/dts/rk3399-rock-pi-4.dtsi | 229 ++++++++++++------
.../dts/rk3399-rock-pi-4a-plus-u-boot.dtsi | 5 +
arch/arm/dts/rk3399-rock-pi-4a-plus.dts | 25 ++
arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi | 6 +
.../dts/rk3399-rock-pi-4b-plus-u-boot.dtsi | 5 +
arch/arm/dts/rk3399-rock-pi-4b-plus.dts | 61 +++++
arch/arm/dts/rk3399-rock-pi-4b.dts | 9 +-
arch/arm/dts/rk3399-rock-pi-4c.dts | 20 +-
9 files changed, 284 insertions(+), 78 deletions(-)
create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-plus.dts
create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-plus.dts
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index c160e884bf..8a5eb6225c 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -157,7 +157,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-puma-haikou.dtb \
rk3399-roc-pc.dtb \
rk3399-roc-pc-mezzanine.dtb \
+ rk3399-rock-pi-4a-plus.dtb \
rk3399-rock-pi-4a.dtb \
+ rk3399-rock-pi-4b-plus.dtb \
rk3399-rock-pi-4b.dtb \
rk3399-rock-pi-4c.dtb \
rk3399-rock960.dtb \
diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock-pi-4.dtsi
index b28888ea92..907071d4fe 100644
--- a/arch/arm/dts/rk3399-rock-pi-4.dtsi
+++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi
@@ -6,14 +6,15 @@
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
+#include <dt-bindings/leds/common.h>
#include <dt-bindings/pwm/pwm.h>
#include "rk3399.dtsi"
#include "rk3399-opp.dtsi"
/ {
aliases {
- mmc0 = &sdmmc;
- mmc1 = &sdhci;
+ mmc0 = &sdhci;
+ mmc1 = &sdmmc;
};
chosen {
@@ -27,6 +28,20 @@
#clock-cells = <0>;
};
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <&user_led2>;
+
+ /* USER_LED2 */
+ led-0 {
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_BLUE>;
+ gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ };
+ };
+
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk808 1>;
@@ -36,32 +51,56 @@
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
};
- vcc12v_dcin: dc-12v {
+ sound: sound {
+ compatible = "audio-graph-card";
+ label = "Analog";
+ dais = <&i2s0_p0>;
+ };
+
+ sound-dit {
+ compatible = "audio-graph-card";
+ label = "SPDIF";
+ dais = <&spdif_p0>;
+ };
+
+ spdif-dit {
+ compatible = "linux,spdif-dit";
+ #sound-dai-cells = <0>;
+
+ port {
+ dit_p0_0: endpoint {
+ remote-endpoint = <&spdif_p0_0>;
+ };
+ };
+ };
+
+ vbus_typec: vbus-typec-regulator {
compatible = "regulator-fixed";
- regulator-name = "vcc12v_dcin";
+ enable-active-high;
+ gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&vcc5v0_typec_en>;
+ regulator-name = "vbus_typec";
regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <12000000>;
- regulator-max-microvolt = <12000000>;
+ vin-supply = <&vcc5v0_sys>;
};
- vcc5v0_sys: vcc-sys {
+ vcc12v_dcin: dc-12v {
compatible = "regulator-fixed";
- regulator-name = "vcc5v0_sys";
+ regulator-name = "vcc12v_dcin";
regulator-always-on;
regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- vin-supply = <&vcc12v_dcin>;
+ regulator-min-microvolt = <12000000>;
+ regulator-max-microvolt = <12000000>;
};
- vcc_0v9: vcc-0v9 {
+ vcc3v3_lan: vcc3v3-lan-regulator {
compatible = "regulator-fixed";
- regulator-name = "vcc_0v9";
+ regulator-name = "vcc3v3_lan";
regulator-always-on;
regulator-boot-on;
- regulator-min-microvolt = <900000>;
- regulator-max-microvolt = <900000>;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
vin-supply = <&vcc3v3_sys>;
};
@@ -98,35 +137,35 @@
vin-supply = <&vcc5v0_sys>;
};
- vcc5v0_typec: vcc5v0-typec-regulator {
+ vcc5v0_sys: vcc-sys {
compatible = "regulator-fixed";
- enable-active-high;
- gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
- pinctrl-0 = <&vcc5v0_typec_en>;
- regulator-name = "vcc5v0_typec";
+ regulator-name = "vcc5v0_sys";
regulator-always-on;
- vin-supply = <&vcc5v0_sys>;
+ regulator-boot-on;
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ vin-supply = <&vcc12v_dcin>;
};
- vcc_lan: vcc3v3-phy-regulator {
+ vcc_0v9: vcc-0v9 {
compatible = "regulator-fixed";
- regulator-name = "vcc_lan";
+ regulator-name = "vcc_0v9";
regulator-always-on;
regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
+ regulator-min-microvolt = <900000>;
+ regulator-max-microvolt = <900000>;
+ vin-supply = <&vcc3v3_sys>;
};
vdd_log: vdd-log {
compatible = "pwm-regulator";
pwms = <&pwm2 0 25000 1>;
+ pwm-supply = <&vcc5v0_sys>;
regulator-name = "vdd_log";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
- vin-supply = <&vcc5v0_sys>;
};
};
@@ -162,7 +201,7 @@
assigned-clocks = <&cru SCLK_RMII_SRC>;
assigned-clock-parents = <&clkin_gmac>;
clock_in_out = "input";
- phy-supply = <&vcc_lan>;
+ phy-supply = <&vcc3v3_lan>;
phy-mode = "rgmii";
pinctrl-names = "default";
pinctrl-0 = <&rgmii_pins>;
@@ -180,6 +219,8 @@
};
&hdmi {
+ avdd-0v9-supply = <&vcca0v9_hdmi>;
+ avdd-1v8-supply = <&vcca1v8_hdmi>;
ddc-i2c-bus = <&i2c3>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_cec>;
@@ -267,8 +308,8 @@
};
};
- vcc1v8_codec: LDO_REG1 {
- regulator-name = "vcc1v8_codec";
+ vcca1v8_codec: LDO_REG1 {
+ regulator-name = "vcca1v8_codec";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
@@ -278,8 +319,8 @@
};
};
- vcc1v8_hdmi: LDO_REG2 {
- regulator-name = "vcc1v8_hdmi";
+ vcca1v8_hdmi: LDO_REG2 {
+ regulator-name = "vcca1v8_hdmi";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
@@ -336,8 +377,8 @@
};
};
- vcc0v9_hdmi: LDO_REG7 {
- regulator-name = "vcc0v9_hdmi";
+ vcca0v9_hdmi: LDO_REG7 {
+ regulator-name = "vcca0v9_hdmi";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <900000>;
@@ -422,6 +463,20 @@
i2c-scl-rising-time-ns = <300>;
i2c-scl-falling-time-ns = <15>;
status = "okay";
+
+ es8316: codec@11 {
+ compatible = "everest,es8316";
+ reg = <0x11>;
+ clocks = <&cru SCLK_I2S_8CH_OUT>;
+ clock-names = "mclk";
+ #sound-dai-cells = <0>;
+
+ port {
+ es8316_p0_0: endpoint {
+ remote-endpoint = <&i2s0_p0_0>;
+ };
+ };
+ };
};
&i2c3 {
@@ -441,12 +496,19 @@
rockchip,capture-channels = <2>;
rockchip,playback-channels = <2>;
status = "okay";
+
+ i2s0_p0: port {
+ i2s0_p0_0: endpoint {
+ dai-format = "i2s";
+ mclk-fs = <256>;
+ remote-endpoint = <&es8316_p0_0>;
+ };
+ };
};
&i2s1 {
rockchip,playback-channels = <2>;
rockchip,capture-channels = <2>;
- status = "okay";
};
&i2s2 {
@@ -454,21 +516,10 @@
};
&io_domains {
- status = "okay";
-
+ audio-supply = <&vcca1v8_codec>;
bt656-supply = <&vcc_3v0>;
- audio-supply = <&vcc_3v0>;
- sdmmc-supply = <&vcc_sdio>;
gpio1830-supply = <&vcc_3v0>;
-};
-
-&pmu_io_domains {
- status = "okay";
-
- pmu1830-supply = <&vcc_3v0>;
-};
-
-&pcie_phy {
+ sdmmc-supply = <&vcc_sdio>;
status = "okay";
};
@@ -483,6 +534,10 @@
status = "okay";
};
+&pcie_phy {
+ status = "okay";
+};
+
&pinctrl {
bt {
bt_enable_h: bt-enable-h {
@@ -498,26 +553,25 @@
};
};
- pcie {
- pcie_pwr_en: pcie-pwr-en {
- rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+ es8316 {
+ hp_detect: hp-detect {
+ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
- };
- sdio0 {
- sdio0_bus4: sdio0-bus4 {
- rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
- <2 RK_PC5 1 &pcfg_pull_up_20ma>,
- <2 RK_PC6 1 &pcfg_pull_up_20ma>,
- <2 RK_PC7 1 &pcfg_pull_up_20ma>;
+ hp_int: hp-int {
+ rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
};
+ };
- sdio0_cmd: sdio0-cmd {
- rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
+ leds {
+ user_led2: user-led2 {
+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
+ };
- sdio0_clk: sdio0-clk {
- rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
+ pcie {
+ pcie_pwr_en: pcie-pwr-en {
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
@@ -535,6 +589,23 @@
};
};
+ sdio0 {
+ sdio0_bus4: sdio0-bus4 {
+ rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
+ <2 RK_PC5 1 &pcfg_pull_up_20ma>,
+ <2 RK_PC6 1 &pcfg_pull_up_20ma>,
+ <2 RK_PC7 1 &pcfg_pull_up_20ma>;
+ };
+
+ sdio0_cmd: sdio0-cmd {
+ rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
+ };
+
+ sdio0_clk: sdio0-clk {
+ rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
+ };
+ };
+
usb-typec {
vcc5v0_typec_en: vcc5v0-typec-en {
rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -558,6 +629,11 @@
};
};
+&pmu_io_domains {
+ pmu1830-supply = <&vcc_3v0>;
+ status = "okay";
+};
+
&pwm2 {
status = "okay";
};
@@ -568,6 +644,14 @@
vref-supply = <&vcc_1v8>;
};
+&sdhci {
+ bus-width = <8>;
+ mmc-hs400-1_8v;
+ mmc-hs400-enhanced-strobe;
+ non-removable;
+ status = "okay";
+};
+
&sdio0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -595,12 +679,13 @@
status = "okay";
};
-&sdhci {
- bus-width = <8>;
- mmc-hs400-1_8v;
- mmc-hs400-enhanced-strobe;
- non-removable;
- status = "okay";
+&spdif {
+
+ spdif_p0: port {
+ spdif_p0_0: endpoint {
+ remote-endpoint = <&dit_p0_0>;
+ };
+ };
};
&tcphy0 {
@@ -675,13 +760,13 @@
status = "okay";
};
-&usbdrd_dwc3_0 {
+&usbdrd3_1 {
status = "okay";
- dr_mode = "host";
};
-&usbdrd3_1 {
+&usbdrd_dwc3_0 {
status = "okay";
+ dr_mode = "host";
};
&usbdrd_dwc3_1 {
diff --git a/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
new file mode 100644
index 0000000000..5c1c451b8f
--- /dev/null
+++ b/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Radxa Limited
+ */
+#include "rk3399-rock-pi-4-u-boot.dtsi"
diff --git a/arch/arm/dts/rk3399-rock-pi-4a-plus.dts b/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
new file mode 100644
index 0000000000..f5a68d8d07
--- /dev/null
+++ b/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
@@ -0,0 +1,25 @@
+// 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"
+#include "rk3399-op1-opp.dtsi"
+
+/ {
+ model = "Radxa ROCK Pi 4A+";
+ compatible = "radxa,rockpi4a-plus", "radxa,rockpi4", "rockchip,rk3399";
+};
+
+&es8316 {
+ pinctrl-0 = <&hp_detect &hp_int>;
+ pinctrl-names = "default";
+ interrupt-parent = <&gpio1>;
+ interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
+};
+
+&sound {
+ hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+};
diff --git a/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
new file mode 100644
index 0000000000..85ee5770ad
--- /dev/null
+++ b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#include "rk3399-rock-pi-4-u-boot.dtsi"
diff --git a/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
new file mode 100644
index 0000000000..5c1c451b8f
--- /dev/null
+++ b/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2023 Radxa Limited
+ */
+#include "rk3399-rock-pi-4-u-boot.dtsi"
diff --git a/arch/arm/dts/rk3399-rock-pi-4b-plus.dts b/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
new file mode 100644
index 0000000000..cec3b7b1b9
--- /dev/null
+++ b/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
@@ -0,0 +1,61 @@
+// 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"
+#include "rk3399-op1-opp.dtsi"
+
+/ {
+ model = "Radxa ROCK Pi 4B+";
+ compatible = "radxa,rockpi4b-plus", "radxa,rockpi4", "rockchip,rk3399";
+
+ aliases {
+ mmc2 = &sdio0;
+ };
+};
+
+&es8316 {
+ pinctrl-0 = <&hp_detect &hp_int>;
+ pinctrl-names = "default";
+ interrupt-parent = <&gpio1>;
+ interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
+};
+
+&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>;
+ };
+};
+
+&sound {
+ hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+};
+
+&uart0 {
+ status = "okay";
+
+ bluetooth {
+ compatible = "brcm,bcm4345c5";
+ clocks = <&rk808 1>;
+ clock-names = "lpo";
+ 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>;
+ max-speed = <1500000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ vbat-supply = <&vcc3v3_sys>;
+ vddio-supply = <&vcc_1v8>;
+ };
+};
diff --git a/arch/arm/dts/rk3399-rock-pi-4b.dts b/arch/arm/dts/rk3399-rock-pi-4b.dts
index 6c63e61706..0806545922 100644
--- a/arch/arm/dts/rk3399-rock-pi-4b.dts
+++ b/arch/arm/dts/rk3399-rock-pi-4b.dts
@@ -23,7 +23,7 @@
compatible = "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpio0>;
- interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+ interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
pinctrl-names = "default";
pinctrl-0 = <&wifi_host_wake_l>;
@@ -34,13 +34,16 @@
status = "okay";
bluetooth {
- compatible = "brcm,bcm43438-bt";
+ compatible = "brcm,bcm4345c5";
clocks = <&rk808 1>;
- clock-names = "ext_clock";
+ clock-names = "lpo";
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>;
+ max-speed = <1500000>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ vbat-supply = <&vcc3v3_sys>;
+ vddio-supply = <&vcc_1v8>;
};
};
diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts b/arch/arm/dts/rk3399-rock-pi-4c.dts
index 99169bcd51..4053ba7261 100644
--- a/arch/arm/dts/rk3399-rock-pi-4c.dts
+++ b/arch/arm/dts/rk3399-rock-pi-4c.dts
@@ -17,6 +17,13 @@
};
};
+&es8316 {
+ pinctrl-0 = <&hp_detect &hp_int>;
+ pinctrl-names = "default";
+ interrupt-parent = <&gpio1>;
+ interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
+};
+
&sdio0 {
status = "okay";
@@ -24,25 +31,32 @@
compatible = "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpio0>;
- interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+ interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
pinctrl-names = "default";
pinctrl-0 = <&wifi_host_wake_l>;
};
};
+&sound {
+ hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+};
+
&uart0 {
status = "okay";
bluetooth {
- compatible = "brcm,bcm43438-bt";
+ compatible = "brcm,bcm4345c5";
clocks = <&rk808 1>;
- clock-names = "ext_clock";
+ clock-names = "lpo";
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>;
+ max-speed = <1500000>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ vbat-supply = <&vcc3v3_sys>;
+ vddio-supply = <&vcc_1v8>;
};
};
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants
2023-04-08 9:11 [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 FUKAUMI Naoki
@ 2023-04-08 9:11 ` FUKAUMI Naoki
2023-04-13 2:22 ` Kever Yang
2023-04-13 2:18 ` [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 Kever Yang
1 sibling, 1 reply; 6+ messages in thread
From: FUKAUMI Naoki @ 2023-04-08 9:11 UTC (permalink / raw)
To: u-boot; +Cc: sjg, philipp.tomsich, kever.yang, FUKAUMI Naoki
compared to ROCK Pi 4B,
- ROCK Pi 4A: without Wi-Fi/BT
- ROCK Pi 4A+: with OP1, without Wi-Fi/BT
- ROCK Pi 4B+: with OP1
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
configs/rock-pi-4a-plus-rk3399_defconfig | 97 +++++++++++++++++++
configs/rock-pi-4a-rk3399_defconfig | 97 +++++++++++++++++++
configs/rock-pi-4b-plus-rk3399_defconfig | 97 +++++++++++++++++++
..._defconfig => rock-pi-4b-rk3399_defconfig} | 0
4 files changed, 291 insertions(+)
create mode 100644 configs/rock-pi-4a-plus-rk3399_defconfig
create mode 100644 configs/rock-pi-4a-rk3399_defconfig
create mode 100644 configs/rock-pi-4b-plus-rk3399_defconfig
rename configs/{rock-pi-4-rk3399_defconfig => rock-pi-4b-rk3399_defconfig} (100%)
diff --git a/configs/rock-pi-4a-plus-rk3399_defconfig b/configs/rock-pi-4a-plus-rk3399_defconfig
new file mode 100644
index 0000000000..daac538376
--- /dev/null
+++ b/configs/rock-pi-4a-plus-rk3399_defconfig
@@ -0,0 +1,97 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_TEXT_BASE=0x00200000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a-plus"
+CONFIG_DM_RESET=y
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_TARGET_EVB_RK3399=y
+CONFIG_SPL_STACK=0x400000
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a-plus.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_SPL_MAX_SIZE=0x2e000
+CONFIG_SPL_PAD_TO=0x7f8000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x400000
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_TPL=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NVEDIT_EFI=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_EFIDEBUG=y
+CONFIG_CMD_TIME=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DFU_MMC=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
+CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME_PCI=y
+CONFIG_PCI=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM_ROCKCHIP_LPDDR4=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
+CONFIG_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_EFI_CAPSULE_ON_DISK=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
diff --git a/configs/rock-pi-4a-rk3399_defconfig b/configs/rock-pi-4a-rk3399_defconfig
new file mode 100644
index 0000000000..fde1ee2eb5
--- /dev/null
+++ b/configs/rock-pi-4a-rk3399_defconfig
@@ -0,0 +1,97 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_TEXT_BASE=0x00200000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a"
+CONFIG_DM_RESET=y
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_TARGET_EVB_RK3399=y
+CONFIG_SPL_STACK=0x400000
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_SPL_MAX_SIZE=0x2e000
+CONFIG_SPL_PAD_TO=0x7f8000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x400000
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_TPL=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NVEDIT_EFI=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_EFIDEBUG=y
+CONFIG_CMD_TIME=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DFU_MMC=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
+CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME_PCI=y
+CONFIG_PCI=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM_ROCKCHIP_LPDDR4=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
+CONFIG_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_EFI_CAPSULE_ON_DISK=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
diff --git a/configs/rock-pi-4b-plus-rk3399_defconfig b/configs/rock-pi-4b-plus-rk3399_defconfig
new file mode 100644
index 0000000000..0f7d840199
--- /dev/null
+++ b/configs/rock-pi-4b-plus-rk3399_defconfig
@@ -0,0 +1,97 @@
+CONFIG_ARM=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_TEXT_BASE=0x00200000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
+CONFIG_ENV_OFFSET=0x3F8000
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b-plus"
+CONFIG_DM_RESET=y
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_TARGET_EVB_RK3399=y
+CONFIG_SPL_STACK=0x400000
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_SYS_LOAD_ADDR=0x800800
+CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b-plus.dtb"
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_MISC_INIT_R=y
+CONFIG_SPL_MAX_SIZE=0x2e000
+CONFIG_SPL_PAD_TO=0x7f8000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x400000
+CONFIG_SPL_BSS_MAX_SIZE=0x2000
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_TPL=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_NVEDIT_EFI=y
+CONFIG_CMD_DFU=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_EFIDEBUG=y
+CONFIG_CMD_TIME=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DFU_MMC=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
+CONFIG_ROCKCHIP_EFUSE=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME_PCI=y
+CONFIG_PCI=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM_ROCKCHIP_LPDDR4=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYS_NS16550_MEM32=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_KEYBOARD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
+CONFIG_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_ERRNO_STR=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_EFI_CAPSULE_ON_DISK=y
+CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4b-rk3399_defconfig
similarity index 100%
rename from configs/rock-pi-4-rk3399_defconfig
rename to configs/rock-pi-4b-rk3399_defconfig
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5
2023-04-08 9:11 [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 FUKAUMI Naoki
2023-04-08 9:11 ` [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants FUKAUMI Naoki
@ 2023-04-13 2:18 ` Kever Yang
2023-04-25 8:15 ` FUKAUMI Naoki
1 sibling, 1 reply; 6+ messages in thread
From: Kever Yang @ 2023-04-13 2:18 UTC (permalink / raw)
To: FUKAUMI Naoki, u-boot; +Cc: sjg, philipp.tomsich
On 2023/4/8 17:11, FUKAUMI Naoki wrote:
> sync *.dts{,i} files for Radxa ROCK Pi 4 series with Linux 6.3-rc5.
>
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/Makefile | 2 +
> arch/arm/dts/rk3399-rock-pi-4.dtsi | 229 ++++++++++++------
> .../dts/rk3399-rock-pi-4a-plus-u-boot.dtsi | 5 +
> arch/arm/dts/rk3399-rock-pi-4a-plus.dts | 25 ++
> arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi | 6 +
> .../dts/rk3399-rock-pi-4b-plus-u-boot.dtsi | 5 +
> arch/arm/dts/rk3399-rock-pi-4b-plus.dts | 61 +++++
> arch/arm/dts/rk3399-rock-pi-4b.dts | 9 +-
> arch/arm/dts/rk3399-rock-pi-4c.dts | 20 +-
> 9 files changed, 284 insertions(+), 78 deletions(-)
> create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-plus.dts
> create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-plus.dts
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index c160e884bf..8a5eb6225c 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -157,7 +157,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
> rk3399-puma-haikou.dtb \
> rk3399-roc-pc.dtb \
> rk3399-roc-pc-mezzanine.dtb \
> + rk3399-rock-pi-4a-plus.dtb \
> rk3399-rock-pi-4a.dtb \
> + rk3399-rock-pi-4b-plus.dtb \
> rk3399-rock-pi-4b.dtb \
> rk3399-rock-pi-4c.dtb \
> rk3399-rock960.dtb \
> diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock-pi-4.dtsi
> index b28888ea92..907071d4fe 100644
> --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi
> +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi
> @@ -6,14 +6,15 @@
>
> /dts-v1/;
> #include <dt-bindings/input/linux-event-codes.h>
> +#include <dt-bindings/leds/common.h>
> #include <dt-bindings/pwm/pwm.h>
> #include "rk3399.dtsi"
> #include "rk3399-opp.dtsi"
>
> / {
> aliases {
> - mmc0 = &sdmmc;
> - mmc1 = &sdhci;
> + mmc0 = &sdhci;
> + mmc1 = &sdmmc;
> };
>
> chosen {
> @@ -27,6 +28,20 @@
> #clock-cells = <0>;
> };
>
> + leds {
> + compatible = "gpio-leds";
> + pinctrl-names = "default";
> + pinctrl-0 = <&user_led2>;
> +
> + /* USER_LED2 */
> + led-0 {
> + function = LED_FUNCTION_STATUS;
> + color = <LED_COLOR_ID_BLUE>;
> + gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +
> sdio_pwrseq: sdio-pwrseq {
> compatible = "mmc-pwrseq-simple";
> clocks = <&rk808 1>;
> @@ -36,32 +51,56 @@
> reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
> };
>
> - vcc12v_dcin: dc-12v {
> + sound: sound {
> + compatible = "audio-graph-card";
> + label = "Analog";
> + dais = <&i2s0_p0>;
> + };
> +
> + sound-dit {
> + compatible = "audio-graph-card";
> + label = "SPDIF";
> + dais = <&spdif_p0>;
> + };
> +
> + spdif-dit {
> + compatible = "linux,spdif-dit";
> + #sound-dai-cells = <0>;
> +
> + port {
> + dit_p0_0: endpoint {
> + remote-endpoint = <&spdif_p0_0>;
> + };
> + };
> + };
> +
> + vbus_typec: vbus-typec-regulator {
> compatible = "regulator-fixed";
> - regulator-name = "vcc12v_dcin";
> + enable-active-high;
> + gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&vcc5v0_typec_en>;
> + regulator-name = "vbus_typec";
> regulator-always-on;
> - regulator-boot-on;
> - regulator-min-microvolt = <12000000>;
> - regulator-max-microvolt = <12000000>;
> + vin-supply = <&vcc5v0_sys>;
> };
>
> - vcc5v0_sys: vcc-sys {
> + vcc12v_dcin: dc-12v {
> compatible = "regulator-fixed";
> - regulator-name = "vcc5v0_sys";
> + regulator-name = "vcc12v_dcin";
> regulator-always-on;
> regulator-boot-on;
> - regulator-min-microvolt = <5000000>;
> - regulator-max-microvolt = <5000000>;
> - vin-supply = <&vcc12v_dcin>;
> + regulator-min-microvolt = <12000000>;
> + regulator-max-microvolt = <12000000>;
> };
>
> - vcc_0v9: vcc-0v9 {
> + vcc3v3_lan: vcc3v3-lan-regulator {
> compatible = "regulator-fixed";
> - regulator-name = "vcc_0v9";
> + regulator-name = "vcc3v3_lan";
> regulator-always-on;
> regulator-boot-on;
> - regulator-min-microvolt = <900000>;
> - regulator-max-microvolt = <900000>;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> vin-supply = <&vcc3v3_sys>;
> };
>
> @@ -98,35 +137,35 @@
> vin-supply = <&vcc5v0_sys>;
> };
>
> - vcc5v0_typec: vcc5v0-typec-regulator {
> + vcc5v0_sys: vcc-sys {
> compatible = "regulator-fixed";
> - enable-active-high;
> - gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
> - pinctrl-names = "default";
> - pinctrl-0 = <&vcc5v0_typec_en>;
> - regulator-name = "vcc5v0_typec";
> + regulator-name = "vcc5v0_sys";
> regulator-always-on;
> - vin-supply = <&vcc5v0_sys>;
> + regulator-boot-on;
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + vin-supply = <&vcc12v_dcin>;
> };
>
> - vcc_lan: vcc3v3-phy-regulator {
> + vcc_0v9: vcc-0v9 {
> compatible = "regulator-fixed";
> - regulator-name = "vcc_lan";
> + regulator-name = "vcc_0v9";
> regulator-always-on;
> regulator-boot-on;
> - regulator-min-microvolt = <3300000>;
> - regulator-max-microvolt = <3300000>;
> + regulator-min-microvolt = <900000>;
> + regulator-max-microvolt = <900000>;
> + vin-supply = <&vcc3v3_sys>;
> };
>
> vdd_log: vdd-log {
> compatible = "pwm-regulator";
> pwms = <&pwm2 0 25000 1>;
> + pwm-supply = <&vcc5v0_sys>;
> regulator-name = "vdd_log";
> regulator-always-on;
> regulator-boot-on;
> regulator-min-microvolt = <800000>;
> regulator-max-microvolt = <1400000>;
> - vin-supply = <&vcc5v0_sys>;
> };
> };
>
> @@ -162,7 +201,7 @@
> assigned-clocks = <&cru SCLK_RMII_SRC>;
> assigned-clock-parents = <&clkin_gmac>;
> clock_in_out = "input";
> - phy-supply = <&vcc_lan>;
> + phy-supply = <&vcc3v3_lan>;
> phy-mode = "rgmii";
> pinctrl-names = "default";
> pinctrl-0 = <&rgmii_pins>;
> @@ -180,6 +219,8 @@
> };
>
> &hdmi {
> + avdd-0v9-supply = <&vcca0v9_hdmi>;
> + avdd-1v8-supply = <&vcca1v8_hdmi>;
> ddc-i2c-bus = <&i2c3>;
> pinctrl-names = "default";
> pinctrl-0 = <&hdmi_cec>;
> @@ -267,8 +308,8 @@
> };
> };
>
> - vcc1v8_codec: LDO_REG1 {
> - regulator-name = "vcc1v8_codec";
> + vcca1v8_codec: LDO_REG1 {
> + regulator-name = "vcca1v8_codec";
> regulator-always-on;
> regulator-boot-on;
> regulator-min-microvolt = <1800000>;
> @@ -278,8 +319,8 @@
> };
> };
>
> - vcc1v8_hdmi: LDO_REG2 {
> - regulator-name = "vcc1v8_hdmi";
> + vcca1v8_hdmi: LDO_REG2 {
> + regulator-name = "vcca1v8_hdmi";
> regulator-always-on;
> regulator-boot-on;
> regulator-min-microvolt = <1800000>;
> @@ -336,8 +377,8 @@
> };
> };
>
> - vcc0v9_hdmi: LDO_REG7 {
> - regulator-name = "vcc0v9_hdmi";
> + vcca0v9_hdmi: LDO_REG7 {
> + regulator-name = "vcca0v9_hdmi";
> regulator-always-on;
> regulator-boot-on;
> regulator-min-microvolt = <900000>;
> @@ -422,6 +463,20 @@
> i2c-scl-rising-time-ns = <300>;
> i2c-scl-falling-time-ns = <15>;
> status = "okay";
> +
> + es8316: codec@11 {
> + compatible = "everest,es8316";
> + reg = <0x11>;
> + clocks = <&cru SCLK_I2S_8CH_OUT>;
> + clock-names = "mclk";
> + #sound-dai-cells = <0>;
> +
> + port {
> + es8316_p0_0: endpoint {
> + remote-endpoint = <&i2s0_p0_0>;
> + };
> + };
> + };
> };
>
> &i2c3 {
> @@ -441,12 +496,19 @@
> rockchip,capture-channels = <2>;
> rockchip,playback-channels = <2>;
> status = "okay";
> +
> + i2s0_p0: port {
> + i2s0_p0_0: endpoint {
> + dai-format = "i2s";
> + mclk-fs = <256>;
> + remote-endpoint = <&es8316_p0_0>;
> + };
> + };
> };
>
> &i2s1 {
> rockchip,playback-channels = <2>;
> rockchip,capture-channels = <2>;
> - status = "okay";
> };
>
> &i2s2 {
> @@ -454,21 +516,10 @@
> };
>
> &io_domains {
> - status = "okay";
> -
> + audio-supply = <&vcca1v8_codec>;
> bt656-supply = <&vcc_3v0>;
> - audio-supply = <&vcc_3v0>;
> - sdmmc-supply = <&vcc_sdio>;
> gpio1830-supply = <&vcc_3v0>;
> -};
> -
> -&pmu_io_domains {
> - status = "okay";
> -
> - pmu1830-supply = <&vcc_3v0>;
> -};
> -
> -&pcie_phy {
> + sdmmc-supply = <&vcc_sdio>;
> status = "okay";
> };
>
> @@ -483,6 +534,10 @@
> status = "okay";
> };
>
> +&pcie_phy {
> + status = "okay";
> +};
> +
> &pinctrl {
> bt {
> bt_enable_h: bt-enable-h {
> @@ -498,26 +553,25 @@
> };
> };
>
> - pcie {
> - pcie_pwr_en: pcie-pwr-en {
> - rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
> + es8316 {
> + hp_detect: hp-detect {
> + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> - };
>
> - sdio0 {
> - sdio0_bus4: sdio0-bus4 {
> - rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
> - <2 RK_PC5 1 &pcfg_pull_up_20ma>,
> - <2 RK_PC6 1 &pcfg_pull_up_20ma>,
> - <2 RK_PC7 1 &pcfg_pull_up_20ma>;
> + hp_int: hp-int {
> + rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
> };
> + };
>
> - sdio0_cmd: sdio0-cmd {
> - rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
> + leds {
> + user_led2: user-led2 {
> + rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> + };
>
> - sdio0_clk: sdio0-clk {
> - rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
> + pcie {
> + pcie_pwr_en: pcie-pwr-en {
> + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
> };
> };
>
> @@ -535,6 +589,23 @@
> };
> };
>
> + sdio0 {
> + sdio0_bus4: sdio0-bus4 {
> + rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
> + <2 RK_PC5 1 &pcfg_pull_up_20ma>,
> + <2 RK_PC6 1 &pcfg_pull_up_20ma>,
> + <2 RK_PC7 1 &pcfg_pull_up_20ma>;
> + };
> +
> + sdio0_cmd: sdio0-cmd {
> + rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
> + };
> +
> + sdio0_clk: sdio0-clk {
> + rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
> + };
> + };
> +
> usb-typec {
> vcc5v0_typec_en: vcc5v0-typec-en {
> rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
> @@ -558,6 +629,11 @@
> };
> };
>
> +&pmu_io_domains {
> + pmu1830-supply = <&vcc_3v0>;
> + status = "okay";
> +};
> +
> &pwm2 {
> status = "okay";
> };
> @@ -568,6 +644,14 @@
> vref-supply = <&vcc_1v8>;
> };
>
> +&sdhci {
> + bus-width = <8>;
> + mmc-hs400-1_8v;
> + mmc-hs400-enhanced-strobe;
> + non-removable;
> + status = "okay";
> +};
> +
> &sdio0 {
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -595,12 +679,13 @@
> status = "okay";
> };
>
> -&sdhci {
> - bus-width = <8>;
> - mmc-hs400-1_8v;
> - mmc-hs400-enhanced-strobe;
> - non-removable;
> - status = "okay";
> +&spdif {
> +
> + spdif_p0: port {
> + spdif_p0_0: endpoint {
> + remote-endpoint = <&dit_p0_0>;
> + };
> + };
> };
>
> &tcphy0 {
> @@ -675,13 +760,13 @@
> status = "okay";
> };
>
> -&usbdrd_dwc3_0 {
> +&usbdrd3_1 {
> status = "okay";
> - dr_mode = "host";
> };
>
> -&usbdrd3_1 {
> +&usbdrd_dwc3_0 {
> status = "okay";
> + dr_mode = "host";
> };
>
> &usbdrd_dwc3_1 {
> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
> new file mode 100644
> index 0000000000..5c1c451b8f
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
> @@ -0,0 +1,5 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (c) 2023 Radxa Limited
> + */
> +#include "rk3399-rock-pi-4-u-boot.dtsi"
> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-plus.dts b/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
> new file mode 100644
> index 0000000000..f5a68d8d07
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
> @@ -0,0 +1,25 @@
> +// 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"
> +#include "rk3399-op1-opp.dtsi"
> +
> +/ {
> + model = "Radxa ROCK Pi 4A+";
> + compatible = "radxa,rockpi4a-plus", "radxa,rockpi4", "rockchip,rk3399";
> +};
> +
> +&es8316 {
> + pinctrl-0 = <&hp_detect &hp_int>;
> + pinctrl-names = "default";
> + interrupt-parent = <&gpio1>;
> + interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
> +};
> +
> +&sound {
> + hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> +};
> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
> new file mode 100644
> index 0000000000..85ee5770ad
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-rock-pi-4-u-boot.dtsi"
> diff --git a/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
> new file mode 100644
> index 0000000000..5c1c451b8f
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
> @@ -0,0 +1,5 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (c) 2023 Radxa Limited
> + */
> +#include "rk3399-rock-pi-4-u-boot.dtsi"
> diff --git a/arch/arm/dts/rk3399-rock-pi-4b-plus.dts b/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
> new file mode 100644
> index 0000000000..cec3b7b1b9
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
> @@ -0,0 +1,61 @@
> +// 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"
> +#include "rk3399-op1-opp.dtsi"
> +
> +/ {
> + model = "Radxa ROCK Pi 4B+";
> + compatible = "radxa,rockpi4b-plus", "radxa,rockpi4", "rockchip,rk3399";
> +
> + aliases {
> + mmc2 = &sdio0;
> + };
> +};
> +
> +&es8316 {
> + pinctrl-0 = <&hp_detect &hp_int>;
> + pinctrl-names = "default";
> + interrupt-parent = <&gpio1>;
> + interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
> +};
> +
> +&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>;
> + };
> +};
> +
> +&sound {
> + hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> +};
> +
> +&uart0 {
> + status = "okay";
> +
> + bluetooth {
> + compatible = "brcm,bcm4345c5";
> + clocks = <&rk808 1>;
> + clock-names = "lpo";
> + 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>;
> + max-speed = <1500000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
> + vbat-supply = <&vcc3v3_sys>;
> + vddio-supply = <&vcc_1v8>;
> + };
> +};
> diff --git a/arch/arm/dts/rk3399-rock-pi-4b.dts b/arch/arm/dts/rk3399-rock-pi-4b.dts
> index 6c63e61706..0806545922 100644
> --- a/arch/arm/dts/rk3399-rock-pi-4b.dts
> +++ b/arch/arm/dts/rk3399-rock-pi-4b.dts
> @@ -23,7 +23,7 @@
> compatible = "brcm,bcm4329-fmac";
> reg = <1>;
> interrupt-parent = <&gpio0>;
> - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
> + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "host-wake";
> pinctrl-names = "default";
> pinctrl-0 = <&wifi_host_wake_l>;
> @@ -34,13 +34,16 @@
> status = "okay";
>
> bluetooth {
> - compatible = "brcm,bcm43438-bt";
> + compatible = "brcm,bcm4345c5";
> clocks = <&rk808 1>;
> - clock-names = "ext_clock";
> + clock-names = "lpo";
> 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>;
> + max-speed = <1500000>;
> pinctrl-names = "default";
> pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
> + vbat-supply = <&vcc3v3_sys>;
> + vddio-supply = <&vcc_1v8>;
> };
> };
> diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts b/arch/arm/dts/rk3399-rock-pi-4c.dts
> index 99169bcd51..4053ba7261 100644
> --- a/arch/arm/dts/rk3399-rock-pi-4c.dts
> +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts
> @@ -17,6 +17,13 @@
> };
> };
>
> +&es8316 {
> + pinctrl-0 = <&hp_detect &hp_int>;
> + pinctrl-names = "default";
> + interrupt-parent = <&gpio1>;
> + interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
> +};
> +
> &sdio0 {
> status = "okay";
>
> @@ -24,25 +31,32 @@
> compatible = "brcm,bcm4329-fmac";
> reg = <1>;
> interrupt-parent = <&gpio0>;
> - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
> + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "host-wake";
> pinctrl-names = "default";
> pinctrl-0 = <&wifi_host_wake_l>;
> };
> };
>
> +&sound {
> + hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
> +};
> +
> &uart0 {
> status = "okay";
>
> bluetooth {
> - compatible = "brcm,bcm43438-bt";
> + compatible = "brcm,bcm4345c5";
> clocks = <&rk808 1>;
> - clock-names = "ext_clock";
> + clock-names = "lpo";
> 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>;
> + max-speed = <1500000>;
> pinctrl-names = "default";
> pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
> + vbat-supply = <&vcc3v3_sys>;
> + vddio-supply = <&vcc_1v8>;
> };
> };
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants
2023-04-08 9:11 ` [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants FUKAUMI Naoki
@ 2023-04-13 2:22 ` Kever Yang
2023-04-18 2:41 ` FUKAUMI Naoki
0 siblings, 1 reply; 6+ messages in thread
From: Kever Yang @ 2023-04-13 2:22 UTC (permalink / raw)
To: FUKAUMI Naoki, u-boot; +Cc: sjg, philipp.tomsich
On 2023/4/8 17:11, FUKAUMI Naoki wrote:
> compared to ROCK Pi 4B,
> - ROCK Pi 4A: without Wi-Fi/BT
> - ROCK Pi 4A+: with OP1, without Wi-Fi/BT
> - ROCK Pi 4B+: with OP1
It will be better to re-use one defconfig all the board in one series,
the peripheral difference like
Wi-Fi/BT are identified by the dts, not thedefconfig, and they even
not used in U-Boot.
Thanks,
- Kever
>
> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> ---
> configs/rock-pi-4a-plus-rk3399_defconfig | 97 +++++++++++++++++++
> configs/rock-pi-4a-rk3399_defconfig | 97 +++++++++++++++++++
> configs/rock-pi-4b-plus-rk3399_defconfig | 97 +++++++++++++++++++
> ..._defconfig => rock-pi-4b-rk3399_defconfig} | 0
> 4 files changed, 291 insertions(+)
> create mode 100644 configs/rock-pi-4a-plus-rk3399_defconfig
> create mode 100644 configs/rock-pi-4a-rk3399_defconfig
> create mode 100644 configs/rock-pi-4b-plus-rk3399_defconfig
> rename configs/{rock-pi-4-rk3399_defconfig => rock-pi-4b-rk3399_defconfig} (100%)
>
> diff --git a/configs/rock-pi-4a-plus-rk3399_defconfig b/configs/rock-pi-4a-plus-rk3399_defconfig
> new file mode 100644
> index 0000000000..daac538376
> --- /dev/null
> +++ b/configs/rock-pi-4a-plus-rk3399_defconfig
> @@ -0,0 +1,97 @@
> +CONFIG_ARM=y
> +CONFIG_SKIP_LOWLEVEL_INIT=y
> +CONFIG_COUNTER_FREQUENCY=24000000
> +CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_TEXT_BASE=0x00200000
> +CONFIG_NR_DRAM_BANKS=1
> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
> +CONFIG_ENV_OFFSET=0x3F8000
> +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a-plus"
> +CONFIG_DM_RESET=y
> +CONFIG_ROCKCHIP_RK3399=y
> +CONFIG_TARGET_EVB_RK3399=y
> +CONFIG_SPL_STACK=0x400000
> +CONFIG_DEBUG_UART_BASE=0xFF1A0000
> +CONFIG_DEBUG_UART_CLOCK=24000000
> +CONFIG_SYS_LOAD_ADDR=0x800800
> +CONFIG_DEBUG_UART=y
> +# CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a-plus.dtb"
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_R=y
> +CONFIG_SPL_MAX_SIZE=0x2e000
> +CONFIG_SPL_PAD_TO=0x7f8000
> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> +CONFIG_SPL_BSS_START_ADDR=0x400000
> +CONFIG_SPL_BSS_MAX_SIZE=0x2000
> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> +CONFIG_SPL_STACK_R=y
> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
> +CONFIG_TPL=y
> +CONFIG_CMD_BOOTZ=y
> +CONFIG_CMD_NVEDIT_EFI=y
> +CONFIG_CMD_DFU=y
> +CONFIG_CMD_GPT=y
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_PCI=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_ROCKUSB=y
> +CONFIG_CMD_USB_MASS_STORAGE=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_EFIDEBUG=y
> +CONFIG_CMD_TIME=y
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_DFU_MMC=y
> +CONFIG_ROCKCHIP_GPIO=y
> +CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_MISC=y
> +CONFIG_ROCKCHIP_EFUSE=y
> +CONFIG_MMC_DW=y
> +CONFIG_MMC_DW_ROCKCHIP=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_ROCKCHIP=y
> +CONFIG_ETH_DESIGNWARE=y
> +CONFIG_GMAC_ROCKCHIP=y
> +CONFIG_NVME_PCI=y
> +CONFIG_PCI=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_TYPEC=y
> +CONFIG_PMIC_RK8XX=y
> +CONFIG_REGULATOR_PWM=y
> +CONFIG_REGULATOR_RK8XX=y
> +CONFIG_PWM_ROCKCHIP=y
> +CONFIG_RAM_ROCKCHIP_LPDDR4=y
> +CONFIG_BAUDRATE=1500000
> +CONFIG_DEBUG_UART_SHIFT=2
> +CONFIG_SYS_NS16550_MEM32=y
> +CONFIG_SYSRESET=y
> +CONFIG_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_XHCI_DWC3=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> +CONFIG_USB_DWC3=y
> +CONFIG_USB_DWC3_GENERIC=y
> +CONFIG_USB_KEYBOARD=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_ASIX88179=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_RTL8152=y
> +CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_GADGET=y
> +CONFIG_USB_FUNCTION_ROCKUSB=y
> +CONFIG_VIDEO=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> +CONFIG_SPL_TINY_MEMSET=y
> +CONFIG_ERRNO_STR=y
> +CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_EFI_CAPSULE_ON_DISK=y
> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
> diff --git a/configs/rock-pi-4a-rk3399_defconfig b/configs/rock-pi-4a-rk3399_defconfig
> new file mode 100644
> index 0000000000..fde1ee2eb5
> --- /dev/null
> +++ b/configs/rock-pi-4a-rk3399_defconfig
> @@ -0,0 +1,97 @@
> +CONFIG_ARM=y
> +CONFIG_SKIP_LOWLEVEL_INIT=y
> +CONFIG_COUNTER_FREQUENCY=24000000
> +CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_TEXT_BASE=0x00200000
> +CONFIG_NR_DRAM_BANKS=1
> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
> +CONFIG_ENV_OFFSET=0x3F8000
> +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a"
> +CONFIG_DM_RESET=y
> +CONFIG_ROCKCHIP_RK3399=y
> +CONFIG_TARGET_EVB_RK3399=y
> +CONFIG_SPL_STACK=0x400000
> +CONFIG_DEBUG_UART_BASE=0xFF1A0000
> +CONFIG_DEBUG_UART_CLOCK=24000000
> +CONFIG_SYS_LOAD_ADDR=0x800800
> +CONFIG_DEBUG_UART=y
> +# CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_R=y
> +CONFIG_SPL_MAX_SIZE=0x2e000
> +CONFIG_SPL_PAD_TO=0x7f8000
> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> +CONFIG_SPL_BSS_START_ADDR=0x400000
> +CONFIG_SPL_BSS_MAX_SIZE=0x2000
> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> +CONFIG_SPL_STACK_R=y
> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
> +CONFIG_TPL=y
> +CONFIG_CMD_BOOTZ=y
> +CONFIG_CMD_NVEDIT_EFI=y
> +CONFIG_CMD_DFU=y
> +CONFIG_CMD_GPT=y
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_PCI=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_ROCKUSB=y
> +CONFIG_CMD_USB_MASS_STORAGE=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_EFIDEBUG=y
> +CONFIG_CMD_TIME=y
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_DFU_MMC=y
> +CONFIG_ROCKCHIP_GPIO=y
> +CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_MISC=y
> +CONFIG_ROCKCHIP_EFUSE=y
> +CONFIG_MMC_DW=y
> +CONFIG_MMC_DW_ROCKCHIP=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_ROCKCHIP=y
> +CONFIG_ETH_DESIGNWARE=y
> +CONFIG_GMAC_ROCKCHIP=y
> +CONFIG_NVME_PCI=y
> +CONFIG_PCI=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_TYPEC=y
> +CONFIG_PMIC_RK8XX=y
> +CONFIG_REGULATOR_PWM=y
> +CONFIG_REGULATOR_RK8XX=y
> +CONFIG_PWM_ROCKCHIP=y
> +CONFIG_RAM_ROCKCHIP_LPDDR4=y
> +CONFIG_BAUDRATE=1500000
> +CONFIG_DEBUG_UART_SHIFT=2
> +CONFIG_SYS_NS16550_MEM32=y
> +CONFIG_SYSRESET=y
> +CONFIG_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_XHCI_DWC3=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> +CONFIG_USB_DWC3=y
> +CONFIG_USB_DWC3_GENERIC=y
> +CONFIG_USB_KEYBOARD=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_ASIX88179=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_RTL8152=y
> +CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_GADGET=y
> +CONFIG_USB_FUNCTION_ROCKUSB=y
> +CONFIG_VIDEO=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> +CONFIG_SPL_TINY_MEMSET=y
> +CONFIG_ERRNO_STR=y
> +CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_EFI_CAPSULE_ON_DISK=y
> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
> diff --git a/configs/rock-pi-4b-plus-rk3399_defconfig b/configs/rock-pi-4b-plus-rk3399_defconfig
> new file mode 100644
> index 0000000000..0f7d840199
> --- /dev/null
> +++ b/configs/rock-pi-4b-plus-rk3399_defconfig
> @@ -0,0 +1,97 @@
> +CONFIG_ARM=y
> +CONFIG_SKIP_LOWLEVEL_INIT=y
> +CONFIG_COUNTER_FREQUENCY=24000000
> +CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_TEXT_BASE=0x00200000
> +CONFIG_NR_DRAM_BANKS=1
> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
> +CONFIG_ENV_OFFSET=0x3F8000
> +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b-plus"
> +CONFIG_DM_RESET=y
> +CONFIG_ROCKCHIP_RK3399=y
> +CONFIG_TARGET_EVB_RK3399=y
> +CONFIG_SPL_STACK=0x400000
> +CONFIG_DEBUG_UART_BASE=0xFF1A0000
> +CONFIG_DEBUG_UART_CLOCK=24000000
> +CONFIG_SYS_LOAD_ADDR=0x800800
> +CONFIG_DEBUG_UART=y
> +# CONFIG_ANDROID_BOOT_IMAGE is not set
> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b-plus.dtb"
> +CONFIG_DISPLAY_BOARDINFO_LATE=y
> +CONFIG_MISC_INIT_R=y
> +CONFIG_SPL_MAX_SIZE=0x2e000
> +CONFIG_SPL_PAD_TO=0x7f8000
> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> +CONFIG_SPL_BSS_START_ADDR=0x400000
> +CONFIG_SPL_BSS_MAX_SIZE=0x2000
> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> +CONFIG_SPL_STACK_R=y
> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
> +CONFIG_TPL=y
> +CONFIG_CMD_BOOTZ=y
> +CONFIG_CMD_NVEDIT_EFI=y
> +CONFIG_CMD_DFU=y
> +CONFIG_CMD_GPT=y
> +CONFIG_CMD_MMC=y
> +CONFIG_CMD_PCI=y
> +CONFIG_CMD_USB=y
> +CONFIG_CMD_ROCKUSB=y
> +CONFIG_CMD_USB_MASS_STORAGE=y
> +# CONFIG_CMD_SETEXPR is not set
> +CONFIG_CMD_EFIDEBUG=y
> +CONFIG_CMD_TIME=y
> +CONFIG_SPL_OF_CONTROL=y
> +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_ENV_IS_IN_MMC=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +CONFIG_DFU_MMC=y
> +CONFIG_ROCKCHIP_GPIO=y
> +CONFIG_SYS_I2C_ROCKCHIP=y
> +CONFIG_MISC=y
> +CONFIG_ROCKCHIP_EFUSE=y
> +CONFIG_MMC_DW=y
> +CONFIG_MMC_DW_ROCKCHIP=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_ROCKCHIP=y
> +CONFIG_ETH_DESIGNWARE=y
> +CONFIG_GMAC_ROCKCHIP=y
> +CONFIG_NVME_PCI=y
> +CONFIG_PCI=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_TYPEC=y
> +CONFIG_PMIC_RK8XX=y
> +CONFIG_REGULATOR_PWM=y
> +CONFIG_REGULATOR_RK8XX=y
> +CONFIG_PWM_ROCKCHIP=y
> +CONFIG_RAM_ROCKCHIP_LPDDR4=y
> +CONFIG_BAUDRATE=1500000
> +CONFIG_DEBUG_UART_SHIFT=2
> +CONFIG_SYS_NS16550_MEM32=y
> +CONFIG_SYSRESET=y
> +CONFIG_USB=y
> +CONFIG_USB_XHCI_HCD=y
> +CONFIG_USB_XHCI_DWC3=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> +CONFIG_USB_DWC3=y
> +CONFIG_USB_DWC3_GENERIC=y
> +CONFIG_USB_KEYBOARD=y
> +CONFIG_USB_HOST_ETHER=y
> +CONFIG_USB_ETHER_ASIX=y
> +CONFIG_USB_ETHER_ASIX88179=y
> +CONFIG_USB_ETHER_MCS7830=y
> +CONFIG_USB_ETHER_RTL8152=y
> +CONFIG_USB_ETHER_SMSC95XX=y
> +CONFIG_USB_GADGET=y
> +CONFIG_USB_FUNCTION_ROCKUSB=y
> +CONFIG_VIDEO=y
> +CONFIG_DISPLAY=y
> +CONFIG_VIDEO_ROCKCHIP=y
> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
> +CONFIG_SPL_TINY_MEMSET=y
> +CONFIG_ERRNO_STR=y
> +CONFIG_OF_LIBFDT_OVERLAY=y
> +CONFIG_EFI_CAPSULE_ON_DISK=y
> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
> diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4b-rk3399_defconfig
> similarity index 100%
> rename from configs/rock-pi-4-rk3399_defconfig
> rename to configs/rock-pi-4b-rk3399_defconfig
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants
2023-04-13 2:22 ` Kever Yang
@ 2023-04-18 2:41 ` FUKAUMI Naoki
0 siblings, 0 replies; 6+ messages in thread
From: FUKAUMI Naoki @ 2023-04-18 2:41 UTC (permalink / raw)
To: Kever Yang, u-boot; +Cc: sjg, philipp.tomsich
hi,
On 4/13/23 11:22, Kever Yang wrote:
>
> On 2023/4/8 17:11, FUKAUMI Naoki wrote:
>> compared to ROCK Pi 4B,
>> - ROCK Pi 4A: without Wi-Fi/BT
>> - ROCK Pi 4A+: with OP1, without Wi-Fi/BT
>> - ROCK Pi 4B+: with OP1
> It will be better to re-use one defconfig all the board in one series,
> the peripheral difference like
> Wi-Fi/BT are identified by the dts, not thedefconfig, and they even
> not used in U-Boot.
I got it.
btw, ROCK 4C+ is different to ROCK Pi 4A/A+/B/B+.
(e.g. PMIC is RK809 on 4C+ instead of RK808)
could you review ROCK 4C+ patches?
https://patchwork.ozlabs.org/project/uboot/list/?series=350088
Best regards,
--
FUKAUMI Naoki
> Thanks,
> - Kever
>>
>> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
>> ---
>> configs/rock-pi-4a-plus-rk3399_defconfig | 97 +++++++++++++++++++
>> configs/rock-pi-4a-rk3399_defconfig | 97 +++++++++++++++++++
>> configs/rock-pi-4b-plus-rk3399_defconfig | 97 +++++++++++++++++++
>> ..._defconfig => rock-pi-4b-rk3399_defconfig} | 0
>> 4 files changed, 291 insertions(+)
>> create mode 100644 configs/rock-pi-4a-plus-rk3399_defconfig
>> create mode 100644 configs/rock-pi-4a-rk3399_defconfig
>> create mode 100644 configs/rock-pi-4b-plus-rk3399_defconfig
>> rename configs/{rock-pi-4-rk3399_defconfig =>
>> rock-pi-4b-rk3399_defconfig} (100%)
>>
>> diff --git a/configs/rock-pi-4a-plus-rk3399_defconfig
>> b/configs/rock-pi-4a-plus-rk3399_defconfig
>> new file mode 100644
>> index 0000000000..daac538376
>> --- /dev/null
>> +++ b/configs/rock-pi-4a-plus-rk3399_defconfig
>> @@ -0,0 +1,97 @@
>> +CONFIG_ARM=y
>> +CONFIG_SKIP_LOWLEVEL_INIT=y
>> +CONFIG_COUNTER_FREQUENCY=24000000
>> +CONFIG_ARCH_ROCKCHIP=y
>> +CONFIG_TEXT_BASE=0x00200000
>> +CONFIG_NR_DRAM_BANKS=1
>> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>> +CONFIG_ENV_OFFSET=0x3F8000
>> +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a-plus"
>> +CONFIG_DM_RESET=y
>> +CONFIG_ROCKCHIP_RK3399=y
>> +CONFIG_TARGET_EVB_RK3399=y
>> +CONFIG_SPL_STACK=0x400000
>> +CONFIG_DEBUG_UART_BASE=0xFF1A0000
>> +CONFIG_DEBUG_UART_CLOCK=24000000
>> +CONFIG_SYS_LOAD_ADDR=0x800800
>> +CONFIG_DEBUG_UART=y
>> +# CONFIG_ANDROID_BOOT_IMAGE is not set
>> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a-plus.dtb"
>> +CONFIG_DISPLAY_BOARDINFO_LATE=y
>> +CONFIG_MISC_INIT_R=y
>> +CONFIG_SPL_MAX_SIZE=0x2e000
>> +CONFIG_SPL_PAD_TO=0x7f8000
>> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> +CONFIG_SPL_BSS_START_ADDR=0x400000
>> +CONFIG_SPL_BSS_MAX_SIZE=0x2000
>> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>> +CONFIG_SPL_STACK_R=y
>> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
>> +CONFIG_TPL=y
>> +CONFIG_CMD_BOOTZ=y
>> +CONFIG_CMD_NVEDIT_EFI=y
>> +CONFIG_CMD_DFU=y
>> +CONFIG_CMD_GPT=y
>> +CONFIG_CMD_MMC=y
>> +CONFIG_CMD_PCI=y
>> +CONFIG_CMD_USB=y
>> +CONFIG_CMD_ROCKUSB=y
>> +CONFIG_CMD_USB_MASS_STORAGE=y
>> +# CONFIG_CMD_SETEXPR is not set
>> +CONFIG_CMD_EFIDEBUG=y
>> +CONFIG_CMD_TIME=y
>> +CONFIG_SPL_OF_CONTROL=y
>> +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names
>> interrupt-parent assigned-clocks assigned-clock-rates
>> assigned-clock-parents"
>> +CONFIG_ENV_IS_IN_MMC=y
>> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> +CONFIG_DFU_MMC=y
>> +CONFIG_ROCKCHIP_GPIO=y
>> +CONFIG_SYS_I2C_ROCKCHIP=y
>> +CONFIG_MISC=y
>> +CONFIG_ROCKCHIP_EFUSE=y
>> +CONFIG_MMC_DW=y
>> +CONFIG_MMC_DW_ROCKCHIP=y
>> +CONFIG_MMC_SDHCI=y
>> +CONFIG_MMC_SDHCI_ROCKCHIP=y
>> +CONFIG_ETH_DESIGNWARE=y
>> +CONFIG_GMAC_ROCKCHIP=y
>> +CONFIG_NVME_PCI=y
>> +CONFIG_PCI=y
>> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>> +CONFIG_PHY_ROCKCHIP_TYPEC=y
>> +CONFIG_PMIC_RK8XX=y
>> +CONFIG_REGULATOR_PWM=y
>> +CONFIG_REGULATOR_RK8XX=y
>> +CONFIG_PWM_ROCKCHIP=y
>> +CONFIG_RAM_ROCKCHIP_LPDDR4=y
>> +CONFIG_BAUDRATE=1500000
>> +CONFIG_DEBUG_UART_SHIFT=2
>> +CONFIG_SYS_NS16550_MEM32=y
>> +CONFIG_SYSRESET=y
>> +CONFIG_USB=y
>> +CONFIG_USB_XHCI_HCD=y
>> +CONFIG_USB_XHCI_DWC3=y
>> +CONFIG_USB_EHCI_HCD=y
>> +CONFIG_USB_EHCI_GENERIC=y
>> +CONFIG_USB_DWC3=y
>> +CONFIG_USB_DWC3_GENERIC=y
>> +CONFIG_USB_KEYBOARD=y
>> +CONFIG_USB_HOST_ETHER=y
>> +CONFIG_USB_ETHER_ASIX=y
>> +CONFIG_USB_ETHER_ASIX88179=y
>> +CONFIG_USB_ETHER_MCS7830=y
>> +CONFIG_USB_ETHER_RTL8152=y
>> +CONFIG_USB_ETHER_SMSC95XX=y
>> +CONFIG_USB_GADGET=y
>> +CONFIG_USB_FUNCTION_ROCKUSB=y
>> +CONFIG_VIDEO=y
>> +CONFIG_DISPLAY=y
>> +CONFIG_VIDEO_ROCKCHIP=y
>> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
>> +CONFIG_SPL_TINY_MEMSET=y
>> +CONFIG_ERRNO_STR=y
>> +CONFIG_OF_LIBFDT_OVERLAY=y
>> +CONFIG_EFI_CAPSULE_ON_DISK=y
>> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
>> diff --git a/configs/rock-pi-4a-rk3399_defconfig
>> b/configs/rock-pi-4a-rk3399_defconfig
>> new file mode 100644
>> index 0000000000..fde1ee2eb5
>> --- /dev/null
>> +++ b/configs/rock-pi-4a-rk3399_defconfig
>> @@ -0,0 +1,97 @@
>> +CONFIG_ARM=y
>> +CONFIG_SKIP_LOWLEVEL_INIT=y
>> +CONFIG_COUNTER_FREQUENCY=24000000
>> +CONFIG_ARCH_ROCKCHIP=y
>> +CONFIG_TEXT_BASE=0x00200000
>> +CONFIG_NR_DRAM_BANKS=1
>> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>> +CONFIG_ENV_OFFSET=0x3F8000
>> +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4a"
>> +CONFIG_DM_RESET=y
>> +CONFIG_ROCKCHIP_RK3399=y
>> +CONFIG_TARGET_EVB_RK3399=y
>> +CONFIG_SPL_STACK=0x400000
>> +CONFIG_DEBUG_UART_BASE=0xFF1A0000
>> +CONFIG_DEBUG_UART_CLOCK=24000000
>> +CONFIG_SYS_LOAD_ADDR=0x800800
>> +CONFIG_DEBUG_UART=y
>> +# CONFIG_ANDROID_BOOT_IMAGE is not set
>> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
>> +CONFIG_DISPLAY_BOARDINFO_LATE=y
>> +CONFIG_MISC_INIT_R=y
>> +CONFIG_SPL_MAX_SIZE=0x2e000
>> +CONFIG_SPL_PAD_TO=0x7f8000
>> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> +CONFIG_SPL_BSS_START_ADDR=0x400000
>> +CONFIG_SPL_BSS_MAX_SIZE=0x2000
>> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>> +CONFIG_SPL_STACK_R=y
>> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
>> +CONFIG_TPL=y
>> +CONFIG_CMD_BOOTZ=y
>> +CONFIG_CMD_NVEDIT_EFI=y
>> +CONFIG_CMD_DFU=y
>> +CONFIG_CMD_GPT=y
>> +CONFIG_CMD_MMC=y
>> +CONFIG_CMD_PCI=y
>> +CONFIG_CMD_USB=y
>> +CONFIG_CMD_ROCKUSB=y
>> +CONFIG_CMD_USB_MASS_STORAGE=y
>> +# CONFIG_CMD_SETEXPR is not set
>> +CONFIG_CMD_EFIDEBUG=y
>> +CONFIG_CMD_TIME=y
>> +CONFIG_SPL_OF_CONTROL=y
>> +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names
>> interrupt-parent assigned-clocks assigned-clock-rates
>> assigned-clock-parents"
>> +CONFIG_ENV_IS_IN_MMC=y
>> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> +CONFIG_DFU_MMC=y
>> +CONFIG_ROCKCHIP_GPIO=y
>> +CONFIG_SYS_I2C_ROCKCHIP=y
>> +CONFIG_MISC=y
>> +CONFIG_ROCKCHIP_EFUSE=y
>> +CONFIG_MMC_DW=y
>> +CONFIG_MMC_DW_ROCKCHIP=y
>> +CONFIG_MMC_SDHCI=y
>> +CONFIG_MMC_SDHCI_ROCKCHIP=y
>> +CONFIG_ETH_DESIGNWARE=y
>> +CONFIG_GMAC_ROCKCHIP=y
>> +CONFIG_NVME_PCI=y
>> +CONFIG_PCI=y
>> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>> +CONFIG_PHY_ROCKCHIP_TYPEC=y
>> +CONFIG_PMIC_RK8XX=y
>> +CONFIG_REGULATOR_PWM=y
>> +CONFIG_REGULATOR_RK8XX=y
>> +CONFIG_PWM_ROCKCHIP=y
>> +CONFIG_RAM_ROCKCHIP_LPDDR4=y
>> +CONFIG_BAUDRATE=1500000
>> +CONFIG_DEBUG_UART_SHIFT=2
>> +CONFIG_SYS_NS16550_MEM32=y
>> +CONFIG_SYSRESET=y
>> +CONFIG_USB=y
>> +CONFIG_USB_XHCI_HCD=y
>> +CONFIG_USB_XHCI_DWC3=y
>> +CONFIG_USB_EHCI_HCD=y
>> +CONFIG_USB_EHCI_GENERIC=y
>> +CONFIG_USB_DWC3=y
>> +CONFIG_USB_DWC3_GENERIC=y
>> +CONFIG_USB_KEYBOARD=y
>> +CONFIG_USB_HOST_ETHER=y
>> +CONFIG_USB_ETHER_ASIX=y
>> +CONFIG_USB_ETHER_ASIX88179=y
>> +CONFIG_USB_ETHER_MCS7830=y
>> +CONFIG_USB_ETHER_RTL8152=y
>> +CONFIG_USB_ETHER_SMSC95XX=y
>> +CONFIG_USB_GADGET=y
>> +CONFIG_USB_FUNCTION_ROCKUSB=y
>> +CONFIG_VIDEO=y
>> +CONFIG_DISPLAY=y
>> +CONFIG_VIDEO_ROCKCHIP=y
>> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
>> +CONFIG_SPL_TINY_MEMSET=y
>> +CONFIG_ERRNO_STR=y
>> +CONFIG_OF_LIBFDT_OVERLAY=y
>> +CONFIG_EFI_CAPSULE_ON_DISK=y
>> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
>> diff --git a/configs/rock-pi-4b-plus-rk3399_defconfig
>> b/configs/rock-pi-4b-plus-rk3399_defconfig
>> new file mode 100644
>> index 0000000000..0f7d840199
>> --- /dev/null
>> +++ b/configs/rock-pi-4b-plus-rk3399_defconfig
>> @@ -0,0 +1,97 @@
>> +CONFIG_ARM=y
>> +CONFIG_SKIP_LOWLEVEL_INIT=y
>> +CONFIG_COUNTER_FREQUENCY=24000000
>> +CONFIG_ARCH_ROCKCHIP=y
>> +CONFIG_TEXT_BASE=0x00200000
>> +CONFIG_NR_DRAM_BANKS=1
>> +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
>> +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>> +CONFIG_ENV_OFFSET=0x3F8000
>> +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b-plus"
>> +CONFIG_DM_RESET=y
>> +CONFIG_ROCKCHIP_RK3399=y
>> +CONFIG_TARGET_EVB_RK3399=y
>> +CONFIG_SPL_STACK=0x400000
>> +CONFIG_DEBUG_UART_BASE=0xFF1A0000
>> +CONFIG_DEBUG_UART_CLOCK=24000000
>> +CONFIG_SYS_LOAD_ADDR=0x800800
>> +CONFIG_DEBUG_UART=y
>> +# CONFIG_ANDROID_BOOT_IMAGE is not set
>> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b-plus.dtb"
>> +CONFIG_DISPLAY_BOARDINFO_LATE=y
>> +CONFIG_MISC_INIT_R=y
>> +CONFIG_SPL_MAX_SIZE=0x2e000
>> +CONFIG_SPL_PAD_TO=0x7f8000
>> +CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>> +CONFIG_SPL_BSS_START_ADDR=0x400000
>> +CONFIG_SPL_BSS_MAX_SIZE=0x2000
>> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
>> +# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>> +CONFIG_SPL_STACK_R=y
>> +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
>> +CONFIG_TPL=y
>> +CONFIG_CMD_BOOTZ=y
>> +CONFIG_CMD_NVEDIT_EFI=y
>> +CONFIG_CMD_DFU=y
>> +CONFIG_CMD_GPT=y
>> +CONFIG_CMD_MMC=y
>> +CONFIG_CMD_PCI=y
>> +CONFIG_CMD_USB=y
>> +CONFIG_CMD_ROCKUSB=y
>> +CONFIG_CMD_USB_MASS_STORAGE=y
>> +# CONFIG_CMD_SETEXPR is not set
>> +CONFIG_CMD_EFIDEBUG=y
>> +CONFIG_CMD_TIME=y
>> +CONFIG_SPL_OF_CONTROL=y
>> +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names
>> interrupt-parent assigned-clocks assigned-clock-rates
>> assigned-clock-parents"
>> +CONFIG_ENV_IS_IN_MMC=y
>> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>> +CONFIG_DFU_MMC=y
>> +CONFIG_ROCKCHIP_GPIO=y
>> +CONFIG_SYS_I2C_ROCKCHIP=y
>> +CONFIG_MISC=y
>> +CONFIG_ROCKCHIP_EFUSE=y
>> +CONFIG_MMC_DW=y
>> +CONFIG_MMC_DW_ROCKCHIP=y
>> +CONFIG_MMC_SDHCI=y
>> +CONFIG_MMC_SDHCI_ROCKCHIP=y
>> +CONFIG_ETH_DESIGNWARE=y
>> +CONFIG_GMAC_ROCKCHIP=y
>> +CONFIG_NVME_PCI=y
>> +CONFIG_PCI=y
>> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
>> +CONFIG_PHY_ROCKCHIP_TYPEC=y
>> +CONFIG_PMIC_RK8XX=y
>> +CONFIG_REGULATOR_PWM=y
>> +CONFIG_REGULATOR_RK8XX=y
>> +CONFIG_PWM_ROCKCHIP=y
>> +CONFIG_RAM_ROCKCHIP_LPDDR4=y
>> +CONFIG_BAUDRATE=1500000
>> +CONFIG_DEBUG_UART_SHIFT=2
>> +CONFIG_SYS_NS16550_MEM32=y
>> +CONFIG_SYSRESET=y
>> +CONFIG_USB=y
>> +CONFIG_USB_XHCI_HCD=y
>> +CONFIG_USB_XHCI_DWC3=y
>> +CONFIG_USB_EHCI_HCD=y
>> +CONFIG_USB_EHCI_GENERIC=y
>> +CONFIG_USB_DWC3=y
>> +CONFIG_USB_DWC3_GENERIC=y
>> +CONFIG_USB_KEYBOARD=y
>> +CONFIG_USB_HOST_ETHER=y
>> +CONFIG_USB_ETHER_ASIX=y
>> +CONFIG_USB_ETHER_ASIX88179=y
>> +CONFIG_USB_ETHER_MCS7830=y
>> +CONFIG_USB_ETHER_RTL8152=y
>> +CONFIG_USB_ETHER_SMSC95XX=y
>> +CONFIG_USB_GADGET=y
>> +CONFIG_USB_FUNCTION_ROCKUSB=y
>> +CONFIG_VIDEO=y
>> +CONFIG_DISPLAY=y
>> +CONFIG_VIDEO_ROCKCHIP=y
>> +CONFIG_DISPLAY_ROCKCHIP_HDMI=y
>> +CONFIG_SPL_TINY_MEMSET=y
>> +CONFIG_ERRNO_STR=y
>> +CONFIG_OF_LIBFDT_OVERLAY=y
>> +CONFIG_EFI_CAPSULE_ON_DISK=y
>> +CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
>> diff --git a/configs/rock-pi-4-rk3399_defconfig
>> b/configs/rock-pi-4b-rk3399_defconfig
>> similarity index 100%
>> rename from configs/rock-pi-4-rk3399_defconfig
>> rename to configs/rock-pi-4b-rk3399_defconfig
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5
2023-04-13 2:18 ` [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 Kever Yang
@ 2023-04-25 8:15 ` FUKAUMI Naoki
0 siblings, 0 replies; 6+ messages in thread
From: FUKAUMI Naoki @ 2023-04-25 8:15 UTC (permalink / raw)
To: Kever Yang, u-boot; +Cc: sjg, philipp.tomsich
hi,
On 4/13/23 11:18, Kever Yang wrote:
>
> On 2023/4/8 17:11, FUKAUMI Naoki wrote:
>> sync *.dts{,i} files for Radxa ROCK Pi 4 series with Linux 6.3-rc5.
>>
>> Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
this is not merged yet, right?
I want to modify this change.
Best regards,
--
FUKAUMI Naoki
> Thanks,
> - Kever
>> ---
>> arch/arm/dts/Makefile | 2 +
>> arch/arm/dts/rk3399-rock-pi-4.dtsi | 229 ++++++++++++------
>> .../dts/rk3399-rock-pi-4a-plus-u-boot.dtsi | 5 +
>> arch/arm/dts/rk3399-rock-pi-4a-plus.dts | 25 ++
>> arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi | 6 +
>> .../dts/rk3399-rock-pi-4b-plus-u-boot.dtsi | 5 +
>> arch/arm/dts/rk3399-rock-pi-4b-plus.dts | 61 +++++
>> arch/arm/dts/rk3399-rock-pi-4b.dts | 9 +-
>> arch/arm/dts/rk3399-rock-pi-4c.dts | 20 +-
>> 9 files changed, 284 insertions(+), 78 deletions(-)
>> create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
>> create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-plus.dts
>> create mode 100644 arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
>> create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
>> create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-plus.dts
>>
>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> index c160e884bf..8a5eb6225c 100644
>> --- a/arch/arm/dts/Makefile
>> +++ b/arch/arm/dts/Makefile
>> @@ -157,7 +157,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
>> rk3399-puma-haikou.dtb \
>> rk3399-roc-pc.dtb \
>> rk3399-roc-pc-mezzanine.dtb \
>> + rk3399-rock-pi-4a-plus.dtb \
>> rk3399-rock-pi-4a.dtb \
>> + rk3399-rock-pi-4b-plus.dtb \
>> rk3399-rock-pi-4b.dtb \
>> rk3399-rock-pi-4c.dtb \
>> rk3399-rock960.dtb \
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi
>> b/arch/arm/dts/rk3399-rock-pi-4.dtsi
>> index b28888ea92..907071d4fe 100644
>> --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi
>> +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi
>> @@ -6,14 +6,15 @@
>> /dts-v1/;
>> #include <dt-bindings/input/linux-event-codes.h>
>> +#include <dt-bindings/leds/common.h>
>> #include <dt-bindings/pwm/pwm.h>
>> #include "rk3399.dtsi"
>> #include "rk3399-opp.dtsi"
>> / {
>> aliases {
>> - mmc0 = &sdmmc;
>> - mmc1 = &sdhci;
>> + mmc0 = &sdhci;
>> + mmc1 = &sdmmc;
>> };
>> chosen {
>> @@ -27,6 +28,20 @@
>> #clock-cells = <0>;
>> };
>> + leds {
>> + compatible = "gpio-leds";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&user_led2>;
>> +
>> + /* USER_LED2 */
>> + led-0 {
>> + function = LED_FUNCTION_STATUS;
>> + color = <LED_COLOR_ID_BLUE>;
>> + gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
>> + linux,default-trigger = "heartbeat";
>> + };
>> + };
>> +
>> sdio_pwrseq: sdio-pwrseq {
>> compatible = "mmc-pwrseq-simple";
>> clocks = <&rk808 1>;
>> @@ -36,32 +51,56 @@
>> reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
>> };
>> - vcc12v_dcin: dc-12v {
>> + sound: sound {
>> + compatible = "audio-graph-card";
>> + label = "Analog";
>> + dais = <&i2s0_p0>;
>> + };
>> +
>> + sound-dit {
>> + compatible = "audio-graph-card";
>> + label = "SPDIF";
>> + dais = <&spdif_p0>;
>> + };
>> +
>> + spdif-dit {
>> + compatible = "linux,spdif-dit";
>> + #sound-dai-cells = <0>;
>> +
>> + port {
>> + dit_p0_0: endpoint {
>> + remote-endpoint = <&spdif_p0_0>;
>> + };
>> + };
>> + };
>> +
>> + vbus_typec: vbus-typec-regulator {
>> compatible = "regulator-fixed";
>> - regulator-name = "vcc12v_dcin";
>> + enable-active-high;
>> + gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&vcc5v0_typec_en>;
>> + regulator-name = "vbus_typec";
>> regulator-always-on;
>> - regulator-boot-on;
>> - regulator-min-microvolt = <12000000>;
>> - regulator-max-microvolt = <12000000>;
>> + vin-supply = <&vcc5v0_sys>;
>> };
>> - vcc5v0_sys: vcc-sys {
>> + vcc12v_dcin: dc-12v {
>> compatible = "regulator-fixed";
>> - regulator-name = "vcc5v0_sys";
>> + regulator-name = "vcc12v_dcin";
>> regulator-always-on;
>> regulator-boot-on;
>> - regulator-min-microvolt = <5000000>;
>> - regulator-max-microvolt = <5000000>;
>> - vin-supply = <&vcc12v_dcin>;
>> + regulator-min-microvolt = <12000000>;
>> + regulator-max-microvolt = <12000000>;
>> };
>> - vcc_0v9: vcc-0v9 {
>> + vcc3v3_lan: vcc3v3-lan-regulator {
>> compatible = "regulator-fixed";
>> - regulator-name = "vcc_0v9";
>> + regulator-name = "vcc3v3_lan";
>> regulator-always-on;
>> regulator-boot-on;
>> - regulator-min-microvolt = <900000>;
>> - regulator-max-microvolt = <900000>;
>> + regulator-min-microvolt = <3300000>;
>> + regulator-max-microvolt = <3300000>;
>> vin-supply = <&vcc3v3_sys>;
>> };
>> @@ -98,35 +137,35 @@
>> vin-supply = <&vcc5v0_sys>;
>> };
>> - vcc5v0_typec: vcc5v0-typec-regulator {
>> + vcc5v0_sys: vcc-sys {
>> compatible = "regulator-fixed";
>> - enable-active-high;
>> - gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
>> - pinctrl-names = "default";
>> - pinctrl-0 = <&vcc5v0_typec_en>;
>> - regulator-name = "vcc5v0_typec";
>> + regulator-name = "vcc5v0_sys";
>> regulator-always-on;
>> - vin-supply = <&vcc5v0_sys>;
>> + regulator-boot-on;
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5000000>;
>> + vin-supply = <&vcc12v_dcin>;
>> };
>> - vcc_lan: vcc3v3-phy-regulator {
>> + vcc_0v9: vcc-0v9 {
>> compatible = "regulator-fixed";
>> - regulator-name = "vcc_lan";
>> + regulator-name = "vcc_0v9";
>> regulator-always-on;
>> regulator-boot-on;
>> - regulator-min-microvolt = <3300000>;
>> - regulator-max-microvolt = <3300000>;
>> + regulator-min-microvolt = <900000>;
>> + regulator-max-microvolt = <900000>;
>> + vin-supply = <&vcc3v3_sys>;
>> };
>> vdd_log: vdd-log {
>> compatible = "pwm-regulator";
>> pwms = <&pwm2 0 25000 1>;
>> + pwm-supply = <&vcc5v0_sys>;
>> regulator-name = "vdd_log";
>> regulator-always-on;
>> regulator-boot-on;
>> regulator-min-microvolt = <800000>;
>> regulator-max-microvolt = <1400000>;
>> - vin-supply = <&vcc5v0_sys>;
>> };
>> };
>> @@ -162,7 +201,7 @@
>> assigned-clocks = <&cru SCLK_RMII_SRC>;
>> assigned-clock-parents = <&clkin_gmac>;
>> clock_in_out = "input";
>> - phy-supply = <&vcc_lan>;
>> + phy-supply = <&vcc3v3_lan>;
>> phy-mode = "rgmii";
>> pinctrl-names = "default";
>> pinctrl-0 = <&rgmii_pins>;
>> @@ -180,6 +219,8 @@
>> };
>> &hdmi {
>> + avdd-0v9-supply = <&vcca0v9_hdmi>;
>> + avdd-1v8-supply = <&vcca1v8_hdmi>;
>> ddc-i2c-bus = <&i2c3>;
>> pinctrl-names = "default";
>> pinctrl-0 = <&hdmi_cec>;
>> @@ -267,8 +308,8 @@
>> };
>> };
>> - vcc1v8_codec: LDO_REG1 {
>> - regulator-name = "vcc1v8_codec";
>> + vcca1v8_codec: LDO_REG1 {
>> + regulator-name = "vcca1v8_codec";
>> regulator-always-on;
>> regulator-boot-on;
>> regulator-min-microvolt = <1800000>;
>> @@ -278,8 +319,8 @@
>> };
>> };
>> - vcc1v8_hdmi: LDO_REG2 {
>> - regulator-name = "vcc1v8_hdmi";
>> + vcca1v8_hdmi: LDO_REG2 {
>> + regulator-name = "vcca1v8_hdmi";
>> regulator-always-on;
>> regulator-boot-on;
>> regulator-min-microvolt = <1800000>;
>> @@ -336,8 +377,8 @@
>> };
>> };
>> - vcc0v9_hdmi: LDO_REG7 {
>> - regulator-name = "vcc0v9_hdmi";
>> + vcca0v9_hdmi: LDO_REG7 {
>> + regulator-name = "vcca0v9_hdmi";
>> regulator-always-on;
>> regulator-boot-on;
>> regulator-min-microvolt = <900000>;
>> @@ -422,6 +463,20 @@
>> i2c-scl-rising-time-ns = <300>;
>> i2c-scl-falling-time-ns = <15>;
>> status = "okay";
>> +
>> + es8316: codec@11 {
>> + compatible = "everest,es8316";
>> + reg = <0x11>;
>> + clocks = <&cru SCLK_I2S_8CH_OUT>;
>> + clock-names = "mclk";
>> + #sound-dai-cells = <0>;
>> +
>> + port {
>> + es8316_p0_0: endpoint {
>> + remote-endpoint = <&i2s0_p0_0>;
>> + };
>> + };
>> + };
>> };
>> &i2c3 {
>> @@ -441,12 +496,19 @@
>> rockchip,capture-channels = <2>;
>> rockchip,playback-channels = <2>;
>> status = "okay";
>> +
>> + i2s0_p0: port {
>> + i2s0_p0_0: endpoint {
>> + dai-format = "i2s";
>> + mclk-fs = <256>;
>> + remote-endpoint = <&es8316_p0_0>;
>> + };
>> + };
>> };
>> &i2s1 {
>> rockchip,playback-channels = <2>;
>> rockchip,capture-channels = <2>;
>> - status = "okay";
>> };
>> &i2s2 {
>> @@ -454,21 +516,10 @@
>> };
>> &io_domains {
>> - status = "okay";
>> -
>> + audio-supply = <&vcca1v8_codec>;
>> bt656-supply = <&vcc_3v0>;
>> - audio-supply = <&vcc_3v0>;
>> - sdmmc-supply = <&vcc_sdio>;
>> gpio1830-supply = <&vcc_3v0>;
>> -};
>> -
>> -&pmu_io_domains {
>> - status = "okay";
>> -
>> - pmu1830-supply = <&vcc_3v0>;
>> -};
>> -
>> -&pcie_phy {
>> + sdmmc-supply = <&vcc_sdio>;
>> status = "okay";
>> };
>> @@ -483,6 +534,10 @@
>> status = "okay";
>> };
>> +&pcie_phy {
>> + status = "okay";
>> +};
>> +
>> &pinctrl {
>> bt {
>> bt_enable_h: bt-enable-h {
>> @@ -498,26 +553,25 @@
>> };
>> };
>> - pcie {
>> - pcie_pwr_en: pcie-pwr-en {
>> - rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
>> + es8316 {
>> + hp_detect: hp-detect {
>> + rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
>> };
>> - };
>> - sdio0 {
>> - sdio0_bus4: sdio0-bus4 {
>> - rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
>> - <2 RK_PC5 1 &pcfg_pull_up_20ma>,
>> - <2 RK_PC6 1 &pcfg_pull_up_20ma>,
>> - <2 RK_PC7 1 &pcfg_pull_up_20ma>;
>> + hp_int: hp-int {
>> + rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
>> };
>> + };
>> - sdio0_cmd: sdio0-cmd {
>> - rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
>> + leds {
>> + user_led2: user-led2 {
>> + rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
>> };
>> + };
>> - sdio0_clk: sdio0-clk {
>> - rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
>> + pcie {
>> + pcie_pwr_en: pcie-pwr-en {
>> + rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
>> };
>> };
>> @@ -535,6 +589,23 @@
>> };
>> };
>> + sdio0 {
>> + sdio0_bus4: sdio0-bus4 {
>> + rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
>> + <2 RK_PC5 1 &pcfg_pull_up_20ma>,
>> + <2 RK_PC6 1 &pcfg_pull_up_20ma>,
>> + <2 RK_PC7 1 &pcfg_pull_up_20ma>;
>> + };
>> +
>> + sdio0_cmd: sdio0-cmd {
>> + rockchip,pins = <2 RK_PD0 1 &pcfg_pull_up_20ma>;
>> + };
>> +
>> + sdio0_clk: sdio0-clk {
>> + rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
>> + };
>> + };
>> +
>> usb-typec {
>> vcc5v0_typec_en: vcc5v0-typec-en {
>> rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
>> @@ -558,6 +629,11 @@
>> };
>> };
>> +&pmu_io_domains {
>> + pmu1830-supply = <&vcc_3v0>;
>> + status = "okay";
>> +};
>> +
>> &pwm2 {
>> status = "okay";
>> };
>> @@ -568,6 +644,14 @@
>> vref-supply = <&vcc_1v8>;
>> };
>> +&sdhci {
>> + bus-width = <8>;
>> + mmc-hs400-1_8v;
>> + mmc-hs400-enhanced-strobe;
>> + non-removable;
>> + status = "okay";
>> +};
>> +
>> &sdio0 {
>> #address-cells = <1>;
>> #size-cells = <0>;
>> @@ -595,12 +679,13 @@
>> status = "okay";
>> };
>> -&sdhci {
>> - bus-width = <8>;
>> - mmc-hs400-1_8v;
>> - mmc-hs400-enhanced-strobe;
>> - non-removable;
>> - status = "okay";
>> +&spdif {
>> +
>> + spdif_p0: port {
>> + spdif_p0_0: endpoint {
>> + remote-endpoint = <&dit_p0_0>;
>> + };
>> + };
>> };
>> &tcphy0 {
>> @@ -675,13 +760,13 @@
>> status = "okay";
>> };
>> -&usbdrd_dwc3_0 {
>> +&usbdrd3_1 {
>> status = "okay";
>> - dr_mode = "host";
>> };
>> -&usbdrd3_1 {
>> +&usbdrd_dwc3_0 {
>> status = "okay";
>> + dr_mode = "host";
>> };
>> &usbdrd_dwc3_1 {
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
>> b/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
>> new file mode 100644
>> index 0000000000..5c1c451b8f
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-rock-pi-4a-plus-u-boot.dtsi
>> @@ -0,0 +1,5 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2023 Radxa Limited
>> + */
>> +#include "rk3399-rock-pi-4-u-boot.dtsi"
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
>> b/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
>> new file mode 100644
>> index 0000000000..f5a68d8d07
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-rock-pi-4a-plus.dts
>> @@ -0,0 +1,25 @@
>> +// 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"
>> +#include "rk3399-op1-opp.dtsi"
>> +
>> +/ {
>> + model = "Radxa ROCK Pi 4A+";
>> + compatible = "radxa,rockpi4a-plus", "radxa,rockpi4",
>> "rockchip,rk3399";
>> +};
>> +
>> +&es8316 {
>> + pinctrl-0 = <&hp_detect &hp_int>;
>> + pinctrl-names = "default";
>> + interrupt-parent = <&gpio1>;
>> + interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
>> +};
>> +
>> +&sound {
>> + hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
>> +};
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
>> b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
>> new file mode 100644
>> index 0000000000..85ee5770ad
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#include "rk3399-rock-pi-4-u-boot.dtsi"
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
>> b/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
>> new file mode 100644
>> index 0000000000..5c1c451b8f
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-rock-pi-4b-plus-u-boot.dtsi
>> @@ -0,0 +1,5 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2023 Radxa Limited
>> + */
>> +#include "rk3399-rock-pi-4-u-boot.dtsi"
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
>> b/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
>> new file mode 100644
>> index 0000000000..cec3b7b1b9
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-rock-pi-4b-plus.dts
>> @@ -0,0 +1,61 @@
>> +// 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"
>> +#include "rk3399-op1-opp.dtsi"
>> +
>> +/ {
>> + model = "Radxa ROCK Pi 4B+";
>> + compatible = "radxa,rockpi4b-plus", "radxa,rockpi4",
>> "rockchip,rk3399";
>> +
>> + aliases {
>> + mmc2 = &sdio0;
>> + };
>> +};
>> +
>> +&es8316 {
>> + pinctrl-0 = <&hp_detect &hp_int>;
>> + pinctrl-names = "default";
>> + interrupt-parent = <&gpio1>;
>> + interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
>> +};
>> +
>> +&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>;
>> + };
>> +};
>> +
>> +&sound {
>> + hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
>> +};
>> +
>> +&uart0 {
>> + status = "okay";
>> +
>> + bluetooth {
>> + compatible = "brcm,bcm4345c5";
>> + clocks = <&rk808 1>;
>> + clock-names = "lpo";
>> + 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>;
>> + max-speed = <1500000>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
>> + vbat-supply = <&vcc3v3_sys>;
>> + vddio-supply = <&vcc_1v8>;
>> + };
>> +};
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4b.dts
>> b/arch/arm/dts/rk3399-rock-pi-4b.dts
>> index 6c63e61706..0806545922 100644
>> --- a/arch/arm/dts/rk3399-rock-pi-4b.dts
>> +++ b/arch/arm/dts/rk3399-rock-pi-4b.dts
>> @@ -23,7 +23,7 @@
>> compatible = "brcm,bcm4329-fmac";
>> reg = <1>;
>> interrupt-parent = <&gpio0>;
>> - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
>> + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
>> interrupt-names = "host-wake";
>> pinctrl-names = "default";
>> pinctrl-0 = <&wifi_host_wake_l>;
>> @@ -34,13 +34,16 @@
>> status = "okay";
>> bluetooth {
>> - compatible = "brcm,bcm43438-bt";
>> + compatible = "brcm,bcm4345c5";
>> clocks = <&rk808 1>;
>> - clock-names = "ext_clock";
>> + clock-names = "lpo";
>> 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>;
>> + max-speed = <1500000>;
>> pinctrl-names = "default";
>> pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
>> + vbat-supply = <&vcc3v3_sys>;
>> + vddio-supply = <&vcc_1v8>;
>> };
>> };
>> diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts
>> b/arch/arm/dts/rk3399-rock-pi-4c.dts
>> index 99169bcd51..4053ba7261 100644
>> --- a/arch/arm/dts/rk3399-rock-pi-4c.dts
>> +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts
>> @@ -17,6 +17,13 @@
>> };
>> };
>> +&es8316 {
>> + pinctrl-0 = <&hp_detect &hp_int>;
>> + pinctrl-names = "default";
>> + interrupt-parent = <&gpio1>;
>> + interrupts = <RK_PA1 IRQ_TYPE_LEVEL_HIGH>;
>> +};
>> +
>> &sdio0 {
>> status = "okay";
>> @@ -24,25 +31,32 @@
>> compatible = "brcm,bcm4329-fmac";
>> reg = <1>;
>> interrupt-parent = <&gpio0>;
>> - interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
>> + interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
>> interrupt-names = "host-wake";
>> pinctrl-names = "default";
>> pinctrl-0 = <&wifi_host_wake_l>;
>> };
>> };
>> +&sound {
>> + hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
>> +};
>> +
>> &uart0 {
>> status = "okay";
>> bluetooth {
>> - compatible = "brcm,bcm43438-bt";
>> + compatible = "brcm,bcm4345c5";
>> clocks = <&rk808 1>;
>> - clock-names = "ext_clock";
>> + clock-names = "lpo";
>> 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>;
>> + max-speed = <1500000>;
>> pinctrl-names = "default";
>> pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
>> + vbat-supply = <&vcc3v3_sys>;
>> + vddio-supply = <&vcc_1v8>;
>> };
>> };
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-25 8:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-08 9:11 [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 FUKAUMI Naoki
2023-04-08 9:11 ` [PATCH 2/2] configs: rk3399: add Radxa ROCK Pi 4 variants FUKAUMI Naoki
2023-04-13 2:22 ` Kever Yang
2023-04-18 2:41 ` FUKAUMI Naoki
2023-04-13 2:18 ` [PATCH 1/2] arm: dts: rk3399: rock-pi-4: sync with Linux 6.3-rc5 Kever Yang
2023-04-25 8:15 ` FUKAUMI Naoki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.