git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
sprd
/
sc9836.dtsi
diff --git
a/arch/arm64/boot/dts/sprd/sc9836.dtsi
b/arch/arm64/boot/dts/sprd/sc9836.dtsi
index 286d7173f94f91d937a1d26e8177d26c66391175..231436be0e3f6895c57f398350729682affafd6e 100644
(file)
--- a/
arch/arm64/boot/dts/sprd/sc9836.dtsi
+++ b/
arch/arm64/boot/dts/sprd/sc9836.dtsi
@@
-60,7
+60,7
@@
};
funnel@10001000 {
- compatible = "arm,coresight-funnel", "arm,primecell";
+ compatible = "arm,coresight-
dynamic-
funnel", "arm,primecell";
reg = <0 0x10001000 0 0x1000>;
clocks = <&clk26mhz>;
clock-names = "apb_pclk";