diff options
author | Peter Zijlstra <peterz@infradead.org> | 2020-07-22 10:22:02 +0200 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-22 10:22:02 +0200 |
commit | 015dc08918785201199ed3450c22bb8939f09dfe (patch) | |
tree | 7ba52e0b1e518fa750aaac0c1da8dd70c3eca1eb /arch/arm/boot/dts/socfpga.dtsi | |
parent | sched: Add a tracepoint to track rq->nr_running (diff) | |
parent | sched: Fix race against ptrace_freeze_trace() (diff) | |
download | linux-015dc08918785201199ed3450c22bb8939f09dfe.tar.xz linux-015dc08918785201199ed3450c22bb8939f09dfe.zip |
Merge branch 'sched/urgent'
Diffstat (limited to 'arch/arm/boot/dts/socfpga.dtsi')
-rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index c2b54af417a2..78f3267d9cbf 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -726,7 +726,7 @@ }; }; - L2: l2-cache@fffef000 { + L2: cache-controller@fffef000 { compatible = "arm,pl310-cache"; reg = <0xfffef000 0x1000>; interrupts = <0 38 0x04>; |