diff options
author | Felipe Balbi <balbi@ti.com> | 2013-07-02 14:20:24 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-07-29 06:56:48 -0400 |
commit | 22a5aa170c5231e64e1598a55dee92ea9a26183e (patch) | |
tree | dc9ae34510883f5e8b7ebd65e76498a394dd6395 | |
parent | f7e846f0956917888b28b52726ee8779a39d84b6 (diff) |
usb: dwc3: core: switch to snps,dwc3
all other drivers using Synopsys IPs with DT
have a compatible of snps,$driver, in order
to add consistency, we are switching over to
snps,dwc3 but keeping synopsys,dwc3 in the core
driver to maintain backwards compatibility.
New DTS bindings should NOT use synopsys,dwc3.
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | Documentation/devicetree/bindings/usb/dwc3.txt | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 2 | ||||
-rw-r--r-- | drivers/usb/dwc3/core.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/usb/dwc3.txt b/Documentation/devicetree/bindings/usb/dwc3.txt index 7a95c651ceb3..3a64e20f6c32 100644 --- a/Documentation/devicetree/bindings/usb/dwc3.txt +++ b/Documentation/devicetree/bindings/usb/dwc3.txt | |||
@@ -3,7 +3,7 @@ synopsys DWC3 CORE | |||
3 | DWC3- USB3 CONTROLLER | 3 | DWC3- USB3 CONTROLLER |
4 | 4 | ||
5 | Required properties: | 5 | Required properties: |
6 | - compatible: must be "synopsys,dwc3" | 6 | - compatible: must be "snps,dwc3" |
7 | - reg : Address and length of the register set for the device | 7 | - reg : Address and length of the register set for the device |
8 | - interrupts: Interrupts used by the dwc3 controller. | 8 | - interrupts: Interrupts used by the dwc3 controller. |
9 | - usb-phy : array of phandle for the PHY device | 9 | - usb-phy : array of phandle for the PHY device |
@@ -14,7 +14,7 @@ Optional properties: | |||
14 | This is usually a subnode to DWC3 glue to which it is connected. | 14 | This is usually a subnode to DWC3 glue to which it is connected. |
15 | 15 | ||
16 | dwc3@4a030000 { | 16 | dwc3@4a030000 { |
17 | compatible = "synopsys,dwc3"; | 17 | compatible = "snps,dwc3"; |
18 | reg = <0x4a030000 0xcfff>; | 18 | reg = <0x4a030000 0xcfff>; |
19 | interrupts = <0 92 4> | 19 | interrupts = <0 92 4> |
20 | usb-phy = <&usb2_phy>, <&usb3,phy>; | 20 | usb-phy = <&usb2_phy>, <&usb3,phy>; |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index e643620417a9..07be2cd7b318 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
@@ -644,7 +644,7 @@ | |||
644 | utmi-mode = <2>; | 644 | utmi-mode = <2>; |
645 | ranges; | 645 | ranges; |
646 | dwc3@4a030000 { | 646 | dwc3@4a030000 { |
647 | compatible = "synopsys,dwc3"; | 647 | compatible = "snps,dwc3"; |
648 | reg = <0x4a030000 0x1000>; | 648 | reg = <0x4a030000 0x1000>; |
649 | interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; | 649 | interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; |
650 | usb-phy = <&usb2_phy>, <&usb3_phy>; | 650 | usb-phy = <&usb2_phy>, <&usb3_phy>; |
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 0686acff1e22..2f5632730ffb 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c | |||
@@ -735,6 +735,9 @@ static const struct dev_pm_ops dwc3_dev_pm_ops = { | |||
735 | #ifdef CONFIG_OF | 735 | #ifdef CONFIG_OF |
736 | static const struct of_device_id of_dwc3_match[] = { | 736 | static const struct of_device_id of_dwc3_match[] = { |
737 | { | 737 | { |
738 | .compatible = "snps,dwc3" | ||
739 | }, | ||
740 | { | ||
738 | .compatible = "synopsys,dwc3" | 741 | .compatible = "synopsys,dwc3" |
739 | }, | 742 | }, |
740 | { }, | 743 | { }, |