From: Olof Johansson Date: Sat, 23 Jun 2018 22:14:40 +0000 (-0700) Subject: Merge tag 'socfpga_nand_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.18-rc3~8^2~8 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f377ad03697e049791da78d587f7b35f9c591ba2;p=linux-2.6-block.git 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 --- f377ad03697e049791da78d587f7b35f9c591ba2