forked from Minki/linux
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. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Kevin Hilman <khilman@linaro.org> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
22f6a0f0e3
commit
ce149c30b9
@ -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@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>;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user