diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-08-19 11:27:05 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-08-28 09:12:47 -0400 |
commit | 38d56f1677130004497835a776feb84f068ce22a (patch) | |
tree | c778fb433ad0285636e17b61673b05068dc84f88 | |
parent | ded563cf458e7803536f9d7b6bc5d808a6e37f21 (diff) |
powerpc/44x: Add explicit Yosemite support
Add the Yosemite board to the explicitly supported list for ppc44x_simple
boards and remove the compatible entry for bamboo from the DTS file.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-rw-r--r-- | arch/powerpc/boot/dts/yosemite.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts index e39422aa0d85..1fa3cb4c4ebb 100644 --- a/arch/powerpc/boot/dts/yosemite.dts +++ b/arch/powerpc/boot/dts/yosemite.dts | |||
@@ -15,7 +15,7 @@ | |||
15 | #address-cells = <2>; | 15 | #address-cells = <2>; |
16 | #size-cells = <1>; | 16 | #size-cells = <1>; |
17 | model = "amcc,yosemite"; | 17 | model = "amcc,yosemite"; |
18 | compatible = "amcc,yosemite","amcc,bamboo"; | 18 | compatible = "amcc,yosemite"; |
19 | dcr-parent = <&{/cpus/cpu@0}>; | 19 | dcr-parent = <&{/cpus/cpu@0}>; |
20 | 20 | ||
21 | aliases { | 21 | aliases { |
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index 1c064b242cf0..57e71203d0f8 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c | |||
@@ -57,7 +57,8 @@ static char *board[] __initdata = { | |||
57 | "amcc,katmai", | 57 | "amcc,katmai", |
58 | "amcc,rainier", | 58 | "amcc,rainier", |
59 | "amcc,sequoia", | 59 | "amcc,sequoia", |
60 | "amcc,taishan" | 60 | "amcc,taishan", |
61 | "amcc,yosemite" | ||
61 | }; | 62 | }; |
62 | 63 | ||
63 | static int __init ppc44x_probe(void) | 64 | static int __init ppc44x_probe(void) |