aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-09-18 09:35:06 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-09-26 05:07:23 -0400
commit598ad492bff2742407c238355a67a79ca096287f (patch)
tree04f6b2082c6e15979ce545cc9c05798fdf8a1c9d
parent3b91f30093286094e9ed8c5513c9bfcd97191111 (diff)
ARM: ux500: Rip out Hash support when booting with ATAGs
It's time to remove all ATAG support from ux500 and rely solely on Device Tree booting. This patch is part of that endeavour. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c19
-rw-r--r--arch/arm/mach-ux500/devices-common.h24
-rw-r--r--arch/arm/mach-ux500/devices-db8500.h2
-rw-r--r--arch/arm/mach-ux500/devices.h2
4 files changed, 0 insertions, 47 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index c4fdb03be2cf..65b3dbb1a7ef 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -182,17 +182,6 @@ static void mop500_prox_deactivate(struct device *dev)
182 regulator_put(prox_regulator); 182 regulator_put(prox_regulator);
183} 183}
184 184
185static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = {
186 .dir = DMA_MEM_TO_DEV,
187 .dev_type = DB8500_DMA_DEV50_HAC1_TX,
188 .mode = STEDMA40_MODE_LOGICAL,
189};
190
191static struct hash_platform_data u8500_hash1_platform_data = {
192 .mem_to_engine = &u8500_hash_dma_cfg_tx,
193 .dma_filter = stedma40_filter,
194};
195
196/* add any platform devices here - TODO */ 185/* add any platform devices here - TODO */
197static struct platform_device *mop500_platform_devs[] __initdata = { 186static struct platform_device *mop500_platform_devs[] __initdata = {
198 &mop500_gpio_keys_device, 187 &mop500_gpio_keys_device,
@@ -302,11 +291,6 @@ static void __init mop500_uart_init(struct device *parent)
302 db8500_add_uart2(parent, &uart2_plat); 291 db8500_add_uart2(parent, &uart2_plat);
303} 292}
304 293
305static void __init u8500_cryp1_hash1_init(struct device *parent)
306{
307 db8500_add_hash1(parent, &u8500_hash1_platform_data);
308}
309
310static void __init mop500_init_machine(void) 294static void __init mop500_init_machine(void)
311{ 295{
312 struct device *parent = NULL; 296 struct device *parent = NULL;
@@ -328,7 +312,6 @@ static void __init mop500_init_machine(void)
328 mop500_sdi_init(parent); 312 mop500_sdi_init(parent);
329 mop500_spi_init(parent); 313 mop500_spi_init(parent);
330 mop500_uart_init(parent); 314 mop500_uart_init(parent);
331 u8500_cryp1_hash1_init(parent);
332 315
333 /* This board has full regulator constraints */ 316 /* This board has full regulator constraints */
334 regulator_has_full_constraints(); 317 regulator_has_full_constraints();
@@ -349,8 +332,6 @@ static void __init snowball_init_machine(void)
349 mop500_spi_init(parent); 332 mop500_spi_init(parent);
350 mop500_uart_init(parent); 333 mop500_uart_init(parent);
351 334
352 u8500_cryp1_hash1_init(parent);
353
354 /* This board has full regulator constraints */ 335 /* This board has full regulator constraints */
355 regulator_has_full_constraints(); 336 regulator_has_full_constraints();
356} 337}
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index b32f1793322d..04fa009b5240 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -64,30 +64,6 @@ dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
64 0, NULL, 0); 64 0, NULL, 0);
65} 65}
66 66
67struct hash_platform_data;
68
69static inline struct platform_device *
70dbx500_add_hash1(struct device *parent, int id, resource_size_t base,
71 struct hash_platform_data *pdata)
72{
73 struct resource res[] = {
74 DEFINE_RES_MEM(base, SZ_4K),
75 };
76
77 struct platform_device_info pdevinfo = {
78 .parent = parent,
79 .name = "hash1",
80 .id = id,
81 .res = res,
82 .num_res = ARRAY_SIZE(res),
83 .data = pdata,
84 .size_data = sizeof(*pdata),
85 .dma_mask = DMA_BIT_MASK(32),
86 };
87
88 return platform_device_register_full(&pdevinfo);
89}
90
91struct nmk_gpio_platform_data; 67struct nmk_gpio_platform_data;
92 68
93void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num, 69void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index 7331b7e67821..3d326688254d 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -109,6 +109,4 @@ 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_hash1(parent, pdata) \
113 dbx500_add_hash1(parent, -1, U8500_HASH1_BASE, pdata)
114#endif 112#endif
diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h
index a5183e3c2884..9b5eb69a0154 100644
--- a/arch/arm/mach-ux500/devices.h
+++ b/arch/arm/mach-ux500/devices.h
@@ -14,8 +14,6 @@ extern struct platform_device u8500_gpio_devs[];
14 14
15extern struct amba_device ux500_pl031_device; 15extern struct amba_device ux500_pl031_device;
16 16
17extern struct platform_device ux500_hash1_device;
18
19extern struct platform_device u8500_dma40_device; 17extern struct platform_device u8500_dma40_device;
20extern struct platform_device ux500_ske_keypad_device; 18extern struct platform_device ux500_ske_keypad_device;
21 19