diff options
| author | Olof Johansson <olof@lixom.net> | 2014-10-19 13:34:52 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-10-19 13:34:52 -0700 |
| commit | e29c64865f6c7eeb98f7c6e2371f1100101f7562 (patch) | |
| tree | 46ef98c9d1590d9e0da02e560f1546c2b6164d24 | |
| parent | 9209bec4f8112928c796f70400a23d1f44469631 (diff) | |
| parent | 4e03394e939135adcd453bd538ea02d98a30473b (diff) | |
| download | linux-stable-e29c64865f6c7eeb98f7c6e2371f1100101f7562.tar.gz linux-stable-e29c64865f6c7eeb98f7c6e2371f1100101f7562.tar.bz2 linux-stable-e29c64865f6c7eeb98f7c6e2371f1100101f7562.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5420-peach-pit.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5420.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5800-peach-pi.dts | 8 |
4 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index 4f2df61c1cfc..aa7a7d727a7e 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -368,3 +368,7 @@ }; }; }; + +&usbdrd_dwc3_1 { + dr_mode = "host"; +}; diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index 9a233828539c..82cdb74484cc 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -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>; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index bfe056d9148c..8617a031cbc0 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 1d31c8132558..7bb1c8dd42dd 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -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>; }; |