diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-22 22:49:58 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-22 22:49:58 +0300 |
| commit | 262fc784d856597ea0bc00cc547bba116f6f4f39 (patch) | |
| tree | 74e890a8fbc4f2913b517623581fedb89d8d8d06 | |
| parent | 3b796abd3027c44b0fd1d40b5501d71af2ce7d76 (diff) | |
| parent | f7f7a8f4ebf8b5489ed6c7ce4680a94dc51a35d5 (diff) | |
| download | linux-262fc784d856597ea0bc00cc547bba116f6f4f39.tar.xz | |
Merge tag 'versatile-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/dt
Versatile DTS changes for the v5.9 kernel cycle, essentially
just a single patch fixing up the node names for schema.
* tag 'versatile-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: dts: arm-realview: Align L2 cache-controller nodename with dtschema
Link: https://lore.kernel.org/r/CACRpkdbkM9ZmuG2FnBmO7upcJfnqq2oSLDCFDXC5b3K+dtps9Q@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-eb-mp.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pb1176.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/arm-realview-pbx-a9.dts | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/arm-realview-eb-mp.dtsi b/arch/arm/boot/dts/arm-realview-eb-mp.dtsi index 29b636fce23f..26783d053ac7 100644 --- a/arch/arm/boot/dts/arm-realview-eb-mp.dtsi +++ b/arch/arm/boot/dts/arm-realview-eb-mp.dtsi @@ -59,7 +59,7 @@ interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; }; - L2: l2-cache { + L2: cache-controller { compatible = "arm,l220-cache"; reg = <0x1f002000 0x1000>; interrupt-parent = <&intc>; diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts index 2625ce66f8e7..f925782f8560 100644 --- a/arch/arm/boot/dts/arm-realview-pb1176.dts +++ b/arch/arm/boot/dts/arm-realview-pb1176.dts @@ -323,7 +323,7 @@ <0x10120000 0x100>; }; - L2: l2-cache { + L2: cache-controller { compatible = "arm,l220-cache"; reg = <0x10110000 0x1000>; interrupt-parent = <&intc_dc1176>; diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts index c69cf7ddbe61..9748e0fe800f 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -92,7 +92,7 @@ <0x1f000100 0x100>; }; - L2: l2-cache { + L2: cache-controller { compatible = "arm,l220-cache"; reg = <0x1f002000 0x1000>; interrupt-parent = <&intc_tc11mp>; diff --git a/arch/arm/boot/dts/arm-realview-pbx-a9.dts b/arch/arm/boot/dts/arm-realview-pbx-a9.dts index 90d00b407f85..85d3968fbb91 100644 --- a/arch/arm/boot/dts/arm-realview-pbx-a9.dts +++ b/arch/arm/boot/dts/arm-realview-pbx-a9.dts @@ -60,7 +60,7 @@ }; }; - L2: l2-cache { + L2: cache-controller { compatible = "arm,pl310-cache"; reg = <0x1f002000 0x1000>; cache-unified; |