Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f377ad03 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_nand_fix_v4.17' of... 

Merge tag 'socfpga_nand_fix_v4.17' of git://git.kernel.org/pub/scm/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: default avatarOlof Johansson <olof@lixom.net>
parents fd7d58f0 3877ef7a

arch/arm/boot/dts/socfpga.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -748,13 +748,13 @@ 
		nand0: nand@ff900000 {

			#address-cells = <0x1>;

			#size-cells = <0x1>;

			compatible = "denali,denali-nand-dt";

			compatible = "altr,socfpga-denali-nand";

			reg = <0xff900000 0x100000>,

			      <0xffb80000 0x10000>;

			reg-names = "nand_data", "denali_reg";

			interrupts = <0x0 0x90 0x4>;

			dma-mask = <0xffffffff>;

			clocks = <&nand_clk>;

			clocks = <&nand_x_clk>;

			status = "disabled";

		};

arch/arm/boot/dts/socfpga_arria10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ 
		nand: nand@ffb90000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "denali,denali-nand-dt", "altr,socfpga-denali-nand";

			compatible = "altr,socfpga-denali-nand";

			reg = <0xffb90000 0x72000>,

			      <0xffb80000 0x10000>;

			reg-names = "nand_data", "denali_reg";