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>
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
From 2f34ae32f5e74096540cd7ce95bfd467cb74b21a Mon Sep 17 00:00:00 2001
|
|
From: Vivek Unune <npcomplete13@gmail.com>
|
|
Date: Wed, 4 Nov 2020 15:29:51 -0500
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Use corretc pinctrl compatible for 4709x
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
BCM47094 version of pinmux uses different compatible and supports MDIO
|
|
pinmux pins. Hence, use the correct compatible string and defines the
|
|
MDIO pins group.
|
|
|
|
Signed-off-by: Vivek Unune <npcomplete13@gmail.com>
|
|
Acked-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm47094.dtsi | 9 +++++++++
|
|
arch/arm/boot/dts/bcm5301x.dtsi | 2 +-
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm47094.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm47094.dtsi
|
|
@@ -8,6 +8,15 @@
|
|
/ {
|
|
};
|
|
|
|
+&pinctrl {
|
|
+ compatible = "brcm,bcm4709-pinmux";
|
|
+
|
|
+ pinmux_mdio: mdio {
|
|
+ groups = "mdio_grp";
|
|
+ function = "mdio";
|
|
+ };
|
|
+};
|
|
+
|
|
&usb3_phy {
|
|
compatible = "brcm,ns-bx-usb3-phy";
|
|
};
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -430,7 +430,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
- pin-controller@1c0 {
|
|
+ pinctrl: pin-controller@1c0 {
|
|
compatible = "brcm,bcm4708-pinmux";
|
|
reg = <0x1c0 0x24>;
|
|
reg-names = "cru_gpio_control";
|