diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2008-01-25 00:25:31 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2008-01-26 17:26:01 -0500 |
commit | 66ffbe490b6156898364b3f20a571a78f8d77bc8 (patch) | |
tree | b750ed935f43464d03d9d350e68c1aedc4fea0ee /arch/powerpc/platforms/52xx/lite5200_pm.c | |
parent | 82e30140fff8b49bc4459aecad68e5eae824d223 (diff) |
[POWERPC] mpc5200: normalize compatible property bindings
Update MPC5200 drivers to also look for compatible properties in the
form "fsl,mpc5200-*" to better conform to open firmware generic names
recommended practice as published here:
http://www.openfirmware.org/1275/practice/gnames/gnamv14a.html
This patch should *not* break compatibility with older device trees
which do not use the 'fsl,' prefix. The drivers will still bind against
the older names also.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/platforms/52xx/lite5200_pm.c')
-rw-r--r-- | arch/powerpc/platforms/52xx/lite5200_pm.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c index c3ada1e340d2..c0f13e8deb0b 100644 --- a/arch/powerpc/platforms/52xx/lite5200_pm.c +++ b/arch/powerpc/platforms/52xx/lite5200_pm.c | |||
@@ -43,6 +43,13 @@ static int lite5200_pm_set_target(suspend_state_t state) | |||
43 | static int lite5200_pm_prepare(void) | 43 | static int lite5200_pm_prepare(void) |
44 | { | 44 | { |
45 | struct device_node *np; | 45 | struct device_node *np; |
46 | const struct of_device_id immr_ids[] = { | ||
47 | { .compatible = "fsl,mpc5200-immr", }, | ||
48 | { .compatible = "fsl,mpc5200b-immr", }, | ||
49 | { .type = "soc", .compatible = "mpc5200", }, /* lite5200 */ | ||
50 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ | ||
51 | {} | ||
52 | }; | ||
46 | 53 | ||
47 | /* deep sleep? let mpc52xx code handle that */ | 54 | /* deep sleep? let mpc52xx code handle that */ |
48 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) | 55 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) |
@@ -52,7 +59,7 @@ static int lite5200_pm_prepare(void) | |||
52 | return -EINVAL; | 59 | return -EINVAL; |
53 | 60 | ||
54 | /* map registers */ | 61 | /* map registers */ |
55 | np = of_find_compatible_node(NULL, NULL, "mpc5200"); | 62 | np = of_find_matching_node(NULL, immr_ids); |
56 | mbar = of_iomap(np, 0); | 63 | mbar = of_iomap(np, 0); |
57 | of_node_put(np); | 64 | of_node_put(np); |
58 | if (!mbar) { | 65 | if (!mbar) { |