From patchwork Fri Aug 23 12:23:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19444 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 96CA6248E6 for ; Fri, 23 Aug 2013 12:24:12 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id o19sf440390qap.11 for ; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=SjjV1a0ZRQc+0cjOIVN+QcR3in8LUvMxwx6dMhe8S7g=; b=nMFk/Yv6d+aH5XBQiLrzFkHgL9QsJ+ulXucA3vNMMWlDcHJkjaOtaIE4Ee6ab1WVI2 njbjEyrazpXiJfhldmWips2/9GLT59sWI0sry3PmJncZGCWQbSHEfigrODKCxggrGuSG zvMiJYzKgRU11I82YwTMYbrtVWjCBl8qJjbgllgrjkz/uPcdWDOh4xX69wKqVTGOiIzM fbNkXGqc2TM8mz3bM2sbqIuu/+yCWl5+DJnEXyJh9el/+RiUbTvuzideV3cjzZ+OXpuR eGuOdsh7t+bQVZzNmskc76RrOvxjrVnF5h9lQHeSTRRpCjBs34sHnIbNVPvr5eJf/Ehf athA== X-Received: by 10.224.223.198 with SMTP id il6mr16670218qab.7.1377260652449; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.51.40 with SMTP id h8ls1499992qeo.28.gmail; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) X-Received: by 10.59.8.232 with SMTP id dn8mr16269051ved.8.1377260652336; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id u7si5463304vcn.112.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:12 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ib11so396398vcb.0 for ; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) X-Gm-Message-State: ALoCoQlb5eP1P6TlbUYpYS1kImYu6sznusyo1oyFEaHCquqFXWqLzUCjbz/35dNyAYcAc8aNgyqV X-Received: by 10.220.181.136 with SMTP id by8mr16713614vcb.11.1377260652236; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp90094vcz; Fri, 23 Aug 2013 05:24:11 -0700 (PDT) X-Received: by 10.14.184.3 with SMTP id r3mr26337438eem.49.1377260651185; Fri, 23 Aug 2013 05:24:11 -0700 (PDT) Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com [74.125.83.47]) by mx.google.com with ESMTPS id k2si16798850eey.32.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:11 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.47 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.83.47; Received: by mail-ee0-f47.google.com with SMTP id d49so258017eek.20 for ; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) X-Received: by 10.14.173.4 with SMTP id u4mr288713eel.81.1377260650567; Fri, 23 Aug 2013 05:24:10 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id f49sm24417729eec.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:09 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 10/40] ARM: ux500: Deactivate Crypt support when booting with ATAGs Date: Fri, 23 Aug 2013 13:23:10 +0100 Message-Id: <1377260620-18829-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> References: <1377260620-18829-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- arch/arm/mach-ux500/board-mop500.c | 15 --------------- arch/arm/mach-ux500/devices-common.h | 26 -------------------------- arch/arm/mach-ux500/devices-db8500.h | 2 -- arch/arm/mach-ux500/devices.h | 1 - 4 files changed, 44 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index b8b5ebe..f75ac95 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -45,7 +45,6 @@ #include "setup.h" #include "devices.h" #include "irqs.h" -#include #include "ste-dma40-db8500.h" #include "db8500-regs.h" @@ -174,19 +173,6 @@ static void mop500_prox_deactivate(struct device *dev) regulator_put(prox_regulator); } -static struct cryp_platform_data u8500_cryp1_platform_data = { - .mem_to_engine = { - .dir = DMA_MEM_TO_DEV, - .dev_type = DB8500_DMA_DEV48_CAC1, - .mode = STEDMA40_MODE_LOGICAL, - }, - .engine_to_mem = { - .dir = DMA_DEV_TO_MEM, - .dev_type = DB8500_DMA_DEV48_CAC1, - .mode = STEDMA40_MODE_LOGICAL, - } -}; - static struct stedma40_chan_cfg u8500_hash_dma_cfg_tx = { .dir = DMA_MEM_TO_DEV, .dev_type = DB8500_DMA_DEV50_HAC1_TX, @@ -309,7 +295,6 @@ static void __init mop500_uart_init(struct device *parent) static void __init u8500_cryp1_hash1_init(struct device *parent) { - db8500_add_cryp1(parent, &u8500_cryp1_platform_data); db8500_add_hash1(parent, &u8500_hash1_platform_data); } diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index 7eb1272..b32f179 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -13,7 +13,6 @@ #include #include #include -#include struct spi_master_cntlr; @@ -65,31 +64,6 @@ dbx500_add_rtc(struct device *parent, resource_size_t base, int irq) 0, NULL, 0); } -struct cryp_platform_data; - -static inline struct platform_device * -dbx500_add_cryp1(struct device *parent, int id, resource_size_t base, int irq, - struct cryp_platform_data *pdata) -{ - struct resource res[] = { - DEFINE_RES_MEM(base, SZ_4K), - DEFINE_RES_IRQ(irq), - }; - - struct platform_device_info pdevinfo = { - .parent = parent, - .name = "cryp1", - .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 hash_platform_data; static inline struct platform_device * diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index c393932..7331b7e 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, dbx500_add_uart(parent, "uart2", U8500_UART2_BASE, \ IRQ_DB8500_UART2, pdata) -#define db8500_add_cryp1(parent, pdata) \ - dbx500_add_cryp1(parent, -1, U8500_CRYP1_BASE, IRQ_DB8500_CRYP1, pdata) #define db8500_add_hash1(parent, pdata) \ dbx500_add_hash1(parent, -1, U8500_HASH1_BASE, pdata) #endif diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h index cbc6f1e..a5183e3 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[]; extern struct amba_device ux500_pl031_device; extern struct platform_device ux500_hash1_device; -extern struct platform_device ux500_cryp1_device; extern struct platform_device u8500_dma40_device; extern struct platform_device ux500_ske_keypad_device;