Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / socfpga.dtsi

diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index ec1966480f2f0376522bda05d1e7347821238a46..4f3993cc022796c4a3946af0e1aabd984f3937d7 100644 (file)
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -85,6 +85,7 @@
                                clocks = <&l4_main_clk>;
                                clock-names = "apb_pclk";
                                resets = <&rst DMA_RESET>;
+                               reset-names = "dma";
                        };
                };
 
@@ -747,7 +748,7 @@
 
                nand0: nand@ff900000 {
                        #address-cells = <0x1>;
-                       #size-cells = <0x1>;
+                       #size-cells = <0x0>;
                        compatible = "altr,socfpga-denali-nand";
                        reg = <0xff900000 0x100000>,
                              <0xffb80000 0x10000>;