diff options
author | Tom Rini <trini@konsulko.com> | 2016-03-23 18:35:11 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-03-23 18:35:11 -0400 |
commit | b5b84be8a7356d4c3618b6edcb501885e53569f5 (patch) | |
tree | f172eee81583287573c027189bf099385f22d2b5 /arch/arm/dts/sun4i-a10-marsboard.dts | |
parent | d085ecd61b9956cda0d37b89b5c538f54440fe58 (diff) | |
parent | e449e840c5adf728ddd308501af3115656aa9a60 (diff) | |
download | u-boot-imx-b5b84be8a7356d4c3618b6edcb501885e53569f5.zip u-boot-imx-b5b84be8a7356d4c3618b6edcb501885e53569f5.tar.gz u-boot-imx-b5b84be8a7356d4c3618b6edcb501885e53569f5.tar.bz2 |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/dts/sun4i-a10-marsboard.dts')
-rw-r--r-- | arch/arm/dts/sun4i-a10-marsboard.dts | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/dts/sun4i-a10-marsboard.dts b/arch/arm/dts/sun4i-a10-marsboard.dts index 02158bc..8e50723 100644 --- a/arch/arm/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/dts/sun4i-a10-marsboard.dts @@ -91,6 +91,10 @@ status = "okay"; }; +&codec { + status = "okay"; +}; + &ehci0 { status = "okay"; }; @@ -154,6 +158,10 @@ status = "okay"; }; +&otg_sram { + status = "okay"; +}; + &pio { led_pins_marsboard: led_pins@0 { allwinner,pins = "PB5", "PB6", "PB7", "PB8"; @@ -161,6 +169,13 @@ allwinner,drive = <SUN4I_PINCTRL_10_MA>; allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; + + 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>; + }; }; ®_usb1_vbus { @@ -184,7 +199,15 @@ status = "okay"; }; +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + &usbphy { + pinctrl-names = "default"; + pinctrl-0 = <&usb0_id_detect_pin>; + usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; |