From: rogerq@ti•com (Roger Quadros)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 1/2] ohci-platform: Change compatible string from usb-ohci to generic-ohci
Date: Wed, 12 Feb 2014 10:45:05 +0200 [thread overview]
Message-ID: <52FB3491.3060206@ti.com> (raw)
In-Reply-To: <1392136529-5060-2-git-send-email-hdegoede@redhat.com>
On 02/11/2014 06:35 PM, Hans de Goede wrote:
> 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 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>;
> 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);
>
both v2 patches
Acked-by: Roger Quadros <rogerq@ti•com>
next prev parent reply other threads:[~2014-02-12 8:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-11 16:35 [PATCH v2 0/2] ohci-/ehci-platform: Change compatible string to generic-?hci Hans de Goede
2014-02-11 16:35 ` [PATCH v2 1/2] ohci-platform: Change compatible string from usb-ohci to generic-ohci Hans de Goede
2014-02-11 16:43 ` Alan Stern
2014-02-12 8:45 ` Roger Quadros [this message]
2014-02-11 16:35 ` [PATCH v2 2/2] ehci-platform: Change compatible string from usb-ehci to generic-ehci Hans de Goede
2014-02-11 17:53 ` [PATCH v2 0/2] ohci-/ehci-platform: Change compatible string to generic-?hci Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52FB3491.3060206@ti.com \
--to=rogerq@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox