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 'rproc-v4.20' of git://github.com/andersson/remoteproc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
arm-realview-pbx.dtsi
diff --git
a/arch/arm/boot/dts/arm-realview-pbx.dtsi
b/arch/arm/boot/dts/arm-realview-pbx.dtsi
index 10868ba3277f52d1eef2be37df09b101187d9fcf..a5676697ff3b7dee101d3f56e92379bc6c6b3e64 100644
(file)
--- a/
arch/arm/boot/dts/arm-realview-pbx.dtsi
+++ b/
arch/arm/boot/dts/arm-realview-pbx.dtsi
@@
-362,7
+362,7
@@
clock-names = "uartclk", "apb_pclk";
};
- ssp: s
sp
@1000d000 {
+ ssp: s
pi
@1000d000 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x1000d000 0x1000>;
clocks = <&sspclk>, <&pclk>;