-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
112 additions
and
154 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
From 3483ece41f29f1bc6fae1579f9042419238ffc01 Mon Sep 17 00:00:00 2001 | ||
From 93cb335f2a9e55db328fa75c1583af922f12a21b Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Sat, 20 Oct 2018 07:21:10 +0000 | ||
Subject: [PATCH 1/7] arm: dts: sunxi: H3 NanoPi - add missing ethernet0 alias | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/arch/arm/dts/sun8i-h3-nanopi.dtsi b/arch/arm/dts/sun8i-h3-nanopi.dtsi | ||
index f110ee3822..1abadcb215 100644 | ||
index 4df29a6531..1e840d62dd 100644 | ||
--- a/arch/arm/dts/sun8i-h3-nanopi.dtsi | ||
+++ b/arch/arm/dts/sun8i-h3-nanopi.dtsi | ||
@@ -51,6 +51,7 @@ | ||
|
@@ -18,5 +18,5 @@ index f110ee3822..1abadcb215 100644 | |
|
||
chosen { | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
From 5747483e0031baef160ca17d1c6e14b8249e4a98 Mon Sep 17 00:00:00 2001 | ||
From 468a5d8b5bac4ce9f8a795209af199a60feb3b6d Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Sun, 27 Oct 2019 18:48:41 +0100 | ||
Date: Fri, 8 May 2020 10:40:30 +0200 | ||
Subject: [PATCH 2/7] Add Ethernet on Banana Pi M2 Zero board | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | ||
index 7d01f93226..5770240a82 100644 | ||
index d277d04303..489a7669d9 100644 | ||
--- a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | ||
+++ b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | ||
@@ -20,6 +20,7 @@ | ||
|
@@ -17,39 +16,7 @@ index 7d01f93226..5770240a82 100644 | |
}; | ||
|
||
chosen { | ||
@@ -48,6 +49,23 @@ | ||
}; | ||
}; | ||
|
||
+ reg_vdd_cpux: vdd-cpux-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>; /* 4ms */ | ||
+ | ||
+ gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */ | ||
+ enable-active-high; | ||
+ gpios-states = <0x1>; | ||
+ states = <1100000 0x0 | ||
+ 1300000 0x1>; | ||
+ }; | ||
+ | ||
wifi_pwrseq: wifi_pwrseq { | ||
compatible = "mmc-pwrseq-simple"; | ||
pinctrl-names = "default"; | ||
@@ -55,10 +73,21 @@ | ||
}; | ||
}; | ||
|
||
+&cpu0 { | ||
+ cpu-supply = <®_vdd_cpux>; | ||
+}; | ||
+ | ||
&ehci0 { | ||
@@ -78,6 +79,13 @@ | ||
status = "okay"; | ||
}; | ||
|
||
|
@@ -64,26 +31,21 @@ index 7d01f93226..5770240a82 100644 | |
vmmc-supply = <®_vcc3v3>; | ||
bus-width = <4>; | ||
diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig | ||
index 933ec4db43..40b7b434d9 100644 | ||
index f95c7faf7e..126b94f391 100644 | ||
--- a/configs/bananapi_m2_zero_defconfig | ||
+++ b/configs/bananapi_m2_zero_defconfig | ||
@@ -3,10 +3,16 @@ CONFIG_ARCH_SUNXI=y | ||
@@ -3,6 +3,11 @@ CONFIG_ARCH_SUNXI=y | ||
CONFIG_SPL=y | ||
CONFIG_MACH_SUN8I_H3=y | ||
CONFIG_DRAM_CLK=408 | ||
+CONFIG_NR_DRAM_BANKS=1 | ||
CONFIG_MMC0_CD_PIN="" | ||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set | ||
CONFIG_USE_PREBOOT=y | ||
# CONFIG_CMD_FLASH is not set | ||
# CONFIG_SPL_DOS_PARTITION is not set | ||
+# CONFIG_SPL_ISO_PARTITION is not set | ||
# CONFIG_SPL_EFI_PARTITION is not set | ||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" | ||
+CONFIG_CONSOLE_MUX=y | ||
+CONFIG_SUN8I_EMAC=y | ||
+CONFIG_USB_EHCI_HCD=y | ||
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,15 @@ | ||
From f709ad05ddae4a702743bd914c6db8413ee8b275 Mon Sep 17 00:00:00 2001 | ||
From 7f83b98ae3589f743d4a95e69e3d9028200145e4 Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Sun, 27 Oct 2019 18:49:52 +0100 | ||
Date: Fri, 8 May 2020 10:42:11 +0200 | ||
Subject: [PATCH 3/7] Update configuration for Orange Pi Zero | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig | ||
index f8dda05c08..f10c25822d 100644 | ||
index c989f0dcf7..cc3b34cd07 100644 | ||
--- a/configs/orangepi_zero_defconfig | ||
+++ b/configs/orangepi_zero_defconfig | ||
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y | ||
CONFIG_NR_DRAM_BANKS=1 | ||
@@ -2,7 +2,7 @@ CONFIG_ARM=y | ||
CONFIG_ARCH_SUNXI=y | ||
CONFIG_SPL=y | ||
CONFIG_MACH_SUN8I_H3=y | ||
-CONFIG_DRAM_CLK=624 | ||
|
@@ -19,5 +18,5 @@ index f8dda05c08..f10c25822d 100644 | |
CONFIG_SPL_SPI_SUNXI=y | ||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
From f50daa0e909633bdf0edbea3188d29ae90d02f3b Mon Sep 17 00:00:00 2001 | ||
From 812dd62f81e3e07ac31b8b798cf348004e3b4a72 Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Sun, 4 Nov 2018 09:16:09 +0000 | ||
Date: Fri, 8 May 2020 10:45:24 +0200 | ||
Subject: [PATCH 4/7] ARM: dts: sun8i: Enable HDMI on Banana Pi M2 Zero board | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | ||
index 5770240a82..956287c5f5 100644 | ||
index 489a7669d9..ef1f0d8473 100644 | ||
--- a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | ||
+++ b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | ||
@@ -27,6 +27,17 @@ | ||
|
@@ -26,8 +25,8 @@ index 5770240a82..956287c5f5 100644 | |
+ | ||
leds { | ||
compatible = "gpio-leds"; | ||
pinctrl-names = "default"; | ||
@@ -77,6 +88,10 @@ | ||
|
||
@@ -75,6 +86,10 @@ | ||
cpu-supply = <®_vdd_cpux>; | ||
}; | ||
|
||
|
@@ -38,7 +37,7 @@ index 5770240a82..956287c5f5 100644 | |
&ehci0 { | ||
status = "okay"; | ||
}; | ||
@@ -88,6 +103,16 @@ | ||
@@ -86,6 +101,16 @@ | ||
status = "okay"; | ||
}; | ||
|
||
|
@@ -56,5 +55,5 @@ index 5770240a82..956287c5f5 100644 | |
vmmc-supply = <®_vcc3v3>; | ||
bus-width = <4>; | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,14 @@ | ||
From da0c59489bc1b2201965d7ba14f582bf55f8bae0 Mon Sep 17 00:00:00 2001 | ||
From 63eb9cf48ccb3435a29eea9a37364348a8844c68 Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Fri, 16 Nov 2018 20:23:17 +0000 | ||
Date: Fri, 8 May 2020 11:10:02 +0200 | ||
Subject: [PATCH 5/7] Add support for Banana Pi P2 Zero board | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile | ||
index 62da168ef8..7a43f64b0a 100644 | ||
index 820ee9733a..443d36f984 100644 | ||
--- a/arch/arm/dts/Makefile | ||
+++ b/arch/arm/dts/Makefile | ||
@@ -487,6 +487,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ | ||
@@ -516,6 +516,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ | ||
sun8i-a83t-tbs-a711.dtb | ||
dtb-$(CONFIG_MACH_SUN8I_H3) += \ | ||
sun8i-h2-plus-bananapi-m2-zero.dtb \ | ||
|
@@ -19,10 +18,10 @@ index 62da168ef8..7a43f64b0a 100644 | |
sun8i-h2-plus-orangepi-zero.dtb \ | ||
diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts | ||
new file mode 100644 | ||
index 0000000000..d234506501 | ||
index 0000000000..14f2589413 | ||
--- /dev/null | ||
+++ b/arch/arm/dts/sun8i-h2-plus-bananapi-p2-zero.dts | ||
@@ -0,0 +1,181 @@ | ||
@@ -0,0 +1,182 @@ | ||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||
+/* | ||
+ * Based on sun8i-h2-plus-bananapi-m2-zero.dts, which is: | ||
|
@@ -179,13 +178,14 @@ index 0000000000..d234506501 | |
+ | ||
+&uart0 { | ||
+ pinctrl-names = "default"; | ||
+ pinctrl-0 = <&uart0_pins_a>; | ||
+ pinctrl-0 = <&uart0_pa_pins>; | ||
+ status = "okay"; | ||
+}; | ||
+ | ||
+&uart1 { | ||
+ pinctrl-names = "default"; | ||
+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; | ||
+ uart-has-rtscts; | ||
+ status = "okay"; | ||
+}; | ||
+ | ||
|
@@ -230,5 +230,5 @@ index 0000000000..c8206d9d93 | |
+CONFIG_USB_EHCI_HCD=y | ||
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,22 @@ | ||
From 7d37b11000409236fdb8b783ad7fdfd24258ab91 Mon Sep 17 00:00:00 2001 | ||
From 279f6046d61cbb5b103065428b8627f39588431e Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Sun, 27 Oct 2019 18:52:32 +0100 | ||
Date: Fri, 8 May 2020 10:46:52 +0200 | ||
Subject: [PATCH 6/7] Orange Pi One - update configuration | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig | ||
index 4fe81f8ab9..66b116e7a3 100644 | ||
index 75bccd03b9..35d21fbfb7 100644 | ||
--- a/configs/orangepi_one_defconfig | ||
+++ b/configs/orangepi_one_defconfig | ||
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y | ||
CONFIG_NR_DRAM_BANKS=1 | ||
@@ -2,7 +2,7 @@ CONFIG_ARM=y | ||
CONFIG_ARCH_SUNXI=y | ||
CONFIG_SPL=y | ||
CONFIG_MACH_SUN8I_H3=y | ||
-CONFIG_DRAM_CLK=672 | ||
+CONFIG_DRAM_CLK=408 | ||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set | ||
CONFIG_USE_PREBOOT=y | ||
# CONFIG_CMD_FLASH is not set | ||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one" | ||
CONFIG_SUN8I_EMAC=y | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,15 @@ | ||
From 3a1bd00015bfc4f3e3283f67ac2b5e38a6ee8a65 Mon Sep 17 00:00:00 2001 | ||
From a59b4d0ecc703c79a9d8ada73ca487f949ba91f9 Mon Sep 17 00:00:00 2001 | ||
From: Edmunt Pienkowsky <[email protected]> | ||
Date: Sun, 27 Oct 2019 18:54:08 +0100 | ||
Date: Fri, 8 May 2020 10:48:00 +0200 | ||
Subject: [PATCH 7/7] Orange Pi R1 - update configuration | ||
|
||
Signed-off-by: Edmunt Pienkowsky <[email protected]> | ||
|
||
diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig | ||
index e0a530d4b8..6f053fd754 100644 | ||
index 6f770fa018..27da0dfd06 100644 | ||
--- a/configs/orangepi_r1_defconfig | ||
+++ b/configs/orangepi_r1_defconfig | ||
@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y | ||
CONFIG_NR_DRAM_BANKS=1 | ||
@@ -2,7 +2,7 @@ CONFIG_ARM=y | ||
CONFIG_ARCH_SUNXI=y | ||
CONFIG_SPL=y | ||
CONFIG_MACH_SUN8I_H3=y | ||
-CONFIG_DRAM_CLK=624 | ||
|
@@ -19,5 +18,5 @@ index e0a530d4b8..6f053fd754 100644 | |
CONFIG_SPL_SPI_SUNXI=y | ||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set | ||
-- | ||
2.23.0 | ||
2.26.2 | ||
|
Oops, something went wrong.