qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ sunxi-dev & general ] Remove deprecated patch, add regulator to Neo2 v1.0, set serial console to default where this is logical

This commit is contained in:
Igor Pecovnik 2018-11-21 13:48:13 +01:00
parent a3fb173a62
commit 2fe4470e77
9 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/boards/nanopiair.conf
View File

@ -6,6 +6,7 @@ BOOTCONFIG="nanopi_neo_air_defconfig"
MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir hci_uart rfcomm hidp dhd g_serial"
MODULES_NEXT="brcmfmac g_serial"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
CPUMIN="240000"
CPUMAX="912000"
#

1
config/boards/nanopiduo.conf
View File

@ -6,6 +6,7 @@ MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir xradio_wlan g_serial xradio_wla
MODULES_NEXT="g_serial"
MODULES_BLACKLIST="dhd"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
DEFAULT_CONSOLE="serial"
CPUMIN=240000
CPUMAX=1200000
BUILD_DESKTOP="no"

1
config/boards/nanopifire3.conf
View File

@ -5,6 +5,7 @@ BOOTCONFIG="nanopifire3_defconfig"
#
MODULES=""
MODULES_NEXT="g_serial"
DEFAULT_CONSOLE="serial"
CPUMIN="400000"
CPUMAX="1400000"
#

1
config/boards/nanopineo.conf
View File

@ -6,6 +6,7 @@ BOOTCONFIG="nanopi_neo_defconfig"
MODULES="#w1-sunxi #w1-gpio #w1-therm #sunxi-cir g_serial"
MODULES_NEXT="g_serial"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
CPUMIN="240000"
CPUMAX="912000"
#

1
config/boards/nanopineo2.conf
View File

@ -6,6 +6,7 @@ BOOTCONFIG="nanopi_neo2_defconfig"
MODULES=""
MODULES_NEXT="g_serial"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
CPUMIN="408000"
CPUMAX="816000"
#

1
config/boards/nanopineocore2.conf
View File

@ -6,6 +6,7 @@ BOOTCONFIG="nanopi_neo_core2_defconfig"
MODULES=""
MODULES_NEXT="g_serial"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
CPUMIN="408000"
CPUMAX="1392000"
#

1
config/boards/nanopineoplus2.conf
View File

@ -6,6 +6,7 @@ BOOTCONFIG="nanopi_neo_plus2_defconfig"
MODULES=""
MODULES_NEXT="g_serial"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
CPUMIN="408000"
CPUMAX="816000"
#

32
patch/kernel/sunxi-dev/board-47-05-enable-dvfs-opi-lite.patch
View File

@ -1,32 +0,0 @@
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
index 9b47a0de..2db259ed 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
@@ -89,6 +89,27 @@
gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
};
};
+
+ reg_sy8113b: 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>; /* 4ms */
+
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ enable-active-high;
+ gpios-states = <0x1>;
+ states = <1100000 0x0
+ 1300000 0x1>;
+ };
+};
+
+&cpu0 {
+ cpu-supply = <&reg_sy8113b>;
};
&ehci1 {

52
patch/kernel/sunxi-dev/xxx-nanopineo2v1.0-dvfs.patch Normal file
View File

@ -0,0 +1,52 @@
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
index cc268a697..c839b4c0b 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
@@ -64,12 +64,13 @@
pwr {
label = "nanopi:green:pwr";
gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
- default-state = "on";
+ linux,default-trigger = "default-on";
};
status {
label = "nanopi:blue:status";
gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
};
};
@@ -90,6 +91,21 @@
regulator-max-microvolt = <3300000>;
};
+ vdd_cpux: gpio-regulator {
+ compatible = "regulator-gpio";
+ pinctrl-names = "default";
+ 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 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ gpios-states = <0x1>;
+ states = <1100000 0x0
+ 1300000 0x1>;
+ };
reg_usb0_vbus: usb0-vbus {
compatible = "regulator-fixed";
regulator-name = "usb0-vbus";
@@ -101,6 +117,10 @@
};
};
+&cpu0 {
+ cpu-supply = <&vdd_cpux>;
+};
+
&ehci0 {
status = "okay";
};