diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 16:17:41 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 16:17:57 -0800 |
| commit | c01c80d71c139c9799e255f18fa42fb7a3857634 (patch) | |
| tree | 48a1194674524a04d47711e4b025460b45ff6c1d /arch/arm/boot | |
| parent | 69f8fa9bfdf93810c5d29fe36e31018a136c37c2 (diff) | |
| parent | 672ef909e9b10933dc676c87d1bdeaabfcc11dda (diff) | |
Merge tag 'socfpga-dt-for-3.14' of git://git.rocketboards.org/linux-socfpga-next into next/dt
From Dinh Nguyen:
SOCFPGA DT updates for v3.14
* tag 'socfpga-dt-for-3.14' of git://git.rocketboards.org/linux-socfpga-next:
ARM: dts: socfpga: add pl330 clock
ARM: dts: socfpga: update L2 tag and data latency
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index f936476c275..537f1a5c07f 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -79,6 +79,8 @@ #dma-cells = <1>; #dma-channels = <8>; #dma-requests = <32>; + clocks = <&l4_main_clk>; + clock-names = "apb_pclk"; }; }; @@ -467,6 +469,8 @@ interrupts = <0 38 0x04>; cache-unified; cache-level = <2>; + arm,tag-latency = <1 1 1>; + arm,data-latency = <2 1 1>; }; /* Local timer */ |