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 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91-tse850-3.dts
diff --git
a/arch/arm/boot/dts/at91-tse850-3.dts
b/arch/arm/boot/dts/at91-tse850-3.dts
index 5f29010cdbd8129d57bd2141164f4fdd4e58cc5b..9b82cc8843e1af8df22ee12d4146cd87c725c563 100644
(file)
--- a/
arch/arm/boot/dts/at91-tse850-3.dts
+++ b/
arch/arm/boot/dts/at91-tse850-3.dts
@@
-221,6
+221,7
@@
jc42@18 {
compatible = "nxp,se97b", "jedec,jc-42.4-temp";
reg = <0x18>;
+ smbus-timeout-disable;
};
dpot: mcp4651-104@28 {