[POWERPC] 8xx: adder875 - Fix flash bus-width and remove duplicate __initdata

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/powerpc/boot/dts/adder875-redboot.dts
index 8f7a79ffa3bf649ba598378220e617dbf9e27ae3..930bfb3894ebbf862966ea8629e583e89d0e15e3 100644 (file)
--- a/arch/powerpc/boot/dts/adder875-redboot.dts
+++ b/arch/powerpc/boot/dts/adder875-redboot.dts
@@ -62,7 +62,7 @@
                flash@0,0 {
                        compatible = "cfi-flash";
                        reg = <0 0 0x800000>;
-                       bank-width = <4>;
+                       bank-width = <2>;
                        device-width = <2>;
                };
        };

diff --git a/arch/powerpc/boot/dts/adder875-uboot.dts b/arch/powerpc/boot/dts/adder875-uboot.dts
index 60d4ad5a86d97ca2e769db42b6da49fb4b4c0147..0197242dacfb08945d2eb1ccb77520f819635434 100644 (file)
--- a/arch/powerpc/boot/dts/adder875-uboot.dts
+++ b/arch/powerpc/boot/dts/adder875-uboot.dts
@@ -61,7 +61,7 @@
                flash@0,0 {
                        compatible = "cfi-flash";
                        reg = <0 0 0x800000>;
-                       bank-width = <4>;
+                       bank-width = <2>;
                        device-width = <2>;
                };
        };

diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
index af040fd2dcc6ae63518f9bb5225b478dd3387bc5..c6bc0783c3b0819074d24b14f4f71b71beb25a9e 100644 (file)
--- a/arch/powerpc/platforms/8xx/adder875.c
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -92,7 +92,7 @@ static int __init adder875_probe(void)
        return of_flat_dt_is_compatible(root, "analogue-and-micro,adder875");
 }
 
-static __initdata struct of_device_id __initdata of_bus_ids[] = {
+static __initdata struct of_device_id of_bus_ids[] = {
        { .compatible = "simple-bus", },
        {},
 };