7d5f1dbda1
Some patches were part of other linux-mainline kernel versions but are not anymore part of the current 4.19.76. Move 0001-Enable-uart3-for-NanoPi-Neo-Air-used-by-BT.patch in linux-mainline_4.19.76.bbappend to avoid error patching file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Hunk #2 FAILED at 162. 1 out of 2 hunks FAILED -- rejects in file arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts Place all patches from Armbian in a separate directory and do all the Balena specific operations in linux-mainline_%.bbappend only. Changelog-entry: Remove unused patches and cleanup Signed-off-by: Vicentiu Galanopulo <vicentiu@balena.io>
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
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 = <1100000>;
|
|
+ regulator-ramp-delay = <50>; /* 4ms */
|
|
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
|
|
+ gpios-states = <0x1>;
|
|
+ states = <1100000 0x0
|
|
+ 1100000 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";
|
|
};
|