diff options
| author | Olof Johansson <olof@lixom.net> | 2020-09-26 10:22:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-09-26 10:22:47 -0700 |
| commit | c490eab969021c3f7ea8c446508f8ef913bb5eb5 (patch) | |
| tree | 665b0ddb7da98b35413e2989fea87d50515b05af /arch/arm/boot | |
| parent | 873c331927302ab484c859601982a7cb88bc0723 (diff) | |
| parent | 8bcbcdb7293cc24eb7b24b67ef2b29b3a45a49e0 (diff) | |
Merge tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
ARM: dts: amlogic updates for v5.10
- minor cleanup
* tag 'amlogic-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM: dts: meson: move the L2 cache-controller inside the SoC node
Link: https://lore.kernel.org/r/7h7dsikjyt.fsf@baylibre.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/meson.dtsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index eadb0832bcfc..7649dd1e0b9e 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -11,13 +11,6 @@ #size-cells = <1>; interrupt-parent = <&gic>; - L2: cache-controller@c4200000 { - compatible = "arm,pl310-cache"; - reg = <0xc4200000 0x1000>; - cache-unified; - cache-level = <2>; - }; - soc { compatible = "simple-bus"; #address-cells = <1>; @@ -172,6 +165,13 @@ }; }; + L2: cache-controller@c4200000 { + compatible = "arm,pl310-cache"; + reg = <0xc4200000 0x1000>; + cache-unified; + cache-level = <2>; + }; + periph: bus@c4300000 { compatible = "simple-bus"; reg = <0xc4300000 0x10000>; |