diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-12-21 17:01:34 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-12-21 17:01:34 +0100 |
| commit | 4c1b7b611770832789b068a20e0a286a08bf62e2 (patch) | |
| tree | daf3cf886d7d7e9c069dd0290e7c14ea938b3b56 /arch/arm/boot | |
| parent | f48f66a962a54c3d26d688c3df5441c9d1ba8730 (diff) | |
| parent | bc53e3aa88e8240823c1c440e6bab3c3a5ba5f59 (diff) | |
| download | linux-4c1b7b611770832789b068a20e0a286a08bf62e2.tar.gz linux-4c1b7b611770832789b068a20e0a286a08bf62e2.tar.bz2 linux-4c1b7b611770832789b068a20e0a286a08bf62e2.zip | |
Merge tag 'at91-ab-4.15-dt-fixes' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes
Pull "Fixes for 4.15:" from Alexandre Belloni:
- tse850-3: fix an i2c timeout issue
* tag 'at91-ab-4.15-dt-fixes' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: disable the nxp,se97b SMBUS timeout on the TSE-850
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91-tse850-3.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts index 5f29010cdbd8..9b82cc8843e1 100644 --- 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 { |