Skip to contentSkip to conversation

ARM: dts: mx25: Fix compatible string for generic USB PHY

PATCH New Fabio Estevam 2 participants 9 messages Mar 10, 2014 – Mar 11, 2014

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/7 ARM: dts: mx25: Fix compatible string for generic USB PHY

From: Fabio Estevam <[email protected]>

According to Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt, the correct compatible string for the generic USB PHY is 'usb-nop-xceiv'.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx25.dtsi +2 -2
index 77bb743..6088059 100644
@@ -483,12 +483,12 @@
 			};
 
 			usbphy1: usbphy at 1 {
-				compatible = "nop-usbphy";
+				compatible = "usb-nop-xceiv";
 				status = "disabled";
 			};
 
 			usbphy2: usbphy at 2 {
-				compatible = "nop-usbphy";
+				compatible = "usb-nop-xceiv";
 				status = "disabled";
 			};
Signature · 1 line
1.8.1.2
author reviewer
#1 lore raw

PATCH 2/7 ARM: dts: mx25: Add USB PHY nodes

From: Fabio Estevam <[email protected]>

Add the USB PHY nodes for the USB Host1 and OTG ports.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx25.dtsi +2 -0
index 6088059..12e8a94 100644
@@ -499,6 +499,7 @@
 				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,usbmisc = <&usbmisc 0>;
+				fsl,usbphy = <&usbphy1>;
 				status = "disabled";
 			};
 

@@ -509,6 +510,7 @@
 				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
 				clock-names = "ipg", "ahb", "per";
 				fsl,usbmisc = <&usbmisc 1>;
+				fsl,usbphy = <&usbphy2>;
 				status = "disabled";
 			};
Signature · 1 line
1.8.1.2
author reviewer
#2 lore raw

PATCH 3/7 ARM: dts: mx25: Let usbmisc be enabled by default

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Like it is done on other imx SoCs, let usbmisc be enabled by default.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx25.dtsi +0 -1
index 12e8a94..a69fd46 100644
@@ -520,7 +520,6 @@
 				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
 				clock-names = "ipg", "ahb", "per";
 				reg = <0x53ff4600 0x00f>;
-				status = "disabled";
 			};
 
 			dryice at 53ffc000 {
Signature · 1 line
1.8.1.2
author reviewer
#3 lore raw

PATCH 4/7 ARM: dts: mx25: Let the USB PHY nodes be enabled by default

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

As there is no physical clock needed to turn on the USB PHYs, let's keep them always enabled.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/imx25.dtsi +0 -2
index a69fd46..ab5c282 100644
@@ -484,12 +484,10 @@
 
 			usbphy1: usbphy at 1 {
 				compatible = "usb-nop-xceiv";
-				status = "disabled";
 			};
 
 			usbphy2: usbphy at 2 {
 				compatible = "usb-nop-xceiv";
-				status = "disabled";
 			};
 
 			usbotg: usb at 53ff4000 {
Signature · 1 line
1.8.1.2
author reviewer
#4 lore raw

PATCH 5/7 ARM: dts: mx25: USB block requires only one clock

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Like other imx SoCs only one USB clock is needed on mx25.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx25.dtsi +2 -4
index ab5c282..ebe80bf 100644
@@ -494,8 +494,7 @@
 				compatible = "fsl,imx25-usb", "fsl,imx27-usb";
 				reg = <0x53ff4000 0x0200>;
 				interrupts = <37>;
-				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
-				clock-names = "ipg", "ahb", "per";
+				clocks = <&clks 70>;
 				fsl,usbmisc = <&usbmisc 0>;
 				fsl,usbphy = <&usbphy1>;
 				status = "disabled";

@@ -505,8 +504,7 @@
 				compatible = "fsl,imx25-usb", "fsl,imx27-usb";
 				reg = <0x53ff4400 0x0200>;
 				interrupts = <35>;
-				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
-				clock-names = "ipg", "ahb", "per";
+				clocks = <&clks 70>;
 				fsl,usbmisc = <&usbmisc 1>;
 				fsl,usbphy = <&usbphy2>;
 				status = "disabled";
Signature · 1 line
1.8.1.2
author reviewer
#5 lore raw

PATCH 6/7 ARM: dts: mx35: USB block requires only one clock

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Like other imx SoCs only one USB clock is needed on mx35.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx35.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx35.dtsi +2 -4
index e59ccb4..474a73d 100644
@@ -296,8 +296,7 @@
 				compatible = "fsl,imx35-usb", "fsl,imx27-usb";
 				reg = <0x53ff4000 0x0200>;
 				interrupts = <37>;
-				clocks = <&clks 9>, <&clks 73>, <&clks 28>;
-				clock-names = "ipg", "ahb", "per";
+				clocks = <&clks 73>;
 				fsl,usbmisc = <&usbmisc 0>;
 				status = "disabled";
 			};

@@ -306,8 +305,7 @@
 				compatible = "fsl,imx35-usb", "fsl,imx27-usb";
 				reg = <0x53ff4400 0x0200>;
 				interrupts = <35>;
-				clocks = <&clks 9>, <&clks 73>, <&clks 28>;
-				clock-names = "ipg", "ahb", "per";
+				clocks = <&clks 73>;
 				fsl,usbmisc = <&usbmisc 1>;
 				status = "disabled";
 			};
