Since ci_hdrc_imx and usbmisc_imx has relationship between each other,
they can't be existed as two modules. We change the code, and make
the usbmisc_imx has no longer a driver.
Due to above reason, we introduce non core register phandle to know
the non core register, and delete the binding doc from usbmisc_imx as well.
Signed-off-by: Peter Chen <peter.chen@xxxxxxxxxxxxx>
---
.../devicetree/bindings/usb/ci_hdrc_imx.txt | 12 ++++++++----
.../devicetree/bindings/usb/usbmisc-imx.txt | 14 --------------
arch/arm/boot/dts/imx25.dtsi | 14 +++++---------
arch/arm/boot/dts/imx51.dtsi | 16 +++++++---------
arch/arm/boot/dts/imx53.dtsi | 16 +++++++---------
arch/arm/boot/dts/imx6qdl.dtsi | 16 +++++++---------
6 files changed, 34 insertions(+), 54 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/ci_hdrc_imx.txt b/Documentation/devicetree/bindings/usb/ci_hdrc_imx.txt
index b4b5b79..56d94cb 100644
--- a/Documentation/devicetree/bindings/usb/ci_hdrc_imx.txt
+++ b/Documentation/devicetree/bindings/usb/ci_hdrc_imx.txt
@@ -1,4 +1,4 @@
-* Freescale i.MX ci13xxx usb controllers
+* Freescale i.MX chipidea usb controllers
Required properties:
- compatible: Should be "fsl,imx27-usb"
@@ -13,8 +13,7 @@ Recommended properies:
Optional properties:
- fsl,usbphy: phandler of usb phy that connects to the only one port
-- fsl,usbmisc: phandler of non-core register device, with one argument
- that indicate usb controller index
+- ci,noncore: phandler of non-core register node
- vbus-supply: regulator for vbus
- disable-over-current: disable over current detect
- external-vbus-divider: enables off-chip resistor divider for Vbus
@@ -25,7 +24,12 @@ usb@02184000 { /* USB OTG */
reg = <0x02184000 0x200>;
interrupts = <0 43 0x04>;
fsl,usbphy = <&usbphy1>;
- fsl,usbmisc = <&usbmisc 0>;
+ ci,noncore = <&noncore>;
disable-over-current;
external-vbus-divider;
};
+
+noncore: usb-non-core@02184800 {
+ compatible = "fsl,imx-usb-non-core", "syscon";
+ reg = <0x02184800 0x200>;
+};
diff --git a/Documentation/devicetree/bindings/usb/usbmisc-imx.txt b/Documentation/devicetree/bindings/usb/usbmisc-imx.txt
deleted file mode 100644
index 97ce94e..0000000
--- a/Documentation/devicetree/bindings/usb/usbmisc-imx.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-* Freescale i.MX non-core registers
-
-Required properties:
-- #index-cells: Cells used to descibe usb controller index. Should be <1>
-- compatible: Should be one of below:
- "fsl,imx6q-usbmisc" for imx6q
-- reg: Should contain registers location and length
-
-Examples:
-usbmisc@02184800 {
- #index-cells = <1>;
- compatible = "fsl,imx6q-usbmisc";
- reg = <0x02184800 0x200>;
-};
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 7011539..a09251b 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -460,7 +460,7 @@
interrupts = <37>;
clocks = <&clks 9>, <&clks 70>, <&clks 8>;
clock-names = "ipg", "ahb", "per";
- fsl,usbmisc = <&usbmisc 0>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -470,17 +470,13 @@
interrupts = <35>;
clocks = <&clks 9>, <&clks 70>, <&clks 8>;
clock-names = "ipg", "ahb", "per";
- fsl,usbmisc = <&usbmisc 1>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
- usbmisc: usbmisc@53ff4600 {
- #index-cells = <1>;
- compatible = "fsl,imx25-usbmisc";
- clocks = <&clks 9>, <&clks 70>, <&clks 8>;
- clock-names = "ipg", "ahb", "per";
- reg = <0x53ff4600 0x00f>;
- status = "disabled";
+ noncore: usb-non-core@53ff4600 {
+ compatible = "fsl,imx-usb-non-core", "syscon";
+ reg = <0x53ff4600 0xf>;
};
dryice@53ffc000 {
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 67f114c..8e55499 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -191,7 +191,7 @@
reg = <0x73f80000 0x0200>;
interrupts = <18>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 0>;
+ ci,noncore = <&noncore>;
fsl,usbphy = <&usbphy0>;
status = "disabled";
};
@@ -201,7 +201,7 @@
reg = <0x73f80200 0x0200>;
interrupts = <14>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 1>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -210,7 +210,7 @@
reg = <0x73f80400 0x0200>;
interrupts = <16>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 2>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -219,15 +219,13 @@
reg = <0x73f80600 0x0200>;
interrupts = <17>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 3>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
- usbmisc: usbmisc@73f80800 {
- #index-cells = <1>;
- compatible = "fsl,imx51-usbmisc";
- reg = <0x73f80800 0x200>;
- clocks = <&clks 108>;
+ noncore: usb-non-core@73f80800 {
+ compatible = "fsl,imx-usb-non-core", "syscon";
+ reg = <0x73f80800 0x200>;
};
gpio1: gpio@73f84000 {
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 429a16f..4d23932 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -189,7 +189,7 @@
reg = <0x53f80000 0x0200>;
interrupts = <18>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 0>;
+ ci,noncore = <&noncore>;
fsl,usbphy = <&usbphy0>;
status = "disabled";
};
@@ -199,7 +199,7 @@
reg = <0x53f80200 0x0200>;
interrupts = <14>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 1>;
+ ci,noncore = <&noncore>;
fsl,usbphy = <&usbphy1>;
status = "disabled";
};
@@ -209,7 +209,7 @@
reg = <0x53f80400 0x0200>;
interrupts = <16>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 2>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -218,15 +218,13 @@
reg = <0x53f80600 0x0200>;
interrupts = <17>;
clocks = <&clks 108>;
- fsl,usbmisc = <&usbmisc 3>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
- usbmisc: usbmisc@53f80800 {
- #index-cells = <1>;
- compatible = "fsl,imx53-usbmisc";
- reg = <0x53f80800 0x200>;
- clocks = <&clks 108>;
+ noncore: usb-non-core@53f80800 {
+ compatible = "fsl,imx-usb-non-core", "syscon";
+ reg = <0x53f80800 0x200>;
};
gpio1: gpio@53f84000 {
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index be1811c..b7e9e70 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -612,7 +612,7 @@
interrupts = <0 43 0x04>;
clocks = <&clks 162>;
fsl,usbphy = <&usbphy1>;
- fsl,usbmisc = <&usbmisc 0>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -622,7 +622,7 @@
interrupts = <0 40 0x04>;
clocks = <&clks 162>;
fsl,usbphy = <&usbphy2>;
- fsl,usbmisc = <&usbmisc 1>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -631,7 +631,7 @@
reg = <0x02184400 0x200>;
interrupts = <0 41 0x04>;
clocks = <&clks 162>;
- fsl,usbmisc = <&usbmisc 2>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
@@ -640,15 +640,13 @@
reg = <0x02184600 0x200>;
interrupts = <0 42 0x04>;
clocks = <&clks 162>;
- fsl,usbmisc = <&usbmisc 3>;
+ ci,noncore = <&noncore>;
status = "disabled";
};
- usbmisc: usbmisc@02184800 {
- #index-cells = <1>;
- compatible = "fsl,imx6q-usbmisc";
- reg = <0x02184800 0x200>;
- clocks = <&clks 162>;
+ noncore: usb-non-core@02184800 {
+ compatible = "fsl,imx-usb-non-core", "syscon";
+ reg = <0x02184800 0x200>;
};
fec: ethernet@02188000 {
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
