diff options
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-common.h | 26 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices.h | 1 |
4 files changed, 0 insertions, 44 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 44e23c007ae8..c4fdb03be2cf 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c | |||
@@ -44,7 +44,6 @@ | |||
44 | #include "setup.h" | 44 | #include "setup.h" |
45 | #include "devices.h" | 45 | #include "devices.h" |
46 | #include "irqs.h" | 46 | #include "irqs.h" |
47 | #include <linux/platform_data/crypto-ux500.h> | ||
48 | 47 | ||
49 | #include "ste-dma40-db8500.h" | 48 | #include "ste-dma40-db8500.h" |
50 | #include "db8500-regs.h" | 49 | #include "db8500-regs.h" |
@@ -183,19 +182,6 @@ static void mop500_prox_deactivate(struct device *dev) | |||
183 | regulator_put(prox_regulator); | 182 | regulator_put(prox_regulator); |
184 | } | 183 | } |
185 | 184 | ||
186 | static struct cryp_platform_data u8500_cryp1_platform_data = { | ||
187 | .mem_to_engine = { | ||
188 | .dir = DMA_MEM_TO_DEV, | ||
189 | .dev_type = DB8500_DMA_DEV48_CAC1, | ||
190 | .mode = STEDMA40_MODE_LOGICAL, | ||
191 | }, | ||
192 | .engine_to_mem = { | ||
193 | .dir = DMA_DEV_TO_MEM, | ||
194 | .dev_type = DB8500_DMA_DEV48_CAC1, | ||
195 | .mode = STEDMA40_MODE_LOGICAL, | ||
196 | } | ||
197 | }; | ||
198 | |||
199 | static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = { | 185 | static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = { |
200 | .dir = DMA_MEM_TO_DEV, | 186 | .dir = DMA_MEM_TO_DEV, |
201 | .dev_type = DB8500_DMA_DEV50_HAC1_TX, | 187 | .dev_type = DB8500_DMA_DEV50_HAC1_TX, |
@@ -318,7 +304,6 @@ static void __init mop500_uart_init(struct device *parent) | |||
318 | 304 | ||
319 | static void __init u8500_cryp1_hash1_init(struct device *parent) | 305 | static void __init u8500_cryp1_hash1_init(struct device *parent) |
320 | { | 306 | { |
321 | db8500_add_cryp1(parent, &u8500_cryp1_platform_data); | ||
322 | db8500_add_hash1(parent, &u8500_hash1_platform_data); | 307 | db8500_add_hash1(parent, &u8500_hash1_platform_data); |
323 | } | 308 | } |
324 | 309 | ||
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index 7eb1272bab1a..b32f1793322d 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/sys_soc.h> | 13 | #include <linux/sys_soc.h> |
14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
15 | #include <linux/platform_data/i2c-nomadik.h> | 15 | #include <linux/platform_data/i2c-nomadik.h> |
16 | #include <linux/platform_data/crypto-ux500.h> | ||
17 | 16 | ||
18 | struct spi_master_cntlr; | 17 | struct spi_master_cntlr; |
19 | 18 | ||
@@ -65,31 +64,6 @@ dbx500_add_rtc(struct device *parent, resource_size_t base, int irq) | |||
65 | 0, NULL, 0); | 64 | 0, NULL, 0); |
66 | } | 65 | } |
67 | 66 | ||
68 | struct cryp_platform_data; | ||
69 | |||
70 | static inline struct platform_device * | ||
71 | dbx500_add_cryp1(struct device *parent, int id, resource_size_t base, int irq, | ||
72 | struct cryp_platform_data *pdata) | ||
73 | { | ||
74 | struct resource res[] = { | ||
75 | DEFINE_RES_MEM(base, SZ_4K), | ||
76 | DEFINE_RES_IRQ(irq), | ||
77 | }; | ||
78 | |||
79 | struct platform_device_info pdevinfo = { | ||
80 | .parent = parent, | ||
81 | .name = "cryp1", | ||
82 | .id = id, | ||
83 | .res = res, | ||
84 | .num_res = ARRAY_SIZE(res), | ||
85 | .data = pdata, | ||
86 | .size_data = sizeof(*pdata), | ||
87 | .dma_mask = DMA_BIT_MASK(32), | ||
88 | }; | ||
89 | |||
90 | return platform_device_register_full(&pdevinfo); | ||
91 | } | ||
92 | |||
93 | struct hash_platform_data; | 67 | struct hash_platform_data; |
94 | 68 | ||
95 | static inline struct platform_device * | 69 | static inline struct platform_device * |
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index c3939323516c..7331b7e67821 100644 --- a/arch/arm/mach-ux500/devices-db8500.h +++ b/arch/arm/mach-ux500/devices-db8500.h | |||
@@ -109,8 +109,6 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base, | |||
109 | dbx500_add_uart(parent, "uart2", U8500_UART2_BASE, \ | 109 | dbx500_add_uart(parent, "uart2", U8500_UART2_BASE, \ |
110 | IRQ_DB8500_UART2, pdata) | 110 | IRQ_DB8500_UART2, pdata) |
111 | 111 | ||
112 | #define db8500_add_cryp1(parent, pdata) \ | ||
113 | dbx500_add_cryp1(parent, -1, U8500_CRYP1_BASE, IRQ_DB8500_CRYP1, pdata) | ||
114 | #define db8500_add_hash1(parent, pdata) \ | 112 | #define db8500_add_hash1(parent, pdata) \ |
115 | dbx500_add_hash1(parent, -1, U8500_HASH1_BASE, pdata) | 113 | dbx500_add_hash1(parent, -1, U8500_HASH1_BASE, pdata) |
116 | #endif | 114 | #endif |
diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h index cbc6f1e4104d..a5183e3c2884 100644 --- a/arch/arm/mach-ux500/devices.h +++ b/arch/arm/mach-ux500/devices.h | |||
@@ -15,7 +15,6 @@ extern struct platform_device u8500_gpio_devs[]; | |||
15 | extern struct amba_device ux500_pl031_device; | 15 | extern struct amba_device ux500_pl031_device; |
16 | 16 | ||
17 | extern struct platform_device ux500_hash1_device; | 17 | extern struct platform_device ux500_hash1_device; |
18 | extern struct platform_device ux500_cryp1_device; | ||
19 | 18 | ||
20 | extern struct platform_device u8500_dma40_device; | 19 | extern struct platform_device u8500_dma40_device; |
21 | extern struct platform_device ux500_ske_keypad_device; | 20 | extern struct platform_device ux500_ske_keypad_device; |