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>
61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
From 74abbfe99f43eb7466d26d9e48fbeb46b8f3d804 Mon Sep 17 00:00:00 2001
|
|
From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
|
|
Date: Tue, 20 Oct 2020 14:59:37 +0300
|
|
Subject: [PATCH] ARM: dts: BCM5301X: Harmonize EHCI/OHCI DT nodes name
|
|
|
|
In accordance with the Generic EHCI/OHCI bindings the corresponding node
|
|
name is suppose to comply with the Generic USB HCD DT schema, which
|
|
requires the USB nodes to have the name acceptable by the regexp:
|
|
"^usb(@.*)?" . Make sure the "generic-ehci" and "generic-ohci"-compatible
|
|
nodes are correctly named.
|
|
|
|
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
|
|
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/bcm5301x.dtsi | 4 ++--
|
|
arch/arm/boot/dts/bcm53573.dtsi | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -267,7 +267,7 @@
|
|
|
|
interrupt-parent = <&gic>;
|
|
|
|
- ehci: ehci@21000 {
|
|
+ ehci: usb@21000 {
|
|
#usb-cells = <0>;
|
|
|
|
compatible = "generic-ehci";
|
|
@@ -289,7 +289,7 @@
|
|
};
|
|
};
|
|
|
|
- ohci: ohci@22000 {
|
|
+ ohci: usb@22000 {
|
|
#usb-cells = <0>;
|
|
|
|
compatible = "generic-ohci";
|
|
--- a/arch/arm/boot/dts/bcm53573.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm53573.dtsi
|
|
@@ -135,7 +135,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
- ehci: ehci@4000 {
|
|
+ ehci: usb@4000 {
|
|
compatible = "generic-ehci";
|
|
reg = <0x4000 0x1000>;
|
|
interrupt-parent = <&gic>;
|
|
@@ -155,7 +155,7 @@
|
|
};
|
|
};
|
|
|
|
- ohci: ohci@d000 {
|
|
+ ohci: usb@d000 {
|
|
#usb-cells = <0>;
|
|
|
|
compatible = "generic-ohci";
|