Message ID | 1455656404-31191-1-git-send-email-peter@korsgaard.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On 16-02-16 22:00, Peter Korsgaard wrote: > Enable the OTG USB controller on the A7HD. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 34 ++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts > index 43f58fb..9103864 100644 > --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts > +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts > @@ -87,6 +87,30 @@ > status = "okay"; > }; > > +&otg_sram { > + status = "okay"; > +}; > + > +&pio { > + usb0_id_detect_pin: usb0_id_detect_pin@0 { > + allwinner,pins = "PH4"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > + }; > + > + usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { > + allwinner,pins = "PH5"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>; > + }; > +}; > + > +®_usb0_vbus { > + status = "okay"; > +}; > + > ®_usb2_vbus { > gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */ > status = "okay"; > @@ -102,7 +126,17 @@ > allwinner,pins = "PH6"; > }; > > +&usb_otg { > + dr_mode = "otg"; > + status = "okay"; > +}; > + > &usbphy { > + pinctrl-names = "default"; > + pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; > + usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ > + usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ > + usb0_vbus-supply = <®_usb0_vbus>; > usb2_vbus-supply = <®_usb2_vbus>; > status = "okay"; > }; >
Hi Peter, On Tue, Feb 16, 2016 at 10:00:04PM +0100, Peter Korsgaard wrote: > Enable the OTG USB controller on the A7HD. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Applied, thanks! Maxime
Hi, On 02/16/2016 10:00 PM, Peter Korsgaard wrote: > Enable the OTG USB controller on the A7HD. > > Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 34 ++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts > index 43f58fb..9103864 100644 > --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts > +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts > @@ -87,6 +87,30 @@ > status = "okay"; > }; > > +&otg_sram { > + status = "okay"; > +}; > + > +&pio { > + usb0_id_detect_pin: usb0_id_detect_pin@0 { > + allwinner,pins = "PH4"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > + }; > + > + usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { > + allwinner,pins = "PH5"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>; > + }; > +}; > + > +®_usb0_vbus { > + status = "okay"; > +}; > + > ®_usb2_vbus { > gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */ > status = "okay"; > @@ -102,7 +126,17 @@ > allwinner,pins = "PH6"; > }; > > +&usb_otg { > + dr_mode = "otg"; > + status = "okay"; > +}; > + > &usbphy { > + pinctrl-names = "default"; > + pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; > + usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ > + usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ > + usb0_vbus-supply = <®_usb0_vbus>; > usb2_vbus-supply = <®_usb2_vbus>; > status = "okay"; > }; >
>>>>> "Hans" == Hans de Goede <hdegoede@redhat.com> writes: > Hi, > On 02/16/2016 10:00 PM, Peter Korsgaard wrote: >> Enable the OTG USB controller on the A7HD. >> >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> > Patch looks good to me: > Reviewed-by: Hans de Goede <hdegoede@redhat.com> Thanks, but you already sent your review-by on the 17th - And Maxime said he applied it (but he apparently hasn't pushed his tree yet).
diff --git a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts index 43f58fb..9103864 100644 --- a/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts +++ b/arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts @@ -87,6 +87,30 @@ status = "okay"; }; +&otg_sram { + status = "okay"; +}; + +&pio { + usb0_id_detect_pin: usb0_id_detect_pin@0 { + allwinner,pins = "PH4"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + }; + + usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { + allwinner,pins = "PH5"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>; + }; +}; + +®_usb0_vbus { + status = "okay"; +}; + ®_usb2_vbus { gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */ status = "okay"; @@ -102,7 +126,17 @@ allwinner,pins = "PH6"; }; +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + &usbphy { + pinctrl-names = "default"; + pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; + usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ + usb0_vbus-supply = <®_usb0_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; };
Enable the OTG USB controller on the A7HD. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)