ARM: ux500: Rip out Hash support when booting with ATAGs
authorLee Jones <lee.jones@linaro.org>
Wed, 18 Sep 2013 13:35:06 +0000 (14:35 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 26 Sep 2013 09:07:23 +0000 (11:07 +0200)
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>
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/devices-common.h
arch/arm/mach-ux500/devices-db8500.h
arch/arm/mach-ux500/devices.h

index c4fdb03be2cfb9c3955d339c65a447ae12ccd965..65b3dbb1a7efacf6dc0858b9278de40e451e78c8 100644 (file)
@@ -182,17 +182,6 @@ static void mop500_prox_deactivate(struct device *dev)
        regulator_put(prox_regulator);
 }
 
-static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = {
-               .dir = DMA_MEM_TO_DEV,
-               .dev_type = DB8500_DMA_DEV50_HAC1_TX,
-               .mode = STEDMA40_MODE_LOGICAL,
-};
-
-static struct hash_platform_data u8500_hash1_platform_data = {
-               .mem_to_engine = &u8500_hash_dma_cfg_tx,
-               .dma_filter = stedma40_filter,
-};
-
 /* add any platform devices here - TODO */
 static struct platform_device *mop500_platform_devs[] __initdata = {
        &mop500_gpio_keys_device,
@@ -302,11 +291,6 @@ static void __init mop500_uart_init(struct device *parent)
        db8500_add_uart2(parent, &uart2_plat);
 }
 
-static void __init u8500_cryp1_hash1_init(struct device *parent)
-{
-       db8500_add_hash1(parent, &u8500_hash1_platform_data);
-}
-
 static void __init mop500_init_machine(void)
 {
        struct device *parent = NULL;
@@ -328,7 +312,6 @@ static void __init mop500_init_machine(void)
        mop500_sdi_init(parent);
        mop500_spi_init(parent);
        mop500_uart_init(parent);
-       u8500_cryp1_hash1_init(parent);
 
        /* This board has full regulator constraints */
        regulator_has_full_constraints();
@@ -349,8 +332,6 @@ static void __init snowball_init_machine(void)
        mop500_spi_init(parent);
        mop500_uart_init(parent);
 
-       u8500_cryp1_hash1_init(parent);
-
        /* This board has full regulator constraints */
        regulator_has_full_constraints();
 }
index b32f1793322daa9eb9d74939ff514029abd44161..04fa009b5240817f20009a69c84b723355a7e39c 100644 (file)
@@ -64,30 +64,6 @@ dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
                                0, NULL, 0);
 }
 
-struct hash_platform_data;
-
-static inline struct platform_device *
-dbx500_add_hash1(struct device *parent, int id, resource_size_t base,
-               struct hash_platform_data *pdata)
-{
-       struct resource res[] = {
-                       DEFINE_RES_MEM(base, SZ_4K),
-       };
-
-       struct platform_device_info pdevinfo = {
-                       .parent = parent,
-                       .name = "hash1",
-                       .id = id,
-                       .res = res,
-                       .num_res = ARRAY_SIZE(res),
-                       .data = pdata,
-                       .size_data = sizeof(*pdata),
-                       .dma_mask = DMA_BIT_MASK(32),
-       };
-
-       return platform_device_register_full(&pdevinfo);
-}
-
 struct nmk_gpio_platform_data;
 
 void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,
index 7331b7e6782100fcca2b6bb7f1f999afc95ea58b..3d326688254d474b23ef6f11405b84024a0bc7a1 100644 (file)
@@ -109,6 +109,4 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base,
        dbx500_add_uart(parent, "uart2", U8500_UART2_BASE, \
                        IRQ_DB8500_UART2, pdata)
 
-#define db8500_add_hash1(parent, pdata) \
-       dbx500_add_hash1(parent, -1, U8500_HASH1_BASE, pdata)
 #endif
index a5183e3c28840689f95b646321b9d57477641735..9b5eb69a0154a664828a6744f44d7300b4895eef 100644 (file)
@@ -14,8 +14,6 @@ extern struct platform_device u8500_gpio_devs[];
 
 extern struct amba_device ux500_pl031_device;
 
-extern struct platform_device ux500_hash1_device;
-
 extern struct platform_device u8500_dma40_device;
 extern struct platform_device ux500_ske_keypad_device;