diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-27 19:26:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-27 19:26:30 -0700 |
| commit | 81c0d9047f204b1c08034a5815a5cddfbb4bee1f (patch) | |
| tree | 801b7b365306dc24e2b6d1e9eedd3a7a663349d2 /arch/arm/boot | |
| parent | f4ae176c626311d6507c9a2d263657c4cc4e1667 (diff) | |
| parent | 15f504f0c2038b9a0f1569c9ce34def61f0c65be (diff) | |
| download | blackbird-op-linux-81c0d9047f204b1c08034a5815a5cddfbb4bee1f.tar.gz blackbird-op-linux-81c0d9047f204b1c08034a5815a5cddfbb4bee1f.zip | |
Merge tag 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
Fixes following for v3.10
- to get usb2 working on the Chromebook with adding the
usb phy node for usb2 on exynos5250
- supporting exynos4210 rev0 SoC
- exynos5440 restart applying only to powered-on domains
- drm-exynos probe failure with adding resource names to
fimd0 platform device
* tag 'samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Add names to fimd0 IRQ resources
ARM: EXYNOS: fix software reset logic for EXYNOS5440 SOC
ARM: EXYNOS: Fix support of Exynos4210 rev0 SoC
ARM: dts: Enabling samsung-usb2phy driver for exynos5250
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 98dfc3ea5c0b..0673524238a6 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -497,6 +497,21 @@ clock-names = "usbhost"; }; + usbphy@12130000 { + compatible = "samsung,exynos5250-usb2phy"; + reg = <0x12130000 0x100>; + clocks = <&clock 1>, <&clock 285>; + clock-names = "ext_xtal", "usbhost"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + usbphy-sys { + reg = <0x10040704 0x8>, + <0x10050230 0x4>; + }; + }; + amba { #address-cells = <1>; #size-cells = <1>; |
