linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
@ 2013-08-12  4:14 Peter Chen
  2013-08-12  4:14 ` [PATCH 2/2] ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog Peter Chen
  2013-08-12  8:54 ` [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Shawn Guo
  0 siblings, 2 replies; 5+ messages in thread
From: Peter Chen @ 2013-08-12  4:14 UTC (permalink / raw)
  To: linux-arm-kernel

We enabled USB host 1, so host 1's vbus should be on to let
host 1 work.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 61b8959..b4db3f7 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -34,6 +34,15 @@
 			enable-active-high;
 		};
 
+		reg_usb_h1_vbus: usb_h1_vbus {
+			compatible = "regulator-fixed";
+			regulator-name = "usb_h1_vbus";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			gpio = <&gpio1 29 0>;
+			enable-active-high;
+		};
+
 		reg_audio: wm8962_supply {
 			compatible = "regulator-fixed";
 			regulator-name = "wm8962-supply";
@@ -188,13 +197,14 @@
 	hog {
 		pinctrl_hog: hoggrp {
 			fsl,pins = <
-				MX6QDL_PAD_GPIO_4__GPIO1_IO04   0x80000000
-				MX6QDL_PAD_GPIO_5__GPIO1_IO05   0x80000000
-				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
-				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
-				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
-				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
-				MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x130b0
+				MX6QDL_PAD_GPIO_4__GPIO1_IO04   	0x80000000
+				MX6QDL_PAD_GPIO_5__GPIO1_IO05   	0x80000000
+				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 	0x80000000
+				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 	0x80000000
+				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 	0x80000000
+				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 	0x80000000
+				MX6QDL_PAD_GPIO_0__CCM_CLKO1    	0x130b0
+				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29	0x80000000
 			>;
 		};
 	};
@@ -228,6 +238,7 @@
 };
 
 &usbh1 {
+	vbus-supply = <&reg_usb_h1_vbus>;
 	status = "okay";
 };
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/2] ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog
  2013-08-12  4:14 [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Peter Chen
@ 2013-08-12  4:14 ` Peter Chen
  2013-08-12  8:54 ` [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Shawn Guo
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Chen @ 2013-08-12  4:14 UTC (permalink / raw)
  To: linux-arm-kernel

USB OTG vbus pin needs to be configured as gpio function at
sabresd board.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index b4db3f7..36cb44a 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -205,6 +205,7 @@
 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 	0x80000000
 				MX6QDL_PAD_GPIO_0__CCM_CLKO1    	0x130b0
 				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29	0x80000000
+				MX6QDL_PAD_EIM_D22__GPIO3_IO22		0x80000000
 			>;
 		};
 	};
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
  2013-08-12  8:54 ` [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Shawn Guo
@ 2013-08-12  7:09   ` Peter Chen
  2013-08-12  9:11     ` Shawn Guo
  0 siblings, 1 reply; 5+ messages in thread
From: Peter Chen @ 2013-08-12  7:09 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Aug 12, 2013 at 04:54:36PM +0800, Shawn Guo wrote:
> On Mon, Aug 12, 2013 at 12:14:26PM +0800, Peter Chen wrote:
> > We enabled USB host 1, so host 1's vbus should be on to let
> > host 1 work.
> > 
> > Signed-off-by: Peter Chen <peter.chen@freescale.com>
> > ---
> >  arch/arm/boot/dts/imx6qdl-sabresd.dtsi |   25 ++++++++++++++++++-------
> >  1 files changed, 18 insertions(+), 7 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> > index 61b8959..b4db3f7 100644
> > --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> > +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> > @@ -34,6 +34,15 @@
> >  			enable-active-high;
> >  		};
> >  
> > +		reg_usb_h1_vbus: usb_h1_vbus {
> > +			compatible = "regulator-fixed";
> > +			regulator-name = "usb_h1_vbus";
> > +			regulator-min-microvolt = <5000000>;
> > +			regulator-max-microvolt = <5000000>;
> > +			gpio = <&gpio1 29 0>;
> > +			enable-active-high;
> > +		};
> > +
> >  		reg_audio: wm8962_supply {
> >  			compatible = "regulator-fixed";
> >  			regulator-name = "wm8962-supply";
> > @@ -188,13 +197,14 @@
> >  	hog {
> >  		pinctrl_hog: hoggrp {
> >  			fsl,pins = <
> > -				MX6QDL_PAD_GPIO_4__GPIO1_IO04   0x80000000
> > -				MX6QDL_PAD_GPIO_5__GPIO1_IO05   0x80000000
> > -				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
> > -				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
> > -				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
> > -				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
> > -				MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x130b0
> > +				MX6QDL_PAD_GPIO_4__GPIO1_IO04   	0x80000000
> > +				MX6QDL_PAD_GPIO_5__GPIO1_IO05   	0x80000000
> > +				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 	0x80000000
> > +				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 	0x80000000
> > +				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 	0x80000000
> > +				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 	0x80000000
> > +				MX6QDL_PAD_GPIO_0__CCM_CLKO1    	0x130b0
> > +				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29	0x80000000
> 
> It's not worth to change so many lines of code only for getting the
> indentation aligned.  
> 

So at your version, the MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 is not aligned
with others, since its string is longer than others?

-- 

Best Regards,
Peter Chen

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
  2013-08-12  4:14 [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Peter Chen
  2013-08-12  4:14 ` [PATCH 2/2] ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog Peter Chen
