Commit d168c852 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-fixes-v3.18' of...

Merge tag 'samsung-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Pull "Samsung fixes for v3.18" from Kukjin Kim:

- explicitly set dr_mode on exynos5250-snow
  this is required when kernel is built with USB gadget support.

* tag 'samsung-fixes-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Explicitly set dr_mode on exynos5250-snow
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9a343b9e 0526f276
...@@ -624,4 +624,8 @@ &spi_1 { ...@@ -624,4 +624,8 @@ &spi_1 {
num-cs = <1>; num-cs = <1>;
}; };
&usbdrd_dwc3 {
dr_mode = "host";
};
#include "cros-ec-keyboard.dtsi" #include "cros-ec-keyboard.dtsi"
...@@ -555,7 +555,7 @@ usb@12000000 { ...@@ -555,7 +555,7 @@ usb@12000000 {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
dwc3 { usbdrd_dwc3: dwc3 {
compatible = "synopsys,dwc3"; compatible = "synopsys,dwc3";
reg = <0x12000000 0x10000>; reg = <0x12000000 0x10000>;
interrupts = <0 72 0>; interrupts = <0 72 0>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment