arm64: dts: uniphier: Add L2 cache node

Add a L2 cache node referenced from CPU nodes as the missing cache hierarchy
information because the following warning was issued.

  cacheinfo: Unable to detect cache hierarchy for CPU 0
  Early cacheinfo failed, ret = -2

Signed-off-by: Kunihiko Hayashi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]'
Signed-off-by: Arnd Bergmann <[email protected]>

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index 525bff79efea5baa3353b3d391949679f7737fed..1c76b4375b2ea473a9708124d32ba8be61bd504e 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -36,6 +36,7 @@
                        reg = <0 0x000>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&l2>;
                        operating-points-v2 = <&cluster0_opp>;
                };
 
@@ -45,8 +46,13 @@
                        reg = <0 0x001>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&l2>;
                        operating-points-v2 = <&cluster0_opp>;
                };
+
+               l2: l2-cache {
+                       compatible = "cache";
+               };
        };
 
        cluster0_opp: opp-table {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 938753ded7c011020ffc8800d89243999503b0fc..9308458f96111c4ccb0b27a306150a122926b6c2 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -46,6 +46,7 @@
                        reg = <0 0x000>;
                        clocks = <&sys_clk 32>;
                        enable-method = "psci";
+                       next-level-cache = <&a72_l2>;
                        operating-points-v2 = <&cluster0_opp>;
                        #cooling-cells = <2>;
                };
@@ -56,6 +57,7 @@
                        reg = <0 0x001>;
                        clocks = <&sys_clk 32>;
                        enable-method = "psci";
+                       next-level-cache = <&a72_l2>;
                        operating-points-v2 = <&cluster0_opp>;
                        #cooling-cells = <2>;
                };
@@ -66,6 +68,7 @@
                        reg = <0 0x100>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&a53_l2>;
                        operating-points-v2 = <&cluster1_opp>;
                        #cooling-cells = <2>;
                };
@@ -76,9 +79,18 @@
                        reg = <0 0x101>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&a53_l2>;
                        operating-points-v2 = <&cluster1_opp>;
                        #cooling-cells = <2>;
                };
+
+               a72_l2: l2-cache0 {
+                       compatible = "cache";
+               };
+
+               a53_l2: l2-cache1 {
+                       compatible = "cache";
+               };
        };
 
        cluster0_opp: opp-table-0 {

diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
index f10685625b6a928f03b5ce106635b4361d1bfe19..b0c29510a7dadcc01d1e89e68f208482b8dad6d7 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -43,6 +43,7 @@
                        reg = <0 0x000>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&l2>;
                        operating-points-v2 = <&cluster0_opp>;
                        #cooling-cells = <2>;
                };
@@ -53,6 +54,7 @@
                        reg = <0 0x001>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&l2>;
                        operating-points-v2 = <&cluster0_opp>;
                        #cooling-cells = <2>;
                };
@@ -63,6 +65,7 @@
                        reg = <0 0x002>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&l2>;
                        operating-points-v2 = <&cluster0_opp>;
                        #cooling-cells = <2>;
                };
@@ -73,9 +76,14 @@
                        reg = <0 0x003>;
                        clocks = <&sys_clk 33>;
                        enable-method = "psci";
+                       next-level-cache = <&l2>;
                        operating-points-v2 = <&cluster0_opp>;
                        #cooling-cells = <2>;
                };
+
+               l2: l2-cache {
+                       compatible = "cache";
+               };
        };
 
        cluster0_opp: opp-table {