From de7566bff359bbd7f6a4a37b4b5ce93225067786 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Tue, 22 Jan 2008 12:31:41 -0600 Subject: [PATCH] [POWERPC] 8xx: adder875 - Fix flash bus-width and remove duplicate __initdata Signed-off-by: Scott Wood Signed-off-by: Kumar Gala --- arch/powerpc/boot/dts/adder875-redboot.dts | 2 +- arch/powerpc/boot/dts/adder875-uboot.dts | 2 +- arch/powerpc/platforms/8xx/adder875.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/powerpc/boot/dts/adder875-redboot.dts index 8f7a79ffa3bf..930bfb3894eb 100644 --- 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 60d4ad5a86d9..0197242dacfb 100644 --- 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 af040fd2dcc6..c6bc0783c3b0 100644 --- 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", }, {}, }; -- 2.30.2