Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e29c6486 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-2' of... 

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

Pull more fixes from Kukjin Kim:

2nd Samsung fixes for v3.18
- Explicitly set dr_mode on exynos5800-peach-pi, exynos5420-peach-pit
  and exynos5420-arndale-octa boards, because the USB dwc3 controller
  will not work properly without dr_mode as host on above boards if
  the USB host and gadget are enabled in kernel configuration both.

* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: dts: Explicitly set dr_mode on exynos5420-arndale-octa
  ARM: dts: Explicitly set dr_mode on exynos Peach boards

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9209bec4 4e03394e

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+4 −0
Original line number Diff line number Diff line
@@ -368,3 +368,7 @@ 
		};

	};

};



&usbdrd_dwc3_1 {

	dr_mode = "host";

};

arch/arm/boot/dts/exynos5420-peach-pit.dts

+8 −0
Original line number Diff line number Diff line
@@ -838,6 +838,14 @@ 
	status = "okay";

};



&usbdrd_dwc3_0 {

	dr_mode = "host";

};



&usbdrd_dwc3_1 {

	dr_mode = "host";

};



&usbdrd_phy0 {

	vbus-supply = <&usb300_vbus_reg>;

};

arch/arm/boot/dts/exynos5420.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ 
		#size-cells = <1>;

		ranges;



		dwc3 {

		usbdrd_dwc3_0: dwc3 {

			compatible = "snps,dwc3";

			reg = <0x12000000 0x10000>;

			interrupts = <0 72 0>;
@@ -841,7 +841,7 @@ 
		#size-cells = <1>;

		ranges;



		dwc3 {

		usbdrd_dwc3_1: dwc3 {

			compatible = "snps,dwc3";

			reg = <0x12400000 0x10000>;

			interrupts = <0 73 0>;

arch/arm/boot/dts/exynos5800-peach-pi.dts

+8 −0
Original line number Diff line number Diff line
@@ -826,6 +826,14 @@ 
	status = "okay";

};



&usbdrd_dwc3_0 {

	dr_mode = "host";

};



&usbdrd_dwc3_1 {

	dr_mode = "host";

};



&usbdrd_phy0 {

	vbus-supply = <&usb300_vbus_reg>;

};