Merge tag 'socfpga_nand_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sat, 23 Jun 2018 22:14:40 +0000 (15:14 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 23 Jun 2018 22:14:40 +0000 (15:14 -0700)
commitf377ad03697e049791da78d587f7b35f9c591ba2
treee5d78e9070188d8ce2818b50813c7f10f3670deb
parentfd7d58f0dbc3e3c6d68d4a3dccabfe1e52a23345
parent3877ef7a1ccecaae378c497e1dcddbc2dccb664c
Merge tag 'socfpga_nand_fix_v4.17' of git://git./linux/kernel/git/dinguyen/linux into fixes

ARM: dts: socfpga: fix NAND support
- NAND should be using nand_x_clk, not nand_clk
- fix NAND node compatible for Cyclone5 and Arria10

* tag 'socfpga_nand_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfpga: Fix NAND controller node compatible for Arria10
  ARM: dts: socfpga: Fix NAND controller node compatible
  ARM: dts: socfpga: Fix NAND controller clock supply

Signed-off-by: Olof Johansson <olof@lixom.net>