diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/include/asm/device.h | 3 | ||||
-rw-r--r-- | arch/arm/plat-omap/debug-leds.c | 11 | ||||
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 14 | ||||
-rw-r--r-- | arch/ia64/include/asm/device.h | 3 | ||||
-rw-r--r-- | arch/microblaze/include/asm/device.h | 3 | ||||
-rw-r--r-- | arch/powerpc/include/asm/device.h | 3 | ||||
-rw-r--r-- | arch/sparc/include/asm/device.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/device.h | 3 |
8 files changed, 35 insertions, 8 deletions
diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h index c61642b40603..9f390ce335cb 100644 --- a/arch/arm/include/asm/device.h +++ b/arch/arm/include/asm/device.h | |||
@@ -12,4 +12,7 @@ struct dev_archdata { | |||
12 | #endif | 12 | #endif |
13 | }; | 13 | }; |
14 | 14 | ||
15 | struct pdev_archdata { | ||
16 | }; | ||
17 | |||
15 | #endif | 18 | #endif |
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c index be4eefda4767..9395898dd49a 100644 --- a/arch/arm/plat-omap/debug-leds.c +++ b/arch/arm/plat-omap/debug-leds.c | |||
@@ -281,24 +281,27 @@ static int /* __init */ fpga_probe(struct platform_device *pdev) | |||
281 | return 0; | 281 | return 0; |
282 | } | 282 | } |
283 | 283 | ||
284 | static int fpga_suspend_late(struct platform_device *pdev, pm_message_t mesg) | 284 | static int fpga_suspend_noirq(struct device *dev) |
285 | { | 285 | { |
286 | __raw_writew(~0, &fpga->leds); | 286 | __raw_writew(~0, &fpga->leds); |
287 | return 0; | 287 | return 0; |
288 | } | 288 | } |
289 | 289 | ||
290 | static int fpga_resume_early(struct platform_device *pdev) | 290 | static int fpga_resume_noirq(struct device *dev) |
291 | { | 291 | { |
292 | __raw_writew(~hw_led_state, &fpga->leds); | 292 | __raw_writew(~hw_led_state, &fpga->leds); |
293 | return 0; | 293 | return 0; |
294 | } | 294 | } |
295 | 295 | ||
296 | static struct dev_pm_ops fpga_dev_pm_ops = { | ||
297 | .suspend_noirq = fpga_suspend_noirq, | ||
298 | .resume_noirq = fpga_resume_noirq, | ||
299 | }; | ||
296 | 300 | ||
297 | static struct platform_driver led_driver = { | 301 | static struct platform_driver led_driver = { |
298 | .driver.name = "omap_dbg_led", | 302 | .driver.name = "omap_dbg_led", |
303 | .driver.pm = &fpga_dev_pm_ops, | ||
299 | .probe = fpga_probe, | 304 | .probe = fpga_probe, |
300 | .suspend_late = fpga_suspend_late, | ||
301 | .resume_early = fpga_resume_early, | ||
302 | }; | 305 | }; |
303 | 306 | ||
304 | static int __init fpga_init(void) | 307 | static int __init fpga_init(void) |
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 26b387c12423..3d03337ad422 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -1264,8 +1264,9 @@ static struct irq_chip mpuio_irq_chip = { | |||
1264 | 1264 | ||
1265 | #include <linux/platform_device.h> | 1265 | #include <linux/platform_device.h> |
1266 | 1266 | ||
1267 | static int omap_mpuio_suspend_late(struct platform_device *pdev, pm_message_t mesg) | 1267 | static int omap_mpuio_suspend_noirq(struct device *dev) |
1268 | { | 1268 | { |
1269 | struct platform_device *pdev = to_platform_device(dev); | ||
1269 | struct gpio_bank *bank = platform_get_drvdata(pdev); | 1270 | struct gpio_bank *bank = platform_get_drvdata(pdev); |
1270 | void __iomem *mask_reg = bank->base + OMAP_MPUIO_GPIO_MASKIT; | 1271 | void __iomem *mask_reg = bank->base + OMAP_MPUIO_GPIO_MASKIT; |
1271 | unsigned long flags; | 1272 | unsigned long flags; |
@@ -1278,8 +1279,9 @@ static int omap_mpuio_suspend_late(struct platform_device *pdev, pm_message_t me | |||
1278 | return 0; | 1279 | return 0; |
1279 | } | 1280 | } |
1280 | 1281 | ||
1281 | static int omap_mpuio_resume_early(struct platform_device *pdev) | 1282 | static int omap_mpuio_resume_noirq(struct device *dev) |
1282 | { | 1283 | { |
1284 | struct platform_device *pdev = to_platform_device(dev); | ||
1283 | struct gpio_bank *bank = platform_get_drvdata(pdev); | 1285 | struct gpio_bank *bank = platform_get_drvdata(pdev); |
1284 | void __iomem *mask_reg = bank->base + OMAP_MPUIO_GPIO_MASKIT; | 1286 | void __iomem *mask_reg = bank->base + OMAP_MPUIO_GPIO_MASKIT; |
1285 | unsigned long flags; | 1287 | unsigned long flags; |
@@ -1291,14 +1293,18 @@ static int omap_mpuio_resume_early(struct platform_device *pdev) | |||
1291 | return 0; | 1293 | return 0; |
1292 | } | 1294 | } |
1293 | 1295 | ||
1296 | static struct dev_pm_ops omap_mpuio_dev_pm_ops = { | ||
1297 | .suspend_noirq = omap_mpuio_suspend_noirq, | ||
1298 | .resume_noirq = omap_mpuio_resume_noirq, | ||
1299 | }; | ||
1300 | |||
1294 | /* use platform_driver for this, now that there's no longer any | 1301 | /* use platform_driver for this, now that there's no longer any |
1295 | * point to sys_device (other than not disturbing old code). | 1302 | * point to sys_device (other than not disturbing old code). |
1296 | */ | 1303 | */ |
1297 | static struct platform_driver omap_mpuio_driver = { | 1304 | static struct platform_driver omap_mpuio_driver = { |
1298 | .suspend_late = omap_mpuio_suspend_late, | ||
1299 | .resume_early = omap_mpuio_resume_early, | ||
1300 | .driver = { | 1305 | .driver = { |
1301 | .name = "mpuio", | 1306 | .name = "mpuio", |
1307 | .pm = &omap_mpuio_dev_pm_ops, | ||
1302 | }, | 1308 | }, |
1303 | }; | 1309 | }; |
1304 | 1310 | ||
diff --git a/arch/ia64/include/asm/device.h b/arch/ia64/include/asm/device.h index 41ab85d66f33..d66d446b127c 100644 --- a/arch/ia64/include/asm/device.h +++ b/arch/ia64/include/asm/device.h | |||
@@ -15,4 +15,7 @@ struct dev_archdata { | |||
15 | #endif | 15 | #endif |
16 | }; | 16 | }; |
17 | 17 | ||
18 | struct pdev_archdata { | ||
19 | }; | ||
20 | |||
18 | #endif /* _ASM_IA64_DEVICE_H */ | 21 | #endif /* _ASM_IA64_DEVICE_H */ |
diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h index c042830793ed..30286db27c1c 100644 --- a/arch/microblaze/include/asm/device.h +++ b/arch/microblaze/include/asm/device.h | |||
@@ -16,6 +16,9 @@ struct dev_archdata { | |||
16 | struct device_node *of_node; | 16 | struct device_node *of_node; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | struct pdev_archdata { | ||
20 | }; | ||
21 | |||
19 | #endif /* _ASM_MICROBLAZE_DEVICE_H */ | 22 | #endif /* _ASM_MICROBLAZE_DEVICE_H */ |
20 | 23 | ||
21 | 24 | ||
diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h index 7d2277cef09a..e3e06e0f7fc0 100644 --- a/arch/powerpc/include/asm/device.h +++ b/arch/powerpc/include/asm/device.h | |||
@@ -30,4 +30,7 @@ dev_archdata_get_node(const struct dev_archdata *ad) | |||
30 | return ad->of_node; | 30 | return ad->of_node; |
31 | } | 31 | } |
32 | 32 | ||
33 | struct pdev_archdata { | ||
34 | }; | ||
35 | |||
33 | #endif /* _ASM_POWERPC_DEVICE_H */ | 36 | #endif /* _ASM_POWERPC_DEVICE_H */ |
diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h index 3702e087df2c..f3b85b6b0b76 100644 --- a/arch/sparc/include/asm/device.h +++ b/arch/sparc/include/asm/device.h | |||
@@ -32,4 +32,7 @@ dev_archdata_get_node(const struct dev_archdata *ad) | |||
32 | return ad->prom_node; | 32 | return ad->prom_node; |
33 | } | 33 | } |
34 | 34 | ||
35 | struct pdev_archdata { | ||
36 | }; | ||
37 | |||
35 | #endif /* _ASM_SPARC_DEVICE_H */ | 38 | #endif /* _ASM_SPARC_DEVICE_H */ |
diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h index 4994a20acbcb..cee34e9ca45b 100644 --- a/arch/x86/include/asm/device.h +++ b/arch/x86/include/asm/device.h | |||
@@ -13,4 +13,7 @@ struct dma_map_ops *dma_ops; | |||
13 | #endif | 13 | #endif |
14 | }; | 14 | }; |
15 | 15 | ||
16 | struct pdev_archdata { | ||
17 | }; | ||
18 | |||
16 | #endif /* _ASM_X86_DEVICE_H */ | 19 | #endif /* _ASM_X86_DEVICE_H */ |