BananaPi BPI-M4-ZERO: u-boot-v2024.04 fixups

Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
This commit is contained in:
Patrick Yavitz
2024-10-03 13:46:52 -04:00
committed by Igor
parent 3062f3c8f4
commit c141cb5ac9

View File

@@ -1,6 +1,6 @@
From 188b1762f16a64dd9751b74e5b8bff31bcaf14c7 Mon Sep 17 00:00:00 2001
From 7d8e0f45333efa9556feb71650f54df1a19304cd Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Sat, 28 Sep 2024 23:41:10 -0400
Date: Thu, 3 Oct 2024 00:06:37 -0400
Subject: [PATCH] Add board BananaPi BPI-M4-ZERO
sun50i-h618-bananapi-m4-zero.dts
@@ -9,10 +9,10 @@ sun50i-h618-bananapi-m4.dtsi
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-h618-bananapi-m4-zero.dts | 39 +++
arch/arm/dts/sun50i-h618-bananapi-m4.dtsi | 233 ++++++++++++++++++
arch/arm/dts/sun50i-h618-bananapi-m4-zero.dts | 39 ++++
arch/arm/dts/sun50i-h618-bananapi-m4.dtsi | 211 ++++++++++++++++++
configs/bananapi_m4zero_defconfig | 29 +++
4 files changed, 302 insertions(+)
4 files changed, 280 insertions(+)
create mode 100644 arch/arm/dts/sun50i-h618-bananapi-m4-zero.dts
create mode 100644 arch/arm/dts/sun50i-h618-bananapi-m4.dtsi
create mode 100644 configs/bananapi_m4zero_defconfig
@@ -76,10 +76,10 @@ index 0000000000..1d234abdb0
+};
diff --git a/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi b/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi
new file mode 100644
index 0000000000..7363c5a97a
index 0000000000..9b1381a764
--- /dev/null
+++ b/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi
@@ -0,0 +1,233 @@
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
@@ -143,32 +143,12 @@ index 0000000000..7363c5a97a
+ regulator-always-on;
+ };
+
+ reg_vcc3v3: regulator-vcc3v3 {
+ /* SY8089 DC/DC converter */
+ compatible = "regulator-fixed";
+ regulator-name = "vcc-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ vin-supply = <&reg_dldo1>;
+ };
+
+ reg_vcc1v8: regulator-vcc1v8 {
+ /* Always on 1.8V/300mA regulator for WiFi and BT IO */
+ compatible = "regulator-fixed";
+ regulator-name = "vcc-1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ vin-supply = <&reg_aldo1>;
+ };
+
+ wifi_pwrseq: wifi-pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ clocks = <&rtc CLK_OSC32K_FANOUT>;
+ clock-names = "ext_clock";
+ pinctrl-0 = <&x32clk_fanout_pin>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&clk_losc_32k_pin>;
+ post-power-on-delay-ms = <200>;
+ reset-gpios = <&pio 6 18 GPIO_ACTIVE_LOW>; /* PG18 */
+ };
@@ -180,8 +160,8 @@ index 0000000000..7363c5a97a
+
+&emac0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ext_rgmii_pins>;
+ pinctrl-names = "default";
+ phy-mode = "rgmii";
+ phy-handle = <&ext_rgmii_phy>;
+ phy-supply = <&reg_dldo1>;
@@ -191,8 +171,8 @@ index 0000000000..7363c5a97a
+
+&ir {
+ status = "disabled";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ir_rx_pin>;
+ pinctrl-names = "default";
+};
+
+&mdio0 {
@@ -213,14 +193,19 @@ index 0000000000..7363c5a97a
+
+&mmc1 {
+ status = "disabled";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc1_pins>;
+ bus-width = <4>;
+ non-removable;
+ mmc-ddr-1_8v;
+ mmc-pwrseq = <&wifi_pwrseq>;
+ vmmc-supply = <&reg_vcc3v3>;
+ vqmmc-supply = <&reg_vcc1v8>;
+ vmmc-supply = <&reg_dldo1>;
+ vqmmc-supply = <&reg_aldo1>;
+
+ sdio_wifi: wifi@1 {
+ reg = <1>;
+ compatible = "brcm,bcm4329-fmac";
+ interrupt-parent = <&pio>;
+ interrupts = <6 15 IRQ_TYPE_LEVEL_LOW>; /* PG15 */
+ interrupt-names = "host-wake";
+ };
+};
+
+&mmc2 {
@@ -239,13 +224,6 @@ index 0000000000..7363c5a97a
+ vcc-pg-supply = <&reg_dldo1>;
+ vcc-ph-supply = <&reg_dldo1>;
+ vcc-pi-supply = <&reg_dldo1>;
+
+ clk_losc_32k_pin: clk-losc-32k-pin {
+ pins = "PG10";
+ function = "clock";
+ drive-strength = <20>;
+ bias-pull-up;
+ };
+};
+
+&r_i2c {
@@ -303,14 +281,14 @@ index 0000000000..7363c5a97a
+
+&uart0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_ph_pins>;
+ pinctrl-names = "default";
+};
+
+&uart1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+ pinctrl-names = "default";
+ uart-has-rtscts;
+};
diff --git a/configs/bananapi_m4zero_defconfig b/configs/bananapi_m4zero_defconfig
@@ -351,3 +329,32 @@ index 0000000000..3442bd0c77
--
2.39.5
From 80a712ebaba783f51cf852cf4c7dea76085ab406 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@armbian.com>
Date: Thu, 3 Oct 2024 00:28:43 -0400
Subject: [PATCH] Add pinctrl: x32clk_fanout_pin
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
---
arch/arm/dts/sun50i-h618-bananapi-m4.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi b/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi
index 9b1381a764..d231d80946 100644
--- a/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi
+++ b/arch/arm/dts/sun50i-h618-bananapi-m4.dtsi
@@ -142,6 +142,11 @@
vcc-pg-supply = <&reg_dldo1>;
vcc-ph-supply = <&reg_dldo1>;
vcc-pi-supply = <&reg_dldo1>;
+
+ x32clk_fanout_pin: x32clk-fanout-pin {
+ pins = "PG10";
+ function = "clock";
+ };
};
&r_i2c {
--
2.39.5