diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-03-15 16:01:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 22:03:06 +0100 |
| commit | fed925ea70f6a8bb1a60baad1146f251770cc777 (patch) | |
| tree | 177c24bf11a0e6017c6e3f159ce170f779fedbb7 /scripts/diffconfig | |
| parent | Merge tag 'uniphier-dt-v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt (diff) | |
| parent | ARM: dts: imx7s: add Keypad Port module (diff) | |
Merge tag 'imx-dt-newclk-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree update with new clock for 4.17" from Shawn Guo:
- Add CAAM and Keypad device node for i.MX7S/D SoC device tree.
- Add clock support for i.MX7 SNVS RTC device.
* tag 'imx-dt-newclk-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx7s: add Keypad Port module
ARM: dts: imx7s: add CAAM device node
ARM: dts: imx7s: add snvs rtc clock
clk: imx: imx7d: add the Keypad Port module clock
clk: imx7d: add CAAM clock
clk: imx: imx7d: add the snvs clock
Diffstat (limited to 'scripts/diffconfig')
0 files changed, 0 insertions, 0 deletions