summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/include/mach/devices.h
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 09:23:28 +0100
committerPhilippe Langlais <philippe.langlais@linaro.org>2012-03-19 09:23:28 +0100
commit95672cd1656bc5a45bb944f319547b3dbd32ee25 (patch)
treec72751682c4da7df67998506df4454208befe5ec /arch/arm/mach-ux500/include/mach/devices.h
parent350ab868ed4959536700fa201abd7dab562b171c (diff)
parentd209c783f1ce1cf966800c6fae73e93c6ab3cddc (diff)
Merge topic branch 'mach-plat' into integration-linux-ux500-3.3
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/devices.h')
-rw-r--r--arch/arm/mach-ux500/include/mach/devices.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 5f6cb71fc62..2392b06f91f 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -13,9 +13,25 @@ struct amba_device;
extern struct platform_device u5500_gpio_devs[];
extern struct platform_device u8500_gpio_devs[];
+extern struct platform_device u8500_mcde_device;
+extern struct platform_device u5500_mcde_device;
+extern struct platform_device u8500_shrm_device;
+extern struct platform_device u8500_b2r2_device;
+extern struct platform_device u5500_b2r2_device;
+extern struct platform_device u8500_trace_modem;
+extern struct platform_device ux500_hwmem_device;
+extern struct platform_device u8500_stm_device;
extern struct amba_device ux500_pl031_device;
-
-extern struct platform_device u8500_dma40_device;
+extern struct platform_device ux500_hash1_device;
+extern struct platform_device ux500_cryp1_device;
+extern struct platform_device mloader_fw_device;
+extern struct platform_device u5500_thsens_device;
+extern struct platform_device u8500_thsens_device;
extern struct platform_device ux500_ske_keypad_device;
+extern struct platform_device u8500_wdt_device;
+extern struct platform_device u5500_wdt_device;
+extern struct platform_device u8500_hsi_device;
+extern struct platform_device ux500_mmio_device;
+extern struct platform_device u5500_mmio_device;
#endif