diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 06:08:27 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 06:08:27 +0400 |
| commit | f8a504c404c6c4abbed4ae34fe1027ba3c24d035 (patch) | |
| tree | 2566aeb4295dd9a1b06961c23b8441c344f8378c /arch/arm/boot/dts/bcm11351-brt.dts | |
| parent | cdfc83075fb76369a31e6c187d0cebcab9f8b9c8 (diff) | |
| parent | 929267cb3525daf72f730f4d4c4e1e9e2b135e61 (diff) | |
| download | linux-f8a504c404c6c4abbed4ae34fe1027ba3c24d035.tar.xz | |
Merge tag 'late-dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late changes from Kevin Hilman:
"These are changes that arrived a little late but were considered
self-contained enough to still go in for v3.14.
They are all device tree updtes this time around, and mainly for
Broadcom SoCs"
* tag 'late-dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: moxart: move fixed rate clock child node to board level dts
clk: bcm281xx: define kona clock binding
ARM: dts: add usb udc support to bcm281xx
ARM: dts: Specify clocks for timer on bcm11351
Documentation: dt: kona-timer: Add clocks property
ARM: dts: Specify clocks for SDHCIs on bcm11351
Documentation: dt: kona-sdhci: Add clocks property
ARM: dts: Specify clocks for UARTs on bcm11351
ARM: dts: bcm281xx: Add i2c busses
ARM: dts: Declare clocks as fixed on bcm11351
ARM: dts: bcm28155-ap: Enable all the i2c busses
Diffstat (limited to 'arch/arm/boot/dts/bcm11351-brt.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm11351-brt.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts index 23cd16d736bf..396b70459cdc 100644 --- a/arch/arm/boot/dts/bcm11351-brt.dts +++ b/arch/arm/boot/dts/bcm11351-brt.dts @@ -44,5 +44,11 @@ status = "okay"; }; + usbotg: usb@3f120000 { + status = "okay"; + }; + usbphy: usb-phy@3f130000 { + status = "okay"; + }; }; |