diff options
Diffstat (limited to 'arch/arm/mach-ux500/include')
-rw-r--r-- | arch/arm/mach-ux500/include/mach/devices.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/hardware.h | 9 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/setup.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h index 76b3569f055e..0422af00a56e 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h | |||
@@ -10,6 +10,7 @@ | |||
10 | struct platform_device; | 10 | struct platform_device; |
11 | struct amba_device; | 11 | struct amba_device; |
12 | 12 | ||
13 | extern struct platform_device u5500_gpio_devs[]; | ||
13 | extern struct platform_device u8500_gpio_devs[]; | 14 | extern struct platform_device u8500_gpio_devs[]; |
14 | 15 | ||
15 | extern struct amba_device ux500_pl031_device; | 16 | extern struct amba_device ux500_pl031_device; |
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h index 1353f1757057..8656379a8309 100644 --- a/arch/arm/mach-ux500/include/mach/hardware.h +++ b/arch/arm/mach-ux500/include/mach/hardware.h | |||
@@ -114,6 +114,15 @@ static inline bool cpu_is_u8500v1(void) | |||
114 | return cpu_is_u8500() && (read_cpuid_id() & 15) == 1; | 114 | return cpu_is_u8500() && (read_cpuid_id() & 15) == 1; |
115 | } | 115 | } |
116 | 116 | ||
117 | static inline bool cpu_is_u5500(void) | ||
118 | { | ||
119 | #ifdef CONFIG_UX500_SOC_DB5500 | ||
120 | return 1; | ||
121 | #else | ||
122 | return 0; | ||
123 | #endif | ||
124 | } | ||
125 | |||
117 | #endif | 126 | #endif |
118 | 127 | ||
119 | #endif /* __MACH_HARDWARE_H */ | 128 | #endif /* __MACH_HARDWARE_H */ |
diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h index c730d078f9ab..e978dbd9e210 100644 --- a/arch/arm/mach-ux500/include/mach/setup.h +++ b/arch/arm/mach-ux500/include/mach/setup.h | |||
@@ -15,9 +15,11 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | 16 | ||
17 | extern void __init ux500_map_io(void); | 17 | extern void __init ux500_map_io(void); |
18 | extern void __init u5500_map_io(void); | ||
18 | extern void __init u8500_map_io(void); | 19 | extern void __init u8500_map_io(void); |
19 | 20 | ||
20 | extern void __init ux500_init_devices(void); | 21 | extern void __init ux500_init_devices(void); |
22 | extern void __init u5500_init_devices(void); | ||
21 | extern void __init u8500_init_devices(void); | 23 | extern void __init u8500_init_devices(void); |
22 | 24 | ||
23 | extern void __init ux500_init_irq(void); | 25 | extern void __init ux500_init_irq(void); |