diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
| commit | 984a8547052711867332eeaec4141755fc040553 (patch) | |
| tree | c8bbc1e16d11c023e1a7ec0421401be0a0e4a304 /arch/arm/boot/dts/imx23-olinuxino.dts | |
| parent | 3270f0dd1a35d6b785bf39e1ed7ed6e1e43c8ebb (diff) | |
| parent | b47eee2e0a7de623c24dbcaf303c3bf2b5155455 (diff) | |
| download | blackbird-op-linux-984a8547052711867332eeaec4141755fc040553.tar.gz blackbird-op-linux-984a8547052711867332eeaec4141755fc040553.zip | |
Merge branch 'for-linus' into for-next
Merge back the latest HD-audio stuff for further development.
Diffstat (limited to 'arch/arm/boot/dts/imx23-olinuxino.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx23-olinuxino.dts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts index 7e6eef2488e8..82045398bf1f 100644 --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts @@ -12,6 +12,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "imx23.dtsi" / { @@ -93,6 +94,7 @@ ahb@80080000 { usb0: usb@80080000 { + dr_mode = "host"; vbus-supply = <®_usb0_vbus>; status = "okay"; }; @@ -122,7 +124,7 @@ user { label = "green"; - gpios = <&gpio2 1 1>; + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; }; }; }; |
