Support the user LED available on the latest revision of the PCB. Also rebase the patchset ontop of the Raspberry Pi kernel 1.20210928.
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
From 60125e49aff88c430ebc6b8702aaf3867f529b75 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <60125e49aff88c430ebc6b8702aaf3867f529b75.1635895105.git.stefan@agner.ch>
|
|
In-Reply-To: <fa42d0ece205b3c2a8a06dac3e4436400cf59978.1635895105.git.stefan@agner.ch>
|
|
References: <fa42d0ece205b3c2a8a06dac3e4436400cf59978.1635895105.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Thu, 4 Mar 2021 14:33:09 +0100
|
|
Subject: [PATCH 2/7] ARM: dts: bcm2711: amber: Mux UART4 for SiLabs radio
|
|
module
|
|
|
|
Enable UART4 by default and mux pins including hardware flow control.
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts
|
|
index 855da2b029a4..ba4116cdffc4 100644
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4-ha-amber.dts
|
|
@@ -21,6 +21,7 @@ memory@0 {
|
|
};
|
|
|
|
aliases {
|
|
+ serial4 = &uart4;
|
|
emmc2bus = &emmc2bus;
|
|
ethernet0 = &genet;
|
|
pcie0 = &pcie0;
|
|
@@ -321,6 +322,14 @@ &uart1 {
|
|
status = "okay";
|
|
};
|
|
|
|
+/* uart4 for Zigbee */
|
|
+&uart4 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&uart4_pins>;
|
|
+ uart-has-rtscts;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&vchiq {
|
|
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
|
|
};
|
|
@@ -549,9 +558,9 @@ uart3_pins: uart3_pins {
|
|
};
|
|
|
|
uart4_pins: uart4_pins {
|
|
- brcm,pins = <8 9>;
|
|
+ brcm,pins = <8 9 10 11>;
|
|
brcm,function = <BCM2835_FSEL_ALT4>;
|
|
- brcm,pull = <0 2>;
|
|
+ brcm,pull = <0 2 2 0>;
|
|
};
|
|
|
|
uart5_pins: uart5_pins {
|
|
--
|
|
2.33.1
|
|
|