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

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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 <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx25.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 77bb743..6088059 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -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";
 			};
 
-- 
1.8.1.2

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 6088059..12e8a94 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -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";
 			};
 
-- 
1.8.1.2

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx25.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 12e8a94..a69fd46 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -520,7 +520,6 @@
 				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
 				clock-names = "ipg", "ahb", "per";
 				reg = <0x53ff4600 0x00f>;
-				status = "disabled";
 			};
 
 			dryice at 53ffc000 {
-- 
1.8.1.2

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx25.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index a69fd46..ab5c282 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -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 {
-- 
1.8.1.2

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx25.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index ab5c282..ebe80bf 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -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";
-- 
1.8.1.2

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

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

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/boot/dts/imx35.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index e59ccb4..474a73d 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -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";
 			};
-- 
1.8.1.2

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

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
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(+)

diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index 7a6d21f..0394313 100644
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -107,3 +107,9 @@
 	fsl,uart-has-rtscts;
 	status = "okay";
 };
+
+&usbhost1 {
+	phy_type = "serial";
+	dr_mode = "host";
+	status = "okay";
+};
-- 
1.8.1.2

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

[Eric Bénard]

Hi Fabio,

Le Mon, 10 Mar 2014 17:54:39 -0300,
Fabio Estevam <festevam@gmail.com> a ?crit :

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> 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 <fabio.estevam@freescale.com>
> ---
>  arch/arm/boot/dts/imx25.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
> index 77bb743..6088059 100644
> --- a/arch/arm/boot/dts/imx25.dtsi
> +++ b/arch/arm/boot/dts/imx25.dtsi
> @@ -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";
>  			};
>  

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

Eric

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

[Fabio Estevam]

Hi Eric,

On Tue, Mar 11, 2014 at 3:52 AM, Eric B?nard <eric@eukrea.com> wrote:

> 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