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.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.c')
-rw-r--r-- | arch/powerpc/platforms/52xx/lite5200.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index 5a8d190f53e4..fb35b285a146 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c | |||
@@ -32,6 +32,19 @@ | |||
32 | * | 32 | * |
33 | */ | 33 | */ |
34 | 34 | ||
35 | /* mpc5200 device tree match tables */ | ||
36 | static struct of_device_id mpc5200_cdm_ids[] __initdata = { | ||
37 | { .compatible = "fsl,mpc5200-cdm", }, | ||
38 | { .compatible = "mpc5200-cdm", }, | ||
39 | {} | ||
40 | }; | ||
41 | |||
42 | static struct of_device_id mpc5200_gpio_ids[] __initdata = { | ||
43 | { .compatible = "fsl,mpc5200-gpio", }, | ||
44 | { .compatible = "mpc5200-gpio", }, | ||
45 | {} | ||
46 | }; | ||
47 | |||
35 | /* | 48 | /* |
36 | * Fix clock configuration. | 49 | * Fix clock configuration. |
37 | * | 50 | * |
@@ -44,9 +57,8 @@ lite5200_fix_clock_config(void) | |||
44 | { | 57 | { |
45 | struct device_node *np; | 58 | struct device_node *np; |
46 | struct mpc52xx_cdm __iomem *cdm; | 59 | struct mpc52xx_cdm __iomem *cdm; |
47 | |||
48 | /* Map zones */ | 60 | /* Map zones */ |
49 | np = of_find_compatible_node(NULL, NULL, "mpc5200-cdm"); | 61 | np = of_find_matching_node(NULL, mpc5200_cdm_ids); |
50 | cdm = of_iomap(np, 0); | 62 | cdm = of_iomap(np, 0); |
51 | of_node_put(np); | 63 | of_node_put(np); |
52 | if (!cdm) { | 64 | if (!cdm) { |
@@ -81,7 +93,7 @@ lite5200_fix_port_config(void) | |||
81 | struct mpc52xx_gpio __iomem *gpio; | 93 | struct mpc52xx_gpio __iomem *gpio; |
82 | u32 port_config; | 94 | u32 port_config; |
83 | 95 | ||
84 | np = of_find_compatible_node(NULL, NULL, "mpc5200-gpio"); | 96 | np = of_find_matching_node(NULL, mpc5200_gpio_ids); |
85 | gpio = of_iomap(np, 0); | 97 | gpio = of_iomap(np, 0); |
86 | of_node_put(np); | 98 | of_node_put(np); |
87 | if (!gpio) { | 99 | if (!gpio) { |