diff options
author | Anatolij Gustschin <agust@denx.de> | 2011-01-08 10:51:16 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-03-15 11:31:47 -0400 |
commit | d1dcfbbb9f57a1f380e824caddc2c77b48a3a96b (patch) | |
tree | 24933212ec2b90988f9cec67c89f6bf901dedd1f /arch/powerpc | |
parent | 3cc5a0f09e7e454a2f2000dac749d07fea9fc004 (diff) |
powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
Commit da3ed89e7ce272ebcc918487e2a28736ca0dd6bb added
'fsl,qoriq-gpio' compatiable searching in the old way
using for_each_compatible_node(). But the driver have
previously been changed to use a struct of_device_id
compatible list passed to for_each_matching_node().
Add 'fsl,qoriq-gpio' compatiable to the existing
compatible list instead of adding another
for_each_compatible_node() loop.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/sysdev/mpc8xxx_gpio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c index 11fb5180c3d..232e701245d 100644 --- a/arch/powerpc/sysdev/mpc8xxx_gpio.c +++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c | |||
@@ -310,6 +310,7 @@ static struct of_device_id mpc8xxx_gpio_ids[] __initdata = { | |||
310 | { .compatible = "fsl,mpc8572-gpio", }, | 310 | { .compatible = "fsl,mpc8572-gpio", }, |
311 | { .compatible = "fsl,mpc8610-gpio", }, | 311 | { .compatible = "fsl,mpc8610-gpio", }, |
312 | { .compatible = "fsl,mpc5121-gpio", .data = mpc512x_irq_set_type, }, | 312 | { .compatible = "fsl,mpc5121-gpio", .data = mpc512x_irq_set_type, }, |
313 | { .compatible = "fsl,qoriq-gpio", }, | ||
313 | {} | 314 | {} |
314 | }; | 315 | }; |
315 | 316 | ||
@@ -389,9 +390,6 @@ static int __init mpc8xxx_add_gpiochips(void) | |||
389 | for_each_matching_node(np, mpc8xxx_gpio_ids) | 390 | for_each_matching_node(np, mpc8xxx_gpio_ids) |
390 | mpc8xxx_add_controller(np); | 391 | mpc8xxx_add_controller(np); |
391 | 392 | ||
392 | for_each_compatible_node(np, NULL, "fsl,qoriq-gpio") | ||
393 | mpc8xxx_add_controller(np); | ||
394 | |||
395 | return 0; | 393 | return 0; |
396 | } | 394 | } |
397 | arch_initcall(mpc8xxx_add_gpiochips); | 395 | arch_initcall(mpc8xxx_add_gpiochips); |