Commit d168c852 authored Nov 27, 2014 by 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: Arnd Bergmann <arnd@arndb.de>

parents 9a343b9e 0526f276

arch/arm/boot/dts/exynos5250-snow.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -624,4 +624,8 @@
		num-cs = <1>;
		};

		&usbdrd_dwc3 {
		dr_mode = "host";
		};

		#include "cros-ec-keyboard.dtsi"

arch/arm/boot/dts/exynos5250.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@
		#size-cells = <1>;
		ranges;

		dwc3 {
		usbdrd_dwc3: dwc3 {
		compatible = "synopsys,dwc3";
		reg = <0x12000000 0x10000>;
		interrupts = <0 72 0>;