ohci-/ehci-platform: Change compatible string to generic-?hci
Subsystems (4)
v2 cover ohci-/ehci-platform: Change compatible string to generic-?hci
Hi Greg,
And here is v2 of my ohci-/ehci-platform fixes for the regression of USB support on various ARM boards I caused in linux-next.
As expected some people still did not like the ?hci-platform compatible string I went for in v1, hence this v2. The good news is it seems everyone seems to be able to live with generic-?hci as compatible now, so it seems this issue is finally settled.
Please add these 2 patches to your usb-next tree, as said in the cover-letter of v1, I'm fine with you squashing these into the first 2 patches of my original series, but if you want them separate to preserve history that is fine too.
Thanks & Regards,
Hans
PATCH v2 1/2 ohci-platform: Change compatible string from usb-ohci to generic-ohci
The initial versions of the devicetree enablement patches for ohci-platform used "ohci-platform" as compatible string. However this was disliked by various reviewers because the platform bus is a Linux invention and devicetree is supposed to be OS agnostic. After much discussion I gave up and went with the generic usb-ohci as requested.
In retro-spect I should have chosen something different, the dts files for many existing boards already claim to be compatible with "usb-ohci", ie they have:
compatible = "ti,ohci-omap3", "usb-ohci";
In theory this should not be a problem since the "ti,ohci-omap3" entry takes presedence, but in practice using a conflicting compatible string is an issue, because it makes which driver gets used depend on driver registration order.
This patch changes the compatible string claimed by ohci-platform to "generic-ohci", avoiding the driver registration / module loading ordering problems.
--- Documentation/devicetree/bindings/usb/usb-ohci.txt | 4 ++-- drivers/usb/host/ohci-platform.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/usb/usb-ohci.txt +2 -2
@@ -1,7 +1,7 @@ USB OHCI controllers Required properties: -- compatible : "usb-ohci" +- compatible : "generic-ohci" - reg : ohci controller register range (address and length) - interrupts : ohci controller interrupt
@@ -16,7 +16,7 @@ Optional properties: Example: ohci0: usb at 01c14400 { - compatible = "allwinner,sun4i-a10-ohci", "usb-ohci"; + compatible = "allwinner,sun4i-a10-ohci", "generic-ohci"; reg = <0x01c14400 0x100>; interrupts = <64>; clocks = <&usb_clk 6>, <&ahb_gates 2>;
drivers/usb/host/ohci-platform.c +1 -1
@@ -319,7 +319,7 @@ static int ohci_platform_resume(struct device *dev)#endif /* CONFIG_PM */ static const struct of_device_id ohci_platform_ids[] = { - { .compatible ="usb-ohci" , }, + { .compatible ="generic-ohci" , }, { } };MODULE_DEVICE_TABLE (of, ohci_platform_ids);
Signature · 1 line
1.8.5.3
Alan Stern
maintainerPATCH v2 1/2 ohci-platform: Change compatible string from usb-ohci to generic-ohci
Quoted 15 lines · Hans de Goede
The initial versions of the devicetree enablement patches for ohci-platform used "ohci-platform" as compatible string. However this was disliked by various reviewers because the platform bus is a Linux invention and devicetree is supposed to be OS agnostic. After much discussion I gave up and went with the generic usb-ohci as requested.
In retro-spect I should have chosen something different, the dts files for many existing boards already claim to be compatible with "usb-ohci", ie they have:
compatible = "ti,ohci-omap3", "usb-ohci";In theory this should not be a problem since the "ti,ohci-omap3" entry takes presedence, but in practice using a conflicting compatible string is an issue, because it makes which driver gets used depend on driver registration order.
Quoted 5 lines
This patch changes the compatible string claimed by ohci-platform to "generic-ohci", avoiding the driver registration / module loading ordering problems.
Signed-off-by Hans de Goede <[email protected]>
For both v2 patches:
PATCH v2 1/2 ohci-platform: Change compatible string from usb-ohci to generic-ohci
In reply to Hans de GoedeQuoted 53 lines · Hans de Goede
The initial versions of the devicetree enablement patches for ohci-platform used "ohci-platform" as compatible string. However this was disliked by various reviewers because the platform bus is a Linux invention and devicetree is supposed to be OS agnostic. After much discussion I gave up and went with the generic usb-ohci as requested.
In retro-spect I should have chosen something different, the dts files for many existing boards already claim to be compatible with "usb-ohci", ie they have:
compatible = "ti,ohci-omap3", "usb-ohci";In theory this should not be a problem since the "ti,ohci-omap3" entry takes presedence, but in practice using a conflicting compatible string is an issue, because it makes which driver gets used depend on driver registration order.
This patch changes the compatible string claimed by ohci-platform to "generic-ohci", avoiding the driver registration / module loading ordering problems.
Signed-off-by Hans de Goede <[email protected]>--- Documentation/devicetree/bindings/usb/usb-ohci.txt | 4 ++-- drivers/usb/host/ohci-platform.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/usb/usb-ohci.txt +2
-2@@ -1,7 +1,7 @@ USB OHCI controllers Required properties: -- compatible : "usb-ohci" +- compatible : "generic-ohci" - reg : ohci controller register range (address and length) - interrupts : ohci controller interrupt@@ -16,7 +16,7 @@ Optional properties: Example: ohci0: usb at 01c14400 { - compatible = "allwinner,sun4i-a10-ohci", "usb-ohci"; + compatible = "allwinner,sun4i-a10-ohci", "generic-ohci"; reg = <0x01c14400 0x100>; interrupts = <64>; clocks = <&usb_clk 6>, <&ahb_gates 2>;drivers/usb/host/ohci-platform.c +0
-0
drivers/usb/host/ohci-platform.c static int ohci_platform_resume(struct device *dev) · line 325
Quoted 8 lines
drivers/usb/host/ohci-platform.c +1
-1@@ -319,7 +319,7 @@ static int ohci_platform_resume(struct device *dev)#endif /* CONFIG_PM */ static const struct of_device_id ohci_platform_ids[] = { - { .compatible ="usb-ohci" , }, + { .compatible ="generic-ohci" , }, { } };MODULE_DEVICE_TABLE (of, ohci_platform_ids);
both v2 patches
PATCH v2 2/2 ehci-platform: Change compatible string from usb-ehci to generic-ehci
In reply to Hans de GoedeThe initial versions of the devicetree enablement patches for ehci-platform used "ehci-platform" as compatible string. However this was disliked by various reviewers because the platform bus is a Linux invention and devicetree is supposed to be OS agnostic. After much discussion I gave up, added a:
"depends on !PPC_OF" to Kconfig to avoid a known conflict with PPC-OF platforms and went with the generic usb-ehci as requested.
In retro-spect I should have chosen something different, the dts files for many existing boards already claim to be compatible with "usb-ehci", ie they have:
compatible = "ti,ehci-omap", "usb-ehci";
In theory this should not be a problem since the "ti,ehci-omap" entry takes presedence, but in practice using a conflicting compatible string is an issue, because it makes which driver gets used depend on driver registration order.
This patch changes the compatible string claimed by ehci-platform to "generic-ehci", avoiding the driver registration / module loading ordering problems, and removes the "depends on !PPC_OF" workaround.
--- Documentation/devicetree/bindings/usb/usb-ehci.txt | 4 ++-- drivers/usb/host/Kconfig | 1 - drivers/usb/host/ehci-platform.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/usb/usb-ehci.txt +2 -2
@@ -1,7 +1,7 @@ USB EHCI controllers Required properties: - - compatible : should be "usb-ehci". + - compatible : should be "generic-ehci". - reg : should contain at least address and length of the standard EHCI register set for the device. Optional platform-dependent registers (debug-port or other) can be also specified here, but only after
@@ -27,7 +27,7 @@ Example (Sequoia 440EPx): Example (Allwinner sun4i A10 SoC): ehci0: usb at 01c14000 { - compatible = "allwinner,sun4i-a10-ehci", "usb-ehci"; + compatible = "allwinner,sun4i-a10-ehci", "generic-ehci"; reg = <0x01c14000 0x100>; interrupts = <39>; clocks = <&ahb_gates 1>;
drivers/usb/host/Kconfig +0 -1
@@ -255,7 +255,6 @@ config USB_EHCI_ATH79 config USB_EHCI_HCD_PLATFORM tristate "Generic EHCI driver for a platform device" - depends on !PPC_OF default n ---help--- Adds an EHCI host driver for a generic platform device, which
drivers/usb/host/ehci-platform.c +1 -1
@@ -333,7 +333,7 @@ static int ehci_platform_resume(struct device *dev)static const struct of_device_id vt8500_ehci_ids[] = { { .compatible ="via,vt8500-ehci" , }, { .compatible ="wm,prizm-ehci" , }, - { .compatible ="usb-ehci" , }, + { .compatible ="generic-ehci" , }, {} };MODULE_DEVICE_TABLE (of, vt8500_ehci_ids);
Signature · 1 line
1.8.5.3
v2 cover ohci-/ehci-platform: Change compatible string to generic-?hci
In reply to Hans de GoedeQuoted 10 lines · Hans de Goede
Hi Greg,
And here is v2 of my ohci-/ehci-platform fixes for the regression of USB support on various ARM boards I caused in linux-next.
As expected some people still did not like the ?hci-platform compatible string I went for in v1, hence this v2. The good news is it seems everyone seems to be able to live with generic-?hci as compatible now, so it seems this issue is finally settled.
Quoted 4 lines
Please add these 2 patches to your usb-next tree, as said in the cover-letter of v1, I'm fine with you squashing these into the first 2 patches of my original series, but if you want them separate to preserve history that is fine too.
I tested this series on top of next-20140211 on the OMAP platforms where I noticed the regressions, and confirm it fixes the problem.
Kevin