| commit | ca7325a2b1fb6bba48e13afe4dce070e29467cc5 | |
| author | Arnd Bergmann <arnd@arndb.de> | |
| Thu, 19 Oct 2017 15:36:08 +0000 (19 17:36 +0200) | ||
| committer | Arnd Bergmann <arnd@arndb.de> | |
| Thu, 19 Oct 2017 15:36:08 +0000 (19 17:36 +0200) | ||
| tree | e79f09ad62296d22a6e26bf1f107a1dfa3d4be89 | treesnapshot (tar.gz zip) |
| parent | 4cb4261dc2908557d04c982060982d69e809c25c | commitdiff |
| parent | 27d90f46f253ccc7c5447f6fa62505acb1c246fe | commitdiff |
Merge tag 'at91-fixes2' of git://git./linux/kernel/git/nferre/linux-at91 into fixes
Fixes: second batch for 4.14:
- one DT phy address fix for the new sama5d27 som1 ek
- two DT ADC patches that were forgotten while moving to
hardware triggers for sama5d2 (iio changes already applied)
* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: dts: at91: sama5d2: add ADC hw trigger edge type
ARM: dts: at91: sama5d2_xplained: enable ADTRG pin
ARM: dts: at91: at91-sama5d27_som1: fix PHY ID
Fixes: second batch for 4.14:
- one DT phy address fix for the new sama5d27 som1 ek
- two DT ADC patches that were forgotten while moving to
hardware triggers for sama5d2 (iio changes already applied)
* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: dts: at91: sama5d2: add ADC hw trigger edge type
ARM: dts: at91: sama5d2_xplained: enable ADTRG pin
ARM: dts: at91: at91-sama5d27_som1: fix PHY ID