diff options
Diffstat (limited to 'target/linux/sunxi/patches-3.13/180-5-usb-ohci-change-compat-string.patch')
| -rw-r--r-- | target/linux/sunxi/patches-3.13/180-5-usb-ohci-change-compat-string.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.13/180-5-usb-ohci-change-compat-string.patch b/target/linux/sunxi/patches-3.13/180-5-usb-ohci-change-compat-string.patch new file mode 100644 index 0000000000..4255a34388 --- /dev/null +++ b/target/linux/sunxi/patches-3.13/180-5-usb-ohci-change-compat-string.patch @@ -0,0 +1,69 @@ +From abddd82743cc2c4acdfe66a6d5e63f2085d2269b Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Tue, 11 Feb 2014 11:27:29 +0100 +Subject: [PATCH] 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> +--- + Documentation/devicetree/bindings/usb/usb-ohci.txt | 4 ++-- + drivers/usb/host/ohci-platform.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt +index 6933b0c..45f67d9 100644 +--- a/Documentation/devicetree/bindings/usb/usb-ohci.txt ++++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt +@@ -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>; +diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c +index e2c28fd..b6ca0b2 100644 +--- a/drivers/usb/host/ohci-platform.c ++++ b/drivers/usb/host/ohci-platform.c +@@ -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); +-- +1.8.5.5 + |