summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/at91sam9x5.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-19 23:16:02 +0400
committerOlof Johansson <olof@lixom.net>2014-07-19 23:16:34 +0400
commit730346236af3fcd3324dbc26e4fa13955c59fa7e (patch)
tree8bdc0ac70d36636a26e2284670aee5f15b930831 /arch/arm/boot/dts/at91sam9x5.dtsi
parent1409f3fd5bdb548b0e11a109baa1087680b60c5a (diff)
parent8fe9346b945d76ddb3f08c00e34d701174c62fa0 (diff)
downloadlinux-730346236af3fcd3324dbc26e4fa13955c59fa7e.tar.xz
Merge tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "Xilinx Zynq changes for v3.17" from Michal Simek: arm: Xilinx Zynq dt patches for v3.17 - Document and use new cadence serial binding * tag 'zynq-dt-for-3.17' of git://git.xilinx.com/linux-xlnx: ARM: zynq: DT: Migrate UART to Cadence binding tty: cadence: Document DT binding + Linux 3.16-rc5 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5.dtsi')
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index ed9251324c90..68cc45ff6af7 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -1047,6 +1047,8 @@
reg = <0x00500000 0x80000
0xf803c000 0x400>;
interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&usb>, <&udphs_clk>;
+ clock-names = "hclk", "pclk";
status = "disabled";
ep0 {