From patchwork Fri Aug 23 12:23:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 19445 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9C848248E6 for ; Fri, 23 Aug 2013 12:24:14 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id g17sf431229vbg.2 for ; Fri, 23 Aug 2013 05:24:14 -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=szZJT5K694t2zrZhmWxWrJikcFtpbMEIkbtbYzA6ZM4=; b=ddFP9Lfq3t9dFLYPeiX3yy9vxpW0lwjJRs3LSYTPHobt0jaDcZigbuBrxKKpCvNURR II2jYJjQ+GmOSj95BJ1W1gXJAhJEzlsK6/E9AVohlXq7cJ2BXJebk9LtQU7VjoQ092o9 0hgedTijRwzh6XolDCNXcoXlAurJjH7VhIxTK5iHAFZuRpAGkeWYpRTa8rwPZwMuqTKH /8jKNrM6MSGcK3gB4G0/S7PR/gDv/d8JwAr41wG085lc//wvkP46Y2uOTw34rliyWTGI EyQtgKd3Bz5ZoFk0Xg7vXIxqaIMG7c22yeWt55BBwiXqHmj3lvgBg1UYJ4nYTiQjVjTo RuNw== X-Received: by 10.236.17.161 with SMTP id j21mr461567yhj.55.1377260654418; Fri, 23 Aug 2013 05:24:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.97.227 with SMTP id ed3ls1395681qeb.57.gmail; Fri, 23 Aug 2013 05:24:14 -0700 (PDT) X-Received: by 10.220.249.67 with SMTP id mj3mr1172944vcb.23.1377260654319; Fri, 23 Aug 2013 05:24:14 -0700 (PDT) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id f8si5478691vec.9.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.50 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.50; Received: by mail-vb0-f50.google.com with SMTP id x14so365072vbb.37 for ; Fri, 23 Aug 2013 05:24:14 -0700 (PDT) X-Gm-Message-State: ALoCoQn2fYBm/4c3qZHQHviPI4otFR4uLbKBZbDlk455pu5ZRL/ZCEbqPnJ0vRdvtUtVdakrqlMt X-Received: by 10.220.91.16 with SMTP id k16mr16596186vcm.21.1377260654225; Fri, 23 Aug 2013 05:24:14 -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 u4csp90097vcz; Fri, 23 Aug 2013 05:24:13 -0700 (PDT) X-Received: by 10.14.4.1 with SMTP id 1mr26380357eei.21.1377260653192; Fri, 23 Aug 2013 05:24:13 -0700 (PDT) Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by mx.google.com with ESMTPS id k2si16760300eey.182.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Aug 2013 05:24:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.179 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.179; Received: by mail-ea0-f179.google.com with SMTP id b10so264728eae.10 for ; Fri, 23 Aug 2013 05:24:12 -0700 (PDT) X-Received: by 10.14.216.3 with SMTP id f3mr287860eep.80.1377260652561; Fri, 23 Aug 2013 05:24:12 -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:11 -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 11/40] ARM: ux500: Rip out Hash support when booting with ATAGs Date: Fri, 23 Aug 2013 13:23:11 +0100 Message-Id: <1377260620-18829-12-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.212.50 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 | 20 -------------------- arch/arm/mach-ux500/devices-common.h | 24 ------------------------ arch/arm/mach-ux500/devices-db8500.h | 2 -- arch/arm/mach-ux500/devices.h | 2 -- 4 files changed, 48 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index f75ac95..fec8733 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -173,17 +173,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, @@ -293,11 +282,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; @@ -321,8 +305,6 @@ static void __init mop500_init_machine(void) mop500_spi_init(parent); mop500_uart_init(parent); - u8500_cryp1_hash1_init(parent); - i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); @@ -347,8 +329,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(); } diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index b32f179..04fa009 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) 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, diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h index 7331b7e..3d32668 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, 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 diff --git a/arch/arm/mach-ux500/devices.h b/arch/arm/mach-ux500/devices.h index a5183e3..9b5eb69 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[]; 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;