diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 06:26:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 06:26:30 +0100 |
| commit | 8cb38e9921940f3775da841d6758e4500d99e8ab (patch) | |
| tree | 044b0e4e4818feea97008291dbf2ac4e4e2307c3 /arch/xtensa/boot/dts | |
| parent | usb: wusbcore: fix compile warnings (diff) | |
| parent | Linux 3.14-rc5 (diff) | |
| download | linux-8cb38e9921940f3775da841d6758e4500d99e8ab.tar.xz linux-8cb38e9921940f3775da841d6758e4500d99e8ab.zip | |
Merge 3.14-rc5 into usb-next
We want the fixes here too.
Diffstat (limited to 'arch/xtensa/boot/dts')
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga.dtsi | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi index 46b4f5eab421..e7370b11348e 100644 --- a/arch/xtensa/boot/dts/xtfpga.dtsi +++ b/arch/xtensa/boot/dts/xtfpga.dtsi @@ -35,6 +35,13 @@ interrupt-controller; }; + clocks { + osc: main-oscillator { + #clock-cells = <0>; + compatible = "fixed-clock"; + }; + }; + serial0: serial@fd050020 { device_type = "serial"; compatible = "ns16550a"; @@ -42,9 +49,7 @@ reg = <0xfd050020 0x20>; reg-shift = <2>; interrupts = <0 1>; /* external irq 0 */ - /* Filled in by platform_setup from FPGA register - * clock-frequency = <100000000>; - */ + clocks = <&osc>; }; enet0: ethoc@fd030000 { @@ -52,5 +57,6 @@ reg = <0xfd030000 0x4000 0xfd800000 0x4000>; interrupts = <1 1>; /* external irq 1 */ local-mac-address = [00 50 c2 13 6f 00]; + clocks = <&osc>; }; }; |