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: Olof Johansson <olof@lixom.net>

+4
arch/arm/boot/dts/exynos5420-arndale-octa.dts
··· 368 368 }; 369 369 }; 370 370 }; 371 + 372 + &usbdrd_dwc3_1 { 373 + dr_mode = "host"; 374 + };
+8
arch/arm/boot/dts/exynos5420-peach-pit.dts
··· 838 838 status = "okay"; 839 839 }; 840 840 841 + &usbdrd_dwc3_0 { 842 + dr_mode = "host"; 843 + }; 844 + 845 + &usbdrd_dwc3_1 { 846 + dr_mode = "host"; 847 + }; 848 + 841 849 &usbdrd_phy0 { 842 850 vbus-supply = <&usb300_vbus_reg>; 843 851 };
+2 -2
arch/arm/boot/dts/exynos5420.dtsi
··· 815 815 #size-cells = <1>; 816 816 ranges; 817 817 818 - dwc3 { 818 + usbdrd_dwc3_0: dwc3 { 819 819 compatible = "snps,dwc3"; 820 820 reg = <0x12000000 0x10000>; 821 821 interrupts = <0 72 0>; ··· 841 841 #size-cells = <1>; 842 842 ranges; 843 843 844 - dwc3 { 844 + usbdrd_dwc3_1: dwc3 { 845 845 compatible = "snps,dwc3"; 846 846 reg = <0x12400000 0x10000>; 847 847 interrupts = <0 73 0>;
+8
arch/arm/boot/dts/exynos5800-peach-pi.dts
··· 826 826 status = "okay"; 827 827 }; 828 828 829 + &usbdrd_dwc3_0 { 830 + dr_mode = "host"; 831 + }; 832 + 833 + &usbdrd_dwc3_1 { 834 + dr_mode = "host"; 835 + }; 836 + 829 837 &usbdrd_phy0 { 830 838 vbus-supply = <&usb300_vbus_reg>; 831 839 };