ARM: UniPhier: replace "usb-ehci" with "generic-ehci"

EHCI host controllers have a common register interface.
We may wish to implement a generic EHCI driver someday.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/arch/arm/dts/uniphier-ph1-ld4.dtsi b/arch/arm/dts/uniphier-ph1-ld4.dtsi
index 2a3dd73ead5c36319c9db18fe60cd000fa5743e1..8ed7bbf53c112ac047b358cc44267c6841ba2872 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-ld4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-ld4.dtsi
@@ -1,7 +1,7 @@
 /*
  * Device Tree Source for UniPhier PH1-LD4 SoC
  *
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Panasonic Corporation
  *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -94,19 +94,19 @@
                };
 
                usb0: usb@5a800100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
                };
 
                usb1: usb@5a810100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
                };
 
                usb2: usb@5a820100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a820100 0x100>;
                };

diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi
index 49e375e8d24649acf99a97e0a9173cc47f4f0222..3f1001b72f738261ac6b55127f52828bfeec5189 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-pro4.dtsi
+++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi
@@ -1,7 +1,7 @@
 /*
  * Device Tree Source for UniPhier PH1-Pro4 SoC
  *
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Panasonic Corporation
  *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -120,13 +120,13 @@
                };
 
                usb0: usb@5a800100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
                };
 
                usb1: usb@5a810100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
                };

diff --git a/arch/arm/dts/uniphier-ph1-sld3.dtsi b/arch/arm/dts/uniphier-ph1-sld3.dtsi
index f5529d2e6eed3295edac308b1c8ab9574896b035..88322c6a8c7e90f30ff0c9befd20148b726ff71e 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld3.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld3.dtsi
@@ -1,7 +1,7 @@
 /*
  * Device Tree Source for UniPhier PH1-sLD3 SoC
  *
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Panasonic Corporation
  *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -93,25 +93,25 @@
                };
 
                usb0: usb@5a800100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
                };
 
                usb1: usb@5a810100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
                };
 
                usb2: usb@5a820100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a820100 0x100>;
                };
 
                usb3: usb@5a830100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a830100 0x100>;
                };

diff --git a/arch/arm/dts/uniphier-ph1-sld8.dtsi b/arch/arm/dts/uniphier-ph1-sld8.dtsi
index 0ea76e59fcb27090aab6b4e9453c635984c7f532..1b3eb228c84d21f99b89ae3ea4019b93e3c416dc 100644 (file)
--- a/arch/arm/dts/uniphier-ph1-sld8.dtsi
+++ b/arch/arm/dts/uniphier-ph1-sld8.dtsi
@@ -1,7 +1,7 @@
 /*
  * Device Tree Source for UniPhier PH1-sLD8 SoC
  *
- * Copyright (C) 2014 Panasonic Corporation
+ * Copyright (C) 2014-2015 Panasonic Corporation
  *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -94,19 +94,19 @@
                };
 
                usb0: usb@5a800100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a800100 0x100>;
                };
 
                usb1: usb@5a810100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a810100 0x100>;
                };
 
                usb2: usb@5a820100 {
-                       compatible = "panasonic,uniphier-ehci", "usb-ehci";
+                       compatible = "panasonic,uniphier-ehci", "generic-ehci";
                        status = "disabled";
                        reg = <0x5a820100 0x100>;
                };