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 'kvm-tsx-ctrl' into HEAD
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
vf610-zii-scu4-aib.dts
diff --git
a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index dc8a5f37a1ef2a6029bfcbd1d77e46d4b1936a7c..c8ebb23c4e02b03c2401db216d990ec3d63dd3d7 100644
(file)
--- a/
arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/
arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@
-602,6
+602,7
@@
#address-cells = <1>;
#size-cells = <0>;
reg = <0x70>;
+ i2c-mux-idle-disconnect;
sff0_i2c: i2c@1 {
#address-cells = <1>;
@@
-640,6
+641,7
@@
reg = <0x71>;
#address-cells = <1>;
#size-cells = <0>;
+ i2c-mux-idle-disconnect;
sff5_i2c: i2c@1 {
#address-cells = <1>;