mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
67978e4ce5
This includes:
1. BCM5301X changes from 5.14 and queued 5.15 stuff
2. NSP changes from 5.11 - 5.15 for kernel 5.10
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit bce00f47e5)
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
|
|
@@ -440,18 +440,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";
|
|
};
|