diff options
| author | eric miao <eric.miao@marvell.com> | 2008-02-04 02:07:09 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 10:29:04 (GMT) |
| commit | 4be35e236c4a0e346442d98de3e470cf87c4e947 (patch) | |
| tree | 695484879f89212223df9f9163253bb828a84d54 | |
| parent | 06b2666e89c85640c7eddd67e7bee292a9afeceb (diff) | |
| download | linux-fsl-qoriq-4be35e236c4a0e346442d98de3e470cf87c4e947.tar.xz | |
[ARM] pxa: move mfp sysdev registeration out for suspend/resume order
MFP configurations after resume should be done before the GPIO registers
are restored. Move the mfp sysdev registeration to the same place where
GPIO and IRQ sysdev(s) are registered to better control the order.
Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-pxa/generic.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/mfp-pxa3xx.c | 20 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index bd2a235..8bca89c 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h @@ -55,3 +55,4 @@ extern unsigned pxa3xx_get_memclk_frequency_10khz(void); extern struct sysdev_class pxa_irq_sysclass; extern struct sysdev_class pxa_gpio_sysclass; +extern struct sysdev_class pxa3xx_mfp_sysclass; diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.c b/arch/arm/mach-pxa/mfp-pxa3xx.c index f5809ad..b84c3ba 100644 --- a/arch/arm/mach-pxa/mfp-pxa3xx.c +++ b/arch/arm/mach-pxa/mfp-pxa3xx.c @@ -234,22 +234,22 @@ static int pxa3xx_mfp_resume(struct sys_device *d) return 0; } +#else +#define pxa3xx_mfp_suspend NULL +#define pxa3xx_mfp_resume NULL +#endif -static struct sysdev_class mfp_sysclass = { +struct sysdev_class pxa3xx_mfp_sysclass = { .name = "mfp", .suspend = pxa3xx_mfp_suspend, .resume = pxa3xx_mfp_resume, }; -static struct sys_device mfp_device = { - .id = 0, - .cls = &mfp_sysclass, -}; - static int __init mfp_init_devicefs(void) { - sysdev_class_register(&mfp_sysclass); - return sysdev_register(&mfp_device); + if (cpu_is_pxa3xx()) + return sysdev_class_register(&pxa3xx_mfp_sysclass); + + return 0; } -device_initcall(mfp_init_devicefs); -#endif +postcore_initcall(mfp_init_devicefs); diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index eedcec0..85b1df3 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -532,6 +532,8 @@ static struct sys_device pxa3xx_sysdev[] = { { .cls = &pxa_irq_sysclass, }, { + .cls = &pxa3xx_mfp_sysclass, + }, { .cls = &pxa_gpio_sysclass, }, }; |