aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-01-14 19:17:41 -0500
committerKevin Hilman <khilman@linaro.org>2014-01-14 19:17:57 -0500
commitc01c80d71c139c9799e255f18fa42fb7a3857634 (patch)
tree48a1194674524a04d47711e4b025460b45ff6c1d
parent69f8fa9bfdf93810c5d29fe36e31018a136c37c2 (diff)
parent672ef909e9b10933dc676c87d1bdeaabfcc11dda (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>
-rw-r--r--arch/arm/boot/dts/socfpga.dtsi4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index f936476c2753..537f1a5c07f5 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -79,6 +79,8 @@
79 #dma-cells = <1>; 79 #dma-cells = <1>;
80 #dma-channels = <8>; 80 #dma-channels = <8>;
81 #dma-requests = <32>; 81 #dma-requests = <32>;
82 clocks = <&l4_main_clk>;
83 clock-names = "apb_pclk";
82 }; 84 };
83 }; 85 };
84 86
@@ -467,6 +469,8 @@
467 interrupts = <0 38 0x04>; 469 interrupts = <0 38 0x04>;
468 cache-unified; 470 cache-unified;
469 cache-level = <2>; 471 cache-level = <2>;
472 arm,tag-latency = <1 1 1>;
473 arm,data-latency = <2 1 1>;
470 }; 474 };
471 475
472 /* Local timer */ 476 /* Local timer */