projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
prima2.dtsi
diff --git
a/arch/arm/boot/dts/prima2.dtsi
b/arch/arm/boot/dts/prima2.dtsi
index 8582ae41a5834e99ed26e5edc6f55971d2fa1d0c..20145526cd7b23fe649751643b950ef03a6b7b82 100644
(file)
--- a/
arch/arm/boot/dts/prima2.dtsi
+++ b/
arch/arm/boot/dts/prima2.dtsi
@@
-76,9
+76,10
@@
#clock-cells = <1>;
};
- reset-controller@88010000 {
+ r
stc: r
eset-controller@88010000 {
compatible = "sirf,prima2-rstc";
reg = <0x88010000 0x1000>;
+ #reset-cells = <1>;
};
rsc-controller@88020000 {