mirror of
https://github.com/armbian/build.git
synced 2025-09-19 04:31:38 +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
120 lines
3.1 KiB
Diff
120 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: The-going <48602507+The-going@users.noreply.github.com>
|
|
Date: Sun, 23 Jan 2022 20:49:27 +0300
|
|
Subject: arm64:dts: sun50i-h6 Add r_uart uart2-3 pins
|
|
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 60 ++++++++--
|
|
1 file changed, 50 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
index 48ae4a362502..a039a90302c5 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
|
|
@@ -310,6 +310,17 @@ msgbox: mailbox@3003000 {
|
|
#mbox-cells = <1>;
|
|
};
|
|
|
|
+ gic: interrupt-controller@3021000 {
|
|
+ compatible = "arm,gic-400";
|
|
+ reg = <0x03021000 0x1000>,
|
|
+ <0x03022000 0x2000>,
|
|
+ <0x03024000 0x2000>,
|
|
+ <0x03026000 0x2000>;
|
|
+ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
|
+ interrupt-controller;
|
|
+ #interrupt-cells = <3>;
|
|
+ };
|
|
+
|
|
sid: efuse@3006000 {
|
|
compatible = "allwinner,sun50i-h6-sid";
|
|
reg = <0x03006000 0x400>;
|
|
@@ -369,6 +380,7 @@ pio: pinctrl@300b000 {
|
|
interrupt-controller;
|
|
#interrupt-cells = <3>;
|
|
|
|
+ /omit-if-no-ref/
|
|
ext_rgmii_pins: rgmii-pins {
|
|
pins = "PD0", "PD1", "PD2", "PD3", "PD4",
|
|
"PD5", "PD7", "PD8", "PD9", "PD10",
|
|
@@ -414,6 +426,7 @@ mmc1_pins: mmc1-pins {
|
|
bias-pull-up;
|
|
};
|
|
|
|
+ /omit-if-no-ref/
|
|
mmc2_pins: mmc2-pins {
|
|
pins = "PC1", "PC4", "PC5", "PC6",
|
|
"PC7", "PC8", "PC9", "PC10",
|
|
@@ -467,17 +480,26 @@ uart1_rts_cts_pins: uart1-rts-cts-pins {
|
|
pins = "PG8", "PG9";
|
|
function = "uart1";
|
|
};
|
|
- };
|
|
|
|
- gic: interrupt-controller@3021000 {
|
|
- compatible = "arm,gic-400";
|
|
- reg = <0x03021000 0x1000>,
|
|
- <0x03022000 0x2000>,
|
|
- <0x03024000 0x2000>,
|
|
- <0x03026000 0x2000>;
|
|
- interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
|
- interrupt-controller;
|
|
- #interrupt-cells = <3>;
|
|
+ uart2_pins: uart2-pins {
|
|
+ pins = "PD19", "PD20";
|
|
+ function = "uart2";
|
|
+ };
|
|
+
|
|
+ uart2_rts_cts_pins: uart2-rts-cts-pins {
|
|
+ pins = "PD21", "PD22";
|
|
+ function = "uart2";
|
|
+ };
|
|
+
|
|
+ uart3_pins: uart3-pins {
|
|
+ pins = "PD23", "PD24";
|
|
+ function = "uart3";
|
|
+ };
|
|
+
|
|
+ uart3_rts_cts_pins: uart3-rts-cts-pins {
|
|
+ pins = "PD25", "PD26";
|
|
+ function = "uart3";
|
|
+ };
|
|
};
|
|
|
|
iommu: iommu@30f0000 {
|
|
@@ -964,6 +986,19 @@ tcon_tv_out_tcon_top: endpoint@1 {
|
|
};
|
|
};
|
|
|
|
+ r_uart: serial@7080000 {
|
|
+ compatible = "snps,dw-apb-uart";
|
|
+ reg = <0x07080000 0x400>;
|
|
+ interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ reg-shift = <2>;
|
|
+ reg-io-width = <4>;
|
|
+ clocks = <&r_ccu CLK_R_APB2_UART>;
|
|
+ resets = <&r_ccu RST_R_APB2_UART>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&r_uart_pins>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
rtc: rtc@7000000 {
|
|
compatible = "allwinner,sun50i-h6-rtc";
|
|
reg = <0x07000000 0x400>;
|
|
@@ -1029,6 +1064,11 @@ r_rsb_pins: r-rsb-pins {
|
|
pins = "PL0", "PL1";
|
|
function = "s_rsb";
|
|
};
|
|
+
|
|
+ r_uart_pins: r-uart-pins {
|
|
+ pins = "PL2", "PL3";
|
|
+ function = "s_uart";
|
|
+ };
|
|
};
|
|
|
|
r_ir: ir@7040000 {
|
|
--
|
|
Armbian
|
|
|