Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / integrator.dtsi

diff --git a/arch/arm/boot/dts/integrator.dtsi b/arch/arm/boot/dts/integrator.dtsi
index b82f0e6d9a637936f1d6ff150a770687cfca0efb..6fe0dd1d3541361538bf9c6f1d52ff99f46ac655 100644 (file)
--- a/arch/arm/boot/dts/integrator.dtsi
+++ b/arch/arm/boot/dts/integrator.dtsi
@@ -52,8 +52,9 @@
        };
 
        flash@24000000 {
-               compatible = "cfi-flash";
+               compatible = "arm,versatile-flash", "cfi-flash";
                reg = <0x24000000 0x02000000>;
+               bank-width = <4>;
        };
 
        fpga {