Merge tag 'juno-updates-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep...

ARMv8 Juno updates for v5.3

Couple of updates switching to use new/updated bindings for CoreSight
dynamic funnel components and NOR flash partition type

* tag 'juno-updates-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: set the right partition type for NOR flash
  arm64: dts: juno: update coresight DT bindings

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 7446e0d..26a039a 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -150,7 +150,7 @@
 
        /* main funnel on Juno r0, cssys0 funnel on Juno r1/r2 as per TRM*/
        main_funnel: funnel@20040000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0x20040000 0 0x1000>;
 
                clocks = <&soc_smc50mhz>;
@@ -281,7 +281,7 @@
        };
 
        funnel@220c0000 { /* cluster0 funnel */
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0x220c0000 0 0x1000>;
 
                clocks = <&soc_smc50mhz>;
@@ -366,7 +366,7 @@
        };
 
        funnel@230c0000 { /* cluster1 funnel */
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0x230c0000 0 0x1000>;
 
                clocks = <&soc_smc50mhz>;

diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
index cf28515..eda3d9e 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 / {
        funnel@20130000 { /* cssys1 */
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0x20130000 0 0x1000>;
 
                clocks = <&soc_smc50mhz>;
@@ -47,7 +47,7 @@
        };
 
        funnel@20150000 { /* cssys2 */
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0x20150000 0 0x1000>;
 
                clocks = <&soc_smc50mhz>;

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 1792b07..9f60dac 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -106,7 +106,6 @@
                        flash@0,00000000 {
                                /* 2 * 32MiB NOR Flash memory mounted on CS0 */
                                compatible = "arm,vexpress-flash", "cfi-flash";
-                               linux,part-probe = "afs";
                                reg = <0 0x00000000 0x04000000>;
                                bank-width = <4>;
                                /*
@@ -116,6 +115,9 @@
                                 * flash hardware access is disabled by default.
                                 */
                                status = "disabled";
+                               partitions {
+                                       compatible = "arm,arm-firmware-suite";
+                               };
                        };
 
                        ethernet@2,00000000 {