mirror of
https://github.com/armbian/build.git
synced 2025-09-17 19:51:31 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: afaulkner420 <afaulkner420@gmail.com>
|
|
Date: Fri, 25 Mar 2022 19:23:56 +0000
|
|
Subject: Move sun50i-h6-pwm settings to its own overlay
|
|
|
|
---
|
|
arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-fixup.scr-cmd | 14 ------
|
|
arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-pwm.dtso | 25 ++++++++++
|
|
2 files changed, 25 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-fixup.scr-cmd b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-fixup.scr-cmd
|
|
index d8e79ba4531b..f757db7aa4ad 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-fixup.scr-cmd
|
|
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-fixup.scr-cmd
|
|
@@ -54,20 +54,6 @@ if test "${param_pps_falling_edge}" = "1"; then
|
|
fdt set /pps@0 assert-falling-edge
|
|
fi
|
|
|
|
-for f in ${overlays}; do
|
|
- if test "${f}" = "pwm"; then
|
|
- setenv bootargs_new ""
|
|
- for arg in ${bootargs}; do
|
|
- if test "${arg}" = "console=ttyS0,115200"; then
|
|
- echo "Warning: Disabling ttyS0 console due to enabled PWM overlay"
|
|
- else
|
|
- setenv bootargs_new "${bootargs_new} ${arg}"
|
|
- fi
|
|
- done
|
|
- setenv bootargs "${bootargs_new}"
|
|
- fi
|
|
-done
|
|
-
|
|
if test -n "${param_w1_pin}"; then
|
|
setenv tmp_bank "${param_w1_pin}"
|
|
setenv tmp_pin "${param_w1_pin}"
|
|
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-pwm.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-pwm.dtso
|
|
new file mode 100644
|
|
index 000000000000..a8aa74ed1988
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h6-pwm.dtso
|
|
@@ -0,0 +1,25 @@
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+ compatible = "allwinner,sun50i-h6-pwm";
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&pio>;
|
|
+ __overlay__ {
|
|
+ pwm_pin: pwm-pin {
|
|
+ pins = "PD22";
|
|
+ function = "pwm";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target = <&pwm>;
|
|
+ __overlay__ {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pwm_pin>;
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+};
|
|
--
|
|
Armbian
|
|
|