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
/
arm
/
boot
/
dts
/
r8a7744.dtsi
diff --git
a/arch/arm/boot/dts/r8a7744.dtsi
b/arch/arm/boot/dts/r8a7744.dtsi
index 6b56aa2863377e00393da44f13334466b6076bde..0442aad4f9dba0245f1264e65b741e5581f276ae 100644
(file)
--- a/
arch/arm/boot/dts/r8a7744.dtsi
+++ b/
arch/arm/boot/dts/r8a7744.dtsi
@@
-265,7
+265,7
@@
resets = <&cpg 904>;
};
- pfc: pin
-controller
@e6060000 {
+ pfc: pin
ctrl
@e6060000 {
compatible = "renesas,pfc-r8a7744";
reg = <0 0xe6060000 0 0x250>;
};