@ 2013-08-12  8:54 ` Shawn Guo
  2013-08-12  7:09   ` Peter Chen
  1 sibling, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2013-08-12  8:54 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Aug 12, 2013 at 12:14:26PM +0800, Peter Chen wrote:
> We enabled USB host 1, so host 1's vbus should be on to let
> host 1 work.
> 
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> ---
>  arch/arm/boot/dts/imx6qdl-sabresd.dtsi |   25 ++++++++++++++++++-------
>  1 files changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index 61b8959..b4db3f7 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -34,6 +34,15 @@
>  			enable-active-high;
>  		};
>  
> +		reg_usb_h1_vbus: usb_h1_vbus {
> +			compatible = "regulator-fixed";
> +			regulator-name = "usb_h1_vbus";
> +			regulator-min-microvolt = <5000000>;
> +			regulator-max-microvolt = <5000000>;
> +			gpio = <&gpio1 29 0>;
> +			enable-active-high;
> +		};
> +
>  		reg_audio: wm8962_supply {
>  			compatible = "regulator-fixed";
>  			regulator-name = "wm8962-supply";
> @@ -188,13 +197,14 @@
>  	hog {
>  		pinctrl_hog: hoggrp {
>  			fsl,pins = <
> -				MX6QDL_PAD_GPIO_4__GPIO1_IO04   0x80000000
> -				MX6QDL_PAD_GPIO_5__GPIO1_IO05   0x80000000
> -				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
> -				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
> -				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
> -				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
> -				MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x130b0
> +				MX6QDL_PAD_GPIO_4__GPIO1_IO04   	0x80000000
> +				MX6QDL_PAD_GPIO_5__GPIO1_IO05   	0x80000000
> +				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 	0x80000000
> +				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 	0x80000000
> +				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 	0x80000000
> +				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 	0x80000000
> +				MX6QDL_PAD_GPIO_0__CCM_CLKO1    	0x130b0
> +				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29	0x80000000

It's not worth to change so many lines of code only for getting the
indentation aligned.  I fixed it up and manually applied both patches,
as they do not apply on my imx/dt branch.

Shawn

>  			>;
>  		};
>  	};
> @@ -228,6 +238,7 @@
>  };
>  
>  &usbh1 {
> +	vbus-supply = <&reg_usb_h1_vbus>;
>  	status = "okay";
>  };
>  
> -- 
> 1.7.1
> 
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator
  2013-08-12  7:09   ` Peter Chen
@ 2013-08-12  9:11     ` Shawn Guo
  0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2013-08-12  9:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Aug 12, 2013 at 03:09:08PM +0800, Peter Chen wrote:
> So at your version, the MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 is not aligned
> with others, since its string is longer than others?

Yes.  But that's not really a problem.

Shawn

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-08-12  9:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-12  4:14 [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Peter Chen
2013-08-12  4:14 ` [PATCH 2/2] ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog Peter Chen
2013-08-12  8:54 ` [PATCH 1/2] ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator Shawn Guo
2013-08-12  7:09   ` Peter Chen
2013-08-12  9:11     ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).