Skip to content

Commit 299a045

Browse files
committed
Merge tag 'sprd-dt-v5.3-rc1' of https://github.com/lyrazhang/linux into arm/dt
Spreadtrum's devicetree for v5.3-rc1 This tag contains only two patches for updating coresight compatible string. * tag 'sprd-dt-v5.3-rc1' of https://github.com/lyrazhang/linux: arm64: dts: sc9860: Update coresight DT bindings arm64: dts: sc9836: Update coresight DT bindings Signed-off-by: Olof Johansson <[email protected]>
2 parents 61c615a + b04832e commit 299a045

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/arm64/boot/dts/sprd/sc9836.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
};
6161

6262
funnel@10001000 {
63-
compatible = "arm,coresight-funnel", "arm,primecell";
63+
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
6464
reg = <0 0x10001000 0 0x1000>;
6565
clocks = <&clk26mhz>;
6666
clock-names = "apb_pclk";

arch/arm64/boot/dts/sprd/sc9860.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
};
301301

302302
funnel@10001000 { /* SoC Funnel */
303-
compatible = "arm,coresight-funnel", "arm,primecell";
303+
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
304304
reg = <0 0x10001000 0 0x1000>;
305305
clocks = <&ext_26m>;
306306
clock-names = "apb_pclk";
@@ -367,7 +367,7 @@
367367
};
368368

369369
funnel@11001000 { /* Cluster0 Funnel */
370-
compatible = "arm,coresight-funnel", "arm,primecell";
370+
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
371371
reg = <0 0x11001000 0 0x1000>;
372372
clocks = <&ext_26m>;
373373
clock-names = "apb_pclk";
@@ -415,7 +415,7 @@
415415
};
416416

417417
funnel@11002000 { /* Cluster1 Funnel */
418-
compatible = "arm,coresight-funnel", "arm,primecell";
418+
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
419419
reg = <0 0x11002000 0 0x1000>;
420420
clocks = <&ext_26m>;
421421
clock-names = "apb_pclk";
@@ -513,7 +513,7 @@
513513
};
514514

515515
funnel@11005000 { /* Main Funnel */
516-
compatible = "arm,coresight-funnel", "arm,primecell";
516+
compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
517517
reg = <0 0x11005000 0 0x1000>;
518518
clocks = <&ext_26m>;
519519
clock-names = "apb_pclk";

0 commit comments

Comments
 (0)