tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Olof Johansson <olof@lixom.net>
+3
-3
+2
-2
arch/arm/boot/dts/socfpga.dtsi
+2
-2
arch/arm/boot/dts/socfpga.dtsi
···
748
748
nand0: nand@ff900000 {
749
749
#address-cells = <0x1>;
750
750
#size-cells = <0x1>;
751
-
compatible = "denali,denali-nand-dt";
751
+
compatible = "altr,socfpga-denali-nand";
752
752
reg = <0xff900000 0x100000>,
753
753
<0xffb80000 0x10000>;
754
754
reg-names = "nand_data", "denali_reg";
755
755
interrupts = <0x0 0x90 0x4>;
756
756
dma-mask = <0xffffffff>;
757
-
clocks = <&nand_clk>;
757
+
clocks = <&nand_x_clk>;
758
758
status = "disabled";
759
759
};
760
760
+1
-1
arch/arm/boot/dts/socfpga_arria10.dtsi
+1
-1
arch/arm/boot/dts/socfpga_arria10.dtsi
···
633
633
nand: nand@ffb90000 {
634
634
#address-cells = <1>;
635
635
#size-cells = <1>;
636
-
compatible = "denali,denali-nand-dt", "altr,socfpga-denali-nand";
636
+
compatible = "altr,socfpga-denali-nand";
637
637
reg = <0xffb90000 0x72000>,
638
638
<0xffb80000 0x10000>;
639
639
reg-names = "nand_data", "denali_reg";