Signature · 1 line
1.8.1.2
author reviewer
#6 lore raw

PATCH 7/7 ARM: dts: imx25-pdk: Add USB Host1 support

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
The following driver patch is also needed in order to get USB functional on mx25:
http://www.spinics.net/lists/linux-usb/msg104080.html

 arch/arm/boot/dts/imx25-pdk.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/boot/dts/imx25-pdk.dts +6 -0
index 7a6d21f..0394313 100644
@@ -107,3 +107,9 @@
 	fsl,uart-has-rtscts;
 	status = "okay";
 };
+
+&usbhost1 {
+	phy_type = "serial";
+	dr_mode = "host";
+	status = "okay";
+};
Signature · 1 line
1.8.1.2
#7 lore raw

PATCH 1/7 ARM: dts: mx25: Fix compatible string for generic USB PHY

In reply to Fabio Estevam

Hi Fabio,

Le Mon, 10 Mar 2014 17:54:39 -0300,
Fabio Estevam <[email protected]> a ?crit :

Quoted 19 lines

From: Fabio Estevam <[email protected]>

According to Documentation/devicetree/bindings/usb/usb-nop-xceiv.txt, the correct compatible string for the generic USB PHY is 'usb-nop-xceiv'.

Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx25.dtsi +0 -1
index 77bb743..6088059 100644
@@ -483,12 +483,12 @@
 			};
 
 			usbphy1: usbphy at 1 {
-				compatible = "nop-usbphy";

arch/arm/boot/dts/imx25.dtsi line 494

Quoted 10 lines
arch/arm/boot/dts/imx25.dtsi +2 -1
+				compatible = "usb-nop-xceiv";
 				status = "disabled";
 			};
 
 			usbphy2: usbphy at 2 {
-				compatible = "nop-usbphy";
+				compatible = "usb-nop-xceiv";
 				status = "disabled";
 			};

why don't you use Denis' patches instead of copying them with you as the author ?

Eric

author reviewer
#8 lore raw

PATCH 1/7 ARM: dts: mx25: Fix compatible string for generic USB PHY

Hi Eric,

Quoted 2 lines · Eric B?nard

why don't you use Denis' patches instead of copying them with you as the author ?

Some reasons:

1. The v1 version of the patches is not functional on mx25 due to the wrong clock
2. It is better to separate ARM patches from USB patches as they go through different maintainers
3. In the original patch 4/9 Denis has put me in the From field, so I am not 'copying them with me as the author'
4. It is better to make one change per patch rather than mixing different fixes into a single patch.

Anyway I am happy whethever version is applied by the maintainers. Just wanted to get USB functional on mx25 ;-)

Regards,

Fabio Estevam