mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
b3b855191b
Kernel 5.10 receives the complete set of improvements from 5.11/5.12. While we are at it, move the patches accepted upstream to the 0xx series. Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
62 lines
1.8 KiB
Diff
62 lines
1.8 KiB
Diff
From d29b67c220caf5f4905e1f1576e71bcb6de4af9e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
Date: Sun, 15 Nov 2020 14:59:19 +0100
|
|
Subject: ARM: dts: turris-omnia: describe switch interrupt
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Describe switch interrupt for Turris Omnia so that the CPU does not have
|
|
to poll the switch. We also need to to set mpp45 pin to gpio function
|
|
for this.
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Fixes: 26ca8b52d6e1 ("ARM: dts: add support for Turris Omnia")
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
|
|
Cc: Jason Cooper <jason@lakedaemon.net>
|
|
Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
Cc: Andreas Färber <afaerber@suse.de>
|
|
Cc: Andrew Lunn <andrew@lunn.ch>
|
|
Cc: Rob Herring <robh+dt@kernel.org>
|
|
Cc: devicetree@vger.kernel.org
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
arch/arm/boot/dts/armada-385-turris-omnia.dts | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
|
|
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
|
|
@@ -261,13 +261,18 @@
|
|
|
|
/* Switch MV88E6176 at address 0x10 */
|
|
switch@10 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&swint_pins>;
|
|
compatible = "marvell,mv88e6085";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
- dsa,member = <0 0>;
|
|
|
|
+ dsa,member = <0 0>;
|
|
reg = <0x10>;
|
|
|
|
+ interrupt-parent = <&gpio1>;
|
|
+ interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
|
|
+
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -320,6 +325,11 @@
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
+ swint_pins: swint-pins {
|
|
+ marvell,pins = "mpp45";
|
|
+ marvell,function = "gpio";
|
|
+ };
|
|
+
|
|
spi0cs0_pins: spi0cs0-pins {
|
|
marvell,pins = "mpp25";
|
|
marvell,function = "spi0";
|