Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
Hello Alexandre, On Fri, Oct 16, 2020 at 09:08:23AM +0200, Alexandre Torgue wrote: > Hi Serge, > > On 10/14/20 12:14 PM, Serge Semin wrote: > > 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(@.*)?" . Let's fix the DTS files, which have the nodes defined with > > incompatible names. > > > > Signed-off-by: Serge Semin > > > > --- > > > > Please, test the patch out to make sure it doesn't brake the dependent DTS > > files. I did only a manual grepping of the possible nodes dependencies. > > --- > > arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- > > arch/arc/boot/dts/hsdk.dts | 4 ++-- > > arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- > > arch/arm/boot/dts/bcm5301x.dtsi| 4 ++-- > > arch/arm/boot/dts/bcm53573.dtsi| 4 ++-- > > arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 ++-- > > arch/arm/boot/dts/lpc18xx.dtsi | 4 ++-- > > arch/arm/boot/dts/stm32mp151.dtsi | 4 ++-- > > arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 ++-- > > arch/arm64/boot/dts/hisilicon/hip06.dtsi | 4 ++-- > > arch/arm64/boot/dts/hisilicon/hip07.dtsi | 4 ++-- > > arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +- > > arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +- > > arch/mips/boot/dts/mti/sead3.dts | 2 +- > > arch/mips/boot/dts/ralink/mt7628a.dtsi | 2 +- > > arch/powerpc/boot/dts/akebono.dts | 6 +++--- > > 16 files changed, 28 insertions(+), 28 deletions(-) > > > > I surely missed something, but we have here in the same patch modifications > for different architectures and different vendors. > > Do you plan to split this patch after getting some Acked-by / Tested-by ? Yeah, I'll split this patch and two next ones up in v3. -Sergey > > regards > Alex > > ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
Hi Serge,
On 10/14/20 12:14 PM, Serge Semin wrote:
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(@.*)?" . Let's fix the DTS files, which have the nodes defined with
incompatible names.
Signed-off-by: Serge Semin
---
Please, test the patch out to make sure it doesn't brake the dependent DTS
files. I did only a manual grepping of the possible nodes dependencies.
---
arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++--
arch/arc/boot/dts/hsdk.dts | 4 ++--
arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +-
arch/arm/boot/dts/bcm5301x.dtsi| 4 ++--
arch/arm/boot/dts/bcm53573.dtsi| 4 ++--
arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 ++--
arch/arm/boot/dts/lpc18xx.dtsi | 4 ++--
arch/arm/boot/dts/stm32mp151.dtsi | 4 ++--
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 ++--
arch/arm64/boot/dts/hisilicon/hip06.dtsi | 4 ++--
arch/arm64/boot/dts/hisilicon/hip07.dtsi | 4 ++--
arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +-
arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +-
arch/mips/boot/dts/mti/sead3.dts | 2 +-
arch/mips/boot/dts/ralink/mt7628a.dtsi | 2 +-
arch/powerpc/boot/dts/akebono.dts | 6 +++---
16 files changed, 28 insertions(+), 28 deletions(-)
I surely missed something, but we have here in the same patch
modifications for different architectures and different vendors.
Do you plan to split this patch after getting some Acked-by / Tested-by ?
regards
Alex
diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi b/arch/arc/boot/dts/axs10x_mb.dtsi
index 99d3e7175bf7..b64435385304 100644
--- a/arch/arc/boot/dts/axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/axs10x_mb.dtsi
@@ -87,13 +87,13 @@ gmac: ethernet@18000 {
mac-address = [00 00 00 00 00 00]; /* Filled in by
U-Boot */
};
- ehci@4 {
+ usb@4 {
compatible = "generic-ehci";
reg = < 0x4 0x100 >;
interrupts = < 8 >;
};
- ohci@6 {
+ usb@6 {
compatible = "generic-ohci";
reg = < 0x6 0x100 >;
interrupts = < 8 >;
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts
index dcaa44e408ac..fdd4f7f635d3 100644
--- a/arch/arc/boot/dts/hsdk.dts
+++ b/arch/arc/boot/dts/hsdk.dts
@@ -234,7 +234,7 @@ phy0: ethernet-phy@0 { /* Micrel KSZ9031 */
};
};
- ohci@6 {
+ usb@6 {
compatible = "snps,hsdk-v1.0-ohci", "generic-ohci";
reg = <0x6 0x100>;
interrupts = <15>;
@@ -242,7 +242,7 @@ ohci@6 {
dma-coherent;
};
- ehci@4 {
+ usb@4 {
compatible = "snps,hsdk-v1.0-ehci", "generic-ehci";
reg = <0x4 0x100>;
interrupts = <15>;
diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
index cbb179770293..90a412026e64 100644
--- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
@@ -46,7 +46,7 @@ ethernet@18000 {
clock-names = "stmmaceth";
};
- ehci@4 {
+ usb@4 {
compatible = "generic-ehci";
reg = < 0x4 0x100 >;
interrupts = < 8 >;
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 0016720ce530..bf5656d79a55 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -261,7 +261,7 @@ usb2: usb2@21000 {
interrupt-parent = <>;
- ehci: ehci@21000 {
+ ehci: usb@21000 {
#usb-cells = <0>;
compatible = "generic-ehci";
@@ -283,7 +283,7 @@ ehci_port2: port@2 {
};
};
- ohci: ohci@22000 {
+ ohci: usb@22000 {
#usb-cells = <0>;
compatible = "generic-ohci";
diff --git a/arch/arm/boot/dts/bcm53573.dtsi b/arch/arm/boot/dts/bcm53573.dtsi
index 4af8e3293cff..51546fccc616 100644
--- a/arch/arm/boot/dts/bcm53573.dtsi
+++ b/arch/arm/boot/dts/bcm53573.dtsi
@@ -135,7 +135,7 @@ usb2: usb2@4000 {
#address-cells = <1>;
#size-cells = <1>;
- ehci: ehci@4000 {
+ ehci: usb@4000 {
compatible = "generic-ehci";
reg = <0x4000
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
On 10/14/20 3:14 AM, Serge Semin wrote: > 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(@.*)?" . Let's fix the DTS files, which have the nodes defined with > incompatible names. > > Signed-off-by: Serge Semin > > --- > > Please, test the patch out to make sure it doesn't brake the dependent DTS > files. I did only a manual grepping of the possible nodes dependencies. > --- > arch/arm/boot/dts/bcm5301x.dtsi| 4 ++-- > arch/arm/boot/dts/bcm53573.dtsi| 4 ++-- Acked-by: Florian Fainelli -- Florian ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
Hi Serge,
On 10/14/20 12:14 PM, Serge Semin wrote:
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(@.*)?" . Let's fix the DTS files, which have the nodes defined with
incompatible names.
Signed-off-by: Serge Semin
diff --git a/arch/arm/boot/dts/stm32mp151.dtsi
b/arch/arm/boot/dts/stm32mp151.dtsi
index bfe29023fbd5..576f7da564c5 100644
--- a/arch/arm/boot/dts/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/stm32mp151.dtsi
@@ -1404,7 +1404,7 @@ ethernet0: ethernet@5800a000 {
status = "disabled";
};
- usbh_ohci: usbh-ohci@5800c000 {
+ usbh_ohci: usb@5800c000 {
compatible = "generic-ohci";
reg = <0x5800c000 0x1000>;
clocks = < USBH>;
@@ -1413,7 +1413,7 @@ usbh_ohci: usbh-ohci@5800c000 {
status = "disabled";
};
- usbh_ehci: usbh-ehci@5800d000 {
+ usbh_ehci: usb@5800d000 {
compatible = "generic-ehci";
reg = <0x5800d000 0x1000>;
clocks = < USBH>;
For STM32MP151:
Acked-by: Amelie Delaunay
Thanks,
Amelie
___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
On Wed, Oct 14, 2020 at 11:41:17AM -0700, Florian Fainelli wrote: > On 10/14/20 11:11 AM, Serge Semin wrote: > > On Wed, Oct 14, 2020 at 11:00:45AM -0700, Florian Fainelli wrote: > >> On 10/14/20 3:14 AM, Serge Semin wrote: > >>> 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(@.*)?" . Let's fix the DTS files, which have the nodes defined with > >>> incompatible names. > >>> > >>> Signed-off-by: Serge Semin > >>> > >>> --- > >>> > >>> Please, test the patch out to make sure it doesn't brake the dependent DTS > >>> files. I did only a manual grepping of the possible nodes dependencies. > >> > > > >> Not sure how you envisioned these change to be picked up, but you may > >> need to split these changes between ARM/ARM64, MIPS and PowerPC at > >> least. And within ARM/ARM64 you will most likely have to split according > >> to the various SoC maintainers. > > > > Hmm, I don't really know how it's going to be done in this case, but there > > must > > be a way to get the cross-platform patches picked up in general. For > > instance, see the patches like: > > 714acdbd1c94 arch: rename copy_thread_tls() back to copy_thread() > > 140c8180eb7c arch: remove HAVE_COPY_THREAD_TLS > > They touched the files from different files, but still have been merged in. > > That situation is different, when a new facility is added and someone > has gone through the work of adding support for all architectures (or > nearly all of them), you want them to be merged in a way that limits > merge conflicts with other architecture changes. > > Here you are fixing warnings, and each file you touch can clearly be > independently change from other files in the series without causing > merge conflicts. You are however creating the potential for merge > conflicts with other changes that the various SoC maintainers have > queued up. > > > Maybe I should have copied these three patches to the > > "linux-a...@vger.kernel.org" > > list or some other mailing list... > > Maybe Rob can queue them through his device tree repository, with the > ack of the various SoC maintainers... That's what I hoped for in the first place. But AFAICS now Rob does the splitting of his patches himself, while the repo is used either for the Documentation/devicetree/ patches or for the Rob'es own work. So it seems to me I'll have to split the series up and resubmit... ( Hope I am wrong. So, @Rob, will you be able to merge this and the next two patches in via your repo or you'd rather suggest for me to split it up and resubmit? -Sergey > -- > Florian ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
Hi Sergey, > arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++-- > arch/arc/boot/dts/hsdk.dts | 4 ++-- > arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- For ARC boards Acked-by: Alexey Brodkin ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
Le mer. 14 oct. 2020 à 13:14, Serge Semin
a écrit :
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(@.*)?" . Let's fix the DTS files, which have the nodes defined
with
incompatible names.
Signed-off-by: Serge Semin
---
Please, test the patch out to make sure it doesn't brake the
dependent DTS
files. I did only a manual grepping of the possible nodes
dependencies.
---
arch/arc/boot/dts/axs10x_mb.dtsi | 4 ++--
arch/arc/boot/dts/hsdk.dts | 4 ++--
arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +-
arch/arm/boot/dts/bcm5301x.dtsi| 4 ++--
arch/arm/boot/dts/bcm53573.dtsi| 4 ++--
arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 ++--
arch/arm/boot/dts/lpc18xx.dtsi | 4 ++--
arch/arm/boot/dts/stm32mp151.dtsi | 4 ++--
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 ++--
arch/arm64/boot/dts/hisilicon/hip06.dtsi | 4 ++--
arch/arm64/boot/dts/hisilicon/hip07.dtsi | 4 ++--
arch/mips/boot/dts/ingenic/jz4740.dtsi | 2 +-
arch/mips/boot/dts/ingenic/jz4770.dtsi | 2 +-
For jz4740.dtsi and jz4770.dtsi:
Acked-by: Paul Cercueil
Cheers,
-Paul
arch/mips/boot/dts/mti/sead3.dts | 2 +-
arch/mips/boot/dts/ralink/mt7628a.dtsi | 2 +-
arch/powerpc/boot/dts/akebono.dts | 6 +++---
16 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arc/boot/dts/axs10x_mb.dtsi
b/arch/arc/boot/dts/axs10x_mb.dtsi
index 99d3e7175bf7..b64435385304 100644
--- a/arch/arc/boot/dts/axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/axs10x_mb.dtsi
@@ -87,13 +87,13 @@ gmac: ethernet@18000 {
mac-address = [00 00 00 00 00 00]; /* Filled in by
U-Boot */
};
- ehci@4 {
+ usb@4 {
compatible = "generic-ehci";
reg = < 0x4 0x100 >;
interrupts = < 8 >;
};
- ohci@6 {
+ usb@6 {
compatible = "generic-ohci";
reg = < 0x6 0x100 >;
interrupts = < 8 >;
diff --git a/arch/arc/boot/dts/hsdk.dts b/arch/arc/boot/dts/hsdk.dts
index dcaa44e408ac..fdd4f7f635d3 100644
--- a/arch/arc/boot/dts/hsdk.dts
+++ b/arch/arc/boot/dts/hsdk.dts
@@ -234,7 +234,7 @@ phy0: ethernet-phy@0 { /* Micrel KSZ9031 */
};
};
- ohci@6 {
+ usb@6 {
compatible = "snps,hsdk-v1.0-ohci", "generic-ohci";
reg = <0x6 0x100>;
interrupts = <15>;
@@ -242,7 +242,7 @@ ohci@6 {
dma-coherent;
};
- ehci@4 {
+ usb@4 {
compatible = "snps,hsdk-v1.0-ehci", "generic-ehci";
reg = <0x4 0x100>;
interrupts = <15>;
diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
index cbb179770293..90a412026e64 100644
--- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
@@ -46,7 +46,7 @@ ethernet@18000 {
clock-names = "stmmaceth";
};
- ehci@4 {
+ usb@4 {
compatible = "generic-ehci";
reg = < 0x4 0x100 >;
interrupts = < 8 >;
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi
b/arch/arm/boot/dts/bcm5301x.dtsi
index 0016720ce530..bf5656d79a55 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -261,7 +261,7 @@ usb2: usb2@21000 {
interrupt-parent = <>;
- ehci: ehci@21000 {
+ ehci: usb@21000 {
#usb-cells = <0>;
compatible = "generic-ehci";
@@ -283,7 +283,7 @@ ehci_port2: port@2 {
};
};
- ohci: ohci@22000 {
+ ohci: usb@22000 {
#usb-cells = <0>;
compatible = "generic-ohci";
diff --git a/arch/arm/boot/dts/bcm53573.dtsi
b/arch/arm/boot/dts/bcm53573.dtsi
index 4af8e3293cff..51546fccc616 100644
--- a/arch/arm/boot/dts/bcm53573.dtsi
+++ b/arch/arm/boot/dts/bcm53573.dtsi
@@ -135,7 +135,7 @@ usb2: usb2@4000 {
#address-cells = <1>;
#size-cells = <1>;
- ehci: ehci@4000 {
+ ehci: usb@4000 {
compatible = "generic-ehci";
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
On 10/14/20 11:11 AM, Serge Semin wrote: > On Wed, Oct 14, 2020 at 11:00:45AM -0700, Florian Fainelli wrote: >> On 10/14/20 3:14 AM, Serge Semin wrote: >>> 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(@.*)?" . Let's fix the DTS files, which have the nodes defined with >>> incompatible names. >>> >>> Signed-off-by: Serge Semin >>> >>> --- >>> >>> Please, test the patch out to make sure it doesn't brake the dependent DTS >>> files. I did only a manual grepping of the possible nodes dependencies. >> > >> Not sure how you envisioned these change to be picked up, but you may >> need to split these changes between ARM/ARM64, MIPS and PowerPC at >> least. And within ARM/ARM64 you will most likely have to split according >> to the various SoC maintainers. > > Hmm, I don't really know how it's going to be done in this case, but there > must > be a way to get the cross-platform patches picked up in general. For > instance, see the patches like: > 714acdbd1c94 arch: rename copy_thread_tls() back to copy_thread() > 140c8180eb7c arch: remove HAVE_COPY_THREAD_TLS > They touched the files from different files, but still have been merged in. That situation is different, when a new facility is added and someone has gone through the work of adding support for all architectures (or nearly all of them), you want them to be merged in a way that limits merge conflicts with other architecture changes. Here you are fixing warnings, and each file you touch can clearly be independently change from other files in the series without causing merge conflicts. You are however creating the potential for merge conflicts with other changes that the various SoC maintainers have queued up. > Maybe I should have copied these three patches to the > "linux-a...@vger.kernel.org" > list or some other mailing list... Maybe Rob can queue them through his device tree repository, with the ack of the various SoC maintainers... -- Florian ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
On Wed, Oct 14, 2020 at 11:00:45AM -0700, Florian Fainelli wrote: > On 10/14/20 3:14 AM, Serge Semin wrote: > > 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(@.*)?" . Let's fix the DTS files, which have the nodes defined with > > incompatible names. > > > > Signed-off-by: Serge Semin > > > > --- > > > > Please, test the patch out to make sure it doesn't brake the dependent DTS > > files. I did only a manual grepping of the possible nodes dependencies. > > Not sure how you envisioned these change to be picked up, but you may > need to split these changes between ARM/ARM64, MIPS and PowerPC at > least. And within ARM/ARM64 you will most likely have to split according > to the various SoC maintainers. Hmm, I don't really know how it's going to be done in this case, but there must be a way to get the cross-platform patches picked up in general. For instance, see the patches like: 714acdbd1c94 arch: rename copy_thread_tls() back to copy_thread() 140c8180eb7c arch: remove HAVE_COPY_THREAD_TLS They touched the files from different files, but still have been merged in. Maybe I should have copied these three patches to the "linux-a...@vger.kernel.org" list or some other mailing list... -Sergey > -- > Florian ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH 18/20] arch: dts: Fix EHCI/OHCI DT nodes name
On 10/14/20 3:14 AM, Serge Semin wrote: > 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(@.*)?" . Let's fix the DTS files, which have the nodes defined with > incompatible names. > > Signed-off-by: Serge Semin > > --- > > Please, test the patch out to make sure it doesn't brake the dependent DTS > files. I did only a manual grepping of the possible nodes dependencies. Not sure how you envisioned these change to be picked up, but you may need to split these changes between ARM/ARM64, MIPS and PowerPC at least. And within ARM/ARM64 you will most likely have to split according to the various SoC maintainers. -- Florian ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
