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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
kirkwood-dnskw.dtsi
diff --git
a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index 7408655f91b500cc5f4a4fc283c6bb30c7c43eac..9b32d0272825fcb172c0ef720c30f74c4202e0f5 100644
(file)
--- a/
arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/
arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@
-25,6
+25,16
@@
};
};
+ gpio_fan {
+ /* Fan: ADDA AD045HB-G73 40mm 6000rpm@5v */
+ compatible = "gpio-fan";
+ gpios = <&gpio1 14 1
+ &gpio1 13 1>;
+ gpio-fan,speed-map = <0 0
+ 3000 1
+ 6000 2>;
+ };
+
ocp@f1000000 {
sata@80000 {
status = "okay";