mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 09:11:49 +00:00
a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
|
|
index 506e25b..bc42210 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
|
|
@@ -65,14 +65,15 @@
|
|
compatible = "gpio-leds";
|
|
|
|
pwr {
|
|
- label = "nanopi:green:pwr";
|
|
- gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
|
|
- default-state = "on";
|
|
+ label = "nanopi:red:pwr";
|
|
+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
|
|
+ linux,default-trigger = "default-on";
|
|
};
|
|
|
|
status {
|
|
- label = "nanopi:red:status";
|
|
- gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>;
|
|
+ label = "nanopi:green:status";
|
|
+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
|
|
+ linux,default-trigger = "heartbeat";
|
|
};
|
|
};
|
|
|
|
@@ -104,7 +105,7 @@
|
|
regulator-min-microvolt = <1100000>;
|
|
regulator-max-microvolt = <1300000>;
|
|
regulator-ramp-delay = <50>; /* 4ms */
|
|
- gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
|
|
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
|
|
gpios-states = <0x1>;
|
|
states = <1100000 0x0
|
|
1300000 0x1>;
|
|
@@ -118,6 +119,10 @@
|
|
};
|
|
};
|
|
|
|
+&cpu0 {
|
|
+ cpu-supply = <&vdd_cpux>;
|
|
+};
|
|
+
|
|
&codec {
|
|
allwinner,audio-routing =
|
|
"Line Out", "LINEOUT",
|