mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2024-11-16 10:18:23 +01:00
Merge pull request #404 from linux-sunxi/kirkstone-nanopi-r1
u-boot:Added fixes for nanopi-r1 board
This commit is contained in:
Marek Belisko
GitHub
commit
48472ebf37
@ -0,0 +1,204 @@
|
|||||||
|
From 4ac73cb006bf34108ca280812e48942989a3575b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marek Belisko <marek.belisko@gmail.com>
|
||||||
|
Date: Wed, 24 Apr 2024 15:06:58 +0200
|
||||||
|
Subject: [PATCH] Added dtb for sun8i-h3-nanopi-r1 device
|
||||||
|
|
||||||
|
Taken from mainline: 2c597855aa17d11520da642d03c82ff0c68042ab
|
||||||
|
|
||||||
|
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/Makefile | 1 +
|
||||||
|
arch/arm/dts/sun8i-h3-nanopi-r1.dts | 169 ++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 170 insertions(+)
|
||||||
|
create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
|
||||||
|
index 9a9be76e6d..7a984510fe 100644
|
||||||
|
--- a/arch/arm/dts/Makefile
|
||||||
|
+++ b/arch/arm/dts/Makefile
|
||||||
|
@@ -589,6 +589,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
|
||||||
|
sun8i-h3-nanopi-m1-plus.dtb \
|
||||||
|
sun8i-h3-nanopi-neo.dtb \
|
||||||
|
sun8i-h3-nanopi-neo-air.dtb \
|
||||||
|
+ sun8i-h3-nanopi-r1.dtb \
|
||||||
|
sun8i-h3-orangepi-2.dtb \
|
||||||
|
sun8i-h3-orangepi-lite.dtb \
|
||||||
|
sun8i-h3-orangepi-one.dtb \
|
||||||
|
diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..42cd1131ad
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
||||||
|
@@ -0,0 +1,169 @@
|
||||||
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||||
|
+/*
|
||||||
|
+ * Copyright (C) 2019 Igor Pecovnik <igor@armbian.com>
|
||||||
|
+ * Copyright (C) 2020 Jayantajit Gogoi <jayanta.gogoi525@gmail.com>
|
||||||
|
+ * Copyright (C) 2020 Yu-Tung Chang <mtwget@gmail.com>
|
||||||
|
+*/
|
||||||
|
+
|
||||||
|
+#include "sun8i-h3-nanopi.dtsi"
|
||||||
|
+#include <dt-bindings/leds/common.h>
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ model = "FriendlyARM NanoPi R1";
|
||||||
|
+ compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3";
|
||||||
|
+
|
||||||
|
+ aliases {
|
||||||
|
+ serial1 = &uart1;
|
||||||
|
+ ethernet0 = &emac;
|
||||||
|
+ ethernet1 = &wifi;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_gmac_3v3: gmac-3v3 {
|
||||||
|
+ compatible = "regulator-fixed";
|
||||||
|
+ regulator-name = "gmac-3v3";
|
||||||
|
+ regulator-min-microvolt = <3300000>;
|
||||||
|
+ regulator-max-microvolt = <3300000>;
|
||||||
|
+ startup-delay-us = <100000>;
|
||||||
|
+ enable-active-high;
|
||||||
|
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ reg_vdd_cpux: gpio-regulator {
|
||||||
|
+ compatible = "regulator-gpio";
|
||||||
|
+ regulator-name = "vdd-cpux";
|
||||||
|
+ regulator-type = "voltage";
|
||||||
|
+ regulator-boot-on;
|
||||||
|
+ regulator-always-on;
|
||||||
|
+ regulator-min-microvolt = <1100000>;
|
||||||
|
+ regulator-max-microvolt = <1300000>;
|
||||||
|
+ regulator-ramp-delay = <50>;
|
||||||
|
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
|
||||||
|
+ gpios-states = <0x1>;
|
||||||
|
+ states = <1100000 0x0>,
|
||||||
|
+ <1300000 0x1>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ wifi_pwrseq: wifi_pwrseq {
|
||||||
|
+ compatible = "mmc-pwrseq-simple";
|
||||||
|
+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
|
||||||
|
+ clocks = <&rtc CLK_OSC32K_FANOUT>;
|
||||||
|
+ clock-names = "ext_clock";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ leds {
|
||||||
|
+ led-2 {
|
||||||
|
+ function = LED_FUNCTION_WAN;
|
||||||
|
+ color = <LED_COLOR_ID_GREEN>;
|
||||||
|
+ gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ led-3 {
|
||||||
|
+ function = LED_FUNCTION_LAN;
|
||||||
|
+ color = <LED_COLOR_ID_GREEN>;
|
||||||
|
+ gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; /* PA9 */
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&cpu0 {
|
||||||
|
+ cpu-supply = <®_vdd_cpux>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ehci1 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ehci2 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&emac {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&emac_rgmii_pins>;
|
||||||
|
+ phy-supply = <®_gmac_3v3>;
|
||||||
|
+ phy-handle = <&ext_rgmii_phy>;
|
||||||
|
+ phy-mode = "rgmii-id";
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&external_mdio {
|
||||||
|
+ ext_rgmii_phy: ethernet-phy@7 {
|
||||||
|
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||||
|
+ reg = <7>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&mmc1 {
|
||||||
|
+ vmmc-supply = <®_vcc3v3>;
|
||||||
|
+ vqmmc-supply = <®_vcc3v3>;
|
||||||
|
+ mmc-pwrseq = <&wifi_pwrseq>;
|
||||||
|
+ bus-width = <4>;
|
||||||
|
+ non-removable;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ wifi: wifi@1 {
|
||||||
|
+ reg = <1>;
|
||||||
|
+ compatible = "brcm,bcm4329-fmac";
|
||||||
|
+ interrupt-parent = <&pio>;
|
||||||
|
+ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
|
||||||
|
+ interrupt-names = "host-wake";
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&mmc2 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&mmc2_8bit_pins>;
|
||||||
|
+ vmmc-supply = <®_vcc3v3>;
|
||||||
|
+ vqmmc-supply = <®_vcc3v3>;
|
||||||
|
+ bus-width = <8>;
|
||||||
|
+ non-removable;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ohci1 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ohci2 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+®_usb0_vbus {
|
||||||
|
+ gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&uart1 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&uart1_pins>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&uart3 {
|
||||||
|
+ pinctrl-names = "default";
|
||||||
|
+ pinctrl-0 = <&uart3_pins>, <&uart3_rts_cts_pins>;
|
||||||
|
+ uart-has-rtscts;
|
||||||
|
+ status = "okay";
|
||||||
|
+
|
||||||
|
+ bluetooth {
|
||||||
|
+ compatible = "brcm,bcm43438-bt";
|
||||||
|
+ clocks = <&rtc CLK_OSC32K_FANOUT>;
|
||||||
|
+ clock-names = "lpo";
|
||||||
|
+ vbat-supply = <®_vcc3v3>;
|
||||||
|
+ vddio-supply = <®_vcc3v3>;
|
||||||
|
+ device-wakeup-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */
|
||||||
|
+ host-wakeup-gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA7 */
|
||||||
|
+ shutdown-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&usb_otg {
|
||||||
|
+ status = "okay";
|
||||||
|
+ dr_mode = "otg";
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&usbphy {
|
||||||
|
+ usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
|
||||||
|
+ usb0_vbus-supply = <®_usb0_vbus>;
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
35
recipes-bsp/u-boot/files/0006-nanopi-r1-dts-fixes.patch
Normal file
35
recipes-bsp/u-boot/files/0006-nanopi-r1-dts-fixes.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 08aab303e36a3da19d49f111e5f2ad7d85b642fd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marek Belisko <marek.belisko@gmail.com>
|
||||||
|
Date: Wed, 24 Apr 2024 15:32:12 +0200
|
||||||
|
Subject: [PATCH] nanopi-r1: dts fixes
|
||||||
|
|
||||||
|
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
|
||||||
|
---
|
||||||
|
arch/arm/dts/sun8i-h3-nanopi-r1.dts | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
||||||
|
index 42cd1131ad..26e2e6172e 100644
|
||||||
|
--- a/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
||||||
|
+++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts
|
||||||
|
@@ -46,7 +46,7 @@
|
||||||
|
wifi_pwrseq: wifi_pwrseq {
|
||||||
|
compatible = "mmc-pwrseq-simple";
|
||||||
|
reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
|
||||||
|
- clocks = <&rtc CLK_OSC32K_FANOUT>;
|
||||||
|
+ clocks = <&rtc 1>;
|
||||||
|
clock-names = "ext_clock";
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -147,7 +147,7 @@
|
||||||
|
|
||||||
|
bluetooth {
|
||||||
|
compatible = "brcm,bcm43438-bt";
|
||||||
|
- clocks = <&rtc CLK_OSC32K_FANOUT>;
|
||||||
|
+ clocks = <&rtc 1>;
|
||||||
|
clock-names = "lpo";
|
||||||
|
vbat-supply = <®_vcc3v3>;
|
||||||
|
vddio-supply = <®_vcc3v3>;
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
@ -16,6 +16,8 @@ SRC_URI:append:sunxi = " \
|
|||||||
file://0002-Added-nanopi-r1-board-support.patch \
|
file://0002-Added-nanopi-r1-board-support.patch \
|
||||||
file://0003-Add-nanopi-duo2-board-support.patch \
|
file://0003-Add-nanopi-duo2-board-support.patch \
|
||||||
file://0004-i2c-mvtwsi-Add-compatible-string-for-allwinner-sun4i.patch \
|
file://0004-i2c-mvtwsi-Add-compatible-string-for-allwinner-sun4i.patch \
|
||||||
|
file://0005-Added-dtb-for-sun8i-h3-nanopi-r1-device.patch \
|
||||||
|
file://0006-nanopi-r1-dts-fixes.patch \
|
||||||
file://boot.cmd \
|
file://boot.cmd \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user