Skip to contentSkip to conversation

ARM: dts: OMAP2+: Fix boot with multi_v7_defconfig

PATCH In review Roger Quadros 3 participants 6 messages Feb 10, 2014 – Feb 11, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: OMAP2+: Fix boot with multi_v7_defconfig

The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are.

This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig

---
 arch/arm/boot/dts/omap3.dtsi | 2 +-
 arch/arm/boot/dts/omap4.dtsi | 2 +-
 arch/arm/boot/dts/omap5.dtsi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
index a5fc83b..6b5dbf8 100644
@@ -641,7 +641,7 @@
 			};
 
 			usbhsehci: ehci at 48064800 {
-				compatible = "ti,ehci-omap", "usb-ehci";
+				compatible = "ti,ehci-omap";
 				reg = <0x48064800 0x400>;
 				interrupt-parent = <&intc>;
 				interrupts = <77>;
arch/arm/boot/dts/omap4.dtsi +1 -1
index d3f8a6e..f5d754b 100644
@@ -706,7 +706,7 @@
 			};
 
 			usbhsehci: ehci at 4a064c00 {
-				compatible = "ti,ehci-omap", "usb-ehci";
+				compatible = "ti,ehci-omap";
 				reg = <0x4a064c00 0x400>;
 				interrupt-parent = <&gic>;
 				interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/omap5.dtsi +1 -1
index a72813a..42fcffd 100644
@@ -784,7 +784,7 @@
 			};
 
 			usbhsehci: ehci at 4a064c00 {
-				compatible = "ti,ehci-omap", "usb-ehci";
+				compatible = "ti,ehci-omap";
 				reg = <0x4a064c00 0x400>;
 				interrupt-parent = <&gic>;
 				interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
1.8.3.2
#1 lore raw

$subject probably needs clarity.

Quoted 2 lines · Roger Quadros

The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are.

might want to refer to the change in drivers/usb/host/ehci-platform.c that created this regression as well.

we also probably want to make better explanation about this issue and why we think this is the correct fix for it - for example, question Kevin asked in [1]

Quoted 7 lines

This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig

---

[1] http://marc.info/?t=139204803900004&r=1&w=2

Signature · 2 lines
Regards,
Nishanth Menon
#2 lore raw
In reply to Roger Quadros
Quoted 8 lines · Roger Quadros

The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are.

This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig

Please ignore this patch as Hans has agreed to do a more proper fix in

http://article.gmane.org/gmane.comp.hardware.netbook.arm.sunxi/7015

cheers,
-roger

Quoted 46 lines
---
 arch/arm/boot/dts/omap3.dtsi | 2 +-
 arch/arm/boot/dts/omap4.dtsi | 2 +-
 arch/arm/boot/dts/omap5.dtsi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
index a5fc83b..6b5dbf8 100644
@@ -641,7 +641,7 @@
 			};
 
 			usbhsehci: ehci at 48064800 {
-				compatible = "ti,ehci-omap", "usb-ehci";
+				compatible = "ti,ehci-omap";
 				reg = <0x48064800 0x400>;
 				interrupt-parent = <&intc>;
 				interrupts = <77>;
arch/arm/boot/dts/omap4.dtsi +1 -1
index d3f8a6e..f5d754b 100644
@@ -706,7 +706,7 @@
 			};
 
 			usbhsehci: ehci at 4a064c00 {
-				compatible = "ti,ehci-omap", "usb-ehci";
+				compatible = "ti,ehci-omap";
 				reg = <0x4a064c00 0x400>;
 				interrupt-parent = <&gic>;
 				interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/omap5.dtsi +1 -1
index a72813a..42fcffd 100644
@@ -784,7 +784,7 @@
 			};
 
 			usbhsehci: ehci at 4a064c00 {
-				compatible = "ti,ehci-omap", "usb-ehci";
+				compatible = "ti,ehci-omap";
 				reg = <0x4a064c00 0x400>;
 				interrupt-parent = <&gic>;
 				interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
#3 lore raw
Quoted 7 lines · Roger Quadros
Quoted 6 lines · Roger Quadros

The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are.

This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig

Quoted 6 lines
Quoted 2 lines

Please ignore this patch as Hans has agreed to do a more proper fix in

http://article.gmane.org/gmane.comp.hardware.netbook.arm.sunxi/7015

umm.. even then, drivers/usb/host/ehci-ppc-of.c claims compatibility with usb,ehci -> and we wont function with that driver either.

Signature · 2 lines
Regards,
Nishanth Menon
#4 lore raw

Hi,

Quoted 8 lines · Nishanth Menon
Quoted 7 lines · Roger Quadros
Quoted 6 lines · Roger Quadros

The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are.

This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Please ignore this patch as Hans has agreed to do a more proper fix in

http://article.gmane.org/gmane.comp.hardware.netbook.arm.sunxi/7015

umm.. even then, drivers/usb/host/ehci-ppc-of.c claims compatibility with usb,ehci -> and we wont function with that driver either.

Right, but that has never been an issue as no kernel will ever include both ppc and omap support.

Regards,

Hans

#5 lore raw
Quoted 12 lines · Hans de Goede
Quoted 11 lines · Nishanth Menon
Quoted 10 lines · Roger Quadros
Quoted 8 lines · Roger Quadros

The OMAP EHCI controller is not compatible with the EHCI platform HCD driver so don't claim that we are.

This fixes boot on OMAP platforms with CONFIG_USB_EHCI_HCD_PLATFORM=y e.g. multi_v7_defconfig

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Please ignore this patch as Hans has agreed to do a more proper fix in

http://article.gmane.org/gmane.comp.hardware.netbook.arm.sunxi/7015

umm.. even then, drivers/usb/host/ehci-ppc-of.c claims compatibility with usb,ehci -> and we wont function with that driver either.

Right, but that has never been an issue as no kernel will ever include both ppc and omap support.

Conceptually, we have compatibility string today in dts description that maps a driver that cant ever handle the device. I dont have strong opinions either way.. just something i noticed with a git grep..

Signature · 2 lines
Regards,
Nishanth Menon