mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
6c945fa379
Removed upstreamed:
bcm53xx/patches-5.10/033-v5.16-0024-ARM-dts-BCM5301X-Fix-I2C-controller-interrupt.patch[1]
bcm53xx/patches-5.10/033-v5.16-0025-ARM-dts-BCM5301X-Add-interrupt-properties-to-GPIO-no.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=b2cd6fdcbe0a5cb44e4610a08cc58261d494a885
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.83&id=9db1d4a3c2700e1cc84c3d61199411d75c2a3ec6
Build system: x86_64*
Build-tested: bcm2711/RPi4B, ipq806x/R7800†
Run-tested: bcm2711/RPi4B, ipq806x/R7800†
* Had to revert 7c99085bd6 in order to build
(latest bump of ca-certificates)
† Had to revert 7f1edbd412 in order to build
(binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)
Signed-off-by: John Audia <graysky@archlinux.us>
53 lines
1.3 KiB
Diff
53 lines
1.3 KiB
Diff
From bb95d7d440fefd104c593d9cb20da6d34a474e97 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Wed, 21 Apr 2021 11:00:06 +0200
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Fix pinmux subnodes names
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This matches pinmux-node.yaml requirements.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm47094.dtsi | 2 +-
|
|
arch/arm/boot/dts/bcm5301x.dtsi | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm47094.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm47094.dtsi
|
|
@@ -11,7 +11,7 @@
|
|
&pinctrl {
|
|
compatible = "brcm,bcm4709-pinmux";
|
|
|
|
- pinmux_mdio: mdio {
|
|
+ pinmux_mdio: mdio-pins {
|
|
groups = "mdio_grp";
|
|
function = "mdio";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -460,18 +460,18 @@
|
|
function = "spi";
|
|
};
|
|
|
|
- pinmux_i2c: i2c {
|
|
+ pinmux_i2c: i2c-pins {
|
|
groups = "i2c_grp";
|
|
function = "i2c";
|
|
};
|
|
|
|
- pinmux_pwm: pwm {
|
|
+ pinmux_pwm: pwm-pins {
|
|
groups = "pwm0_grp", "pwm1_grp",
|
|
"pwm2_grp", "pwm3_grp";
|
|
function = "pwm";
|
|
};
|
|
|
|
- pinmux_uart1: uart1 {
|
|
+ pinmux_uart1: uart1-pins {
|
|
groups = "uart1_grp";
|
|
function = "uart1";
|
|
};
|