From patchwork Tue Feb 11 12:11:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24447 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7C30C206FF for ; Tue, 11 Feb 2014 12:12:14 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id c9sf16497261qcz.1 for ; Tue, 11 Feb 2014 04:12:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=0WR9Pt5+Xz6SSh1x00GIAZKdJqJcHdW90vwmr+LSsOM=; b=GuOngJoWF2hIWGZy0JtKgWL/4FMuNjJm2yGUxfNfotiUf1PiGZ7h6/t+79VLy+GrPm DH2hrG3uIB1fNUPNC6i40vsDafzo1NRj08AwW4e2EIP/roR4R+C9AFAZTWaMaIlnDTU0 zV9uJRMeMgDByowUPnUalWG1TNHtc13t3MM5QaPgk3i99yQMrYXwfsfr6VUpJlK48O3I bVHOcvv3lFAts9MClSnGyca5T6xDMEG41/ynMtyTlwOPxzG6D2Ly13z9Sap9CniNf4rs /QPasvMuEcluvxAboGzdpUGmz48zOf/0nKSMp8QDgLeAoQTAiPrl6THAHwlTCKJFhyqC oFbg== X-Gm-Message-State: ALoCoQmOG5now/NoUNc3fvZuqElnBRuCmYarlDuaRFSzQS3Wy7t74PC0DnklEO6cEJ34+sh1nAaB X-Received: by 10.58.50.9 with SMTP id y9mr414696ven.41.1392120733617; Tue, 11 Feb 2014 04:12:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.203 with SMTP id t69ls2389898qgd.87.gmail; Tue, 11 Feb 2014 04:12:13 -0800 (PST) X-Received: by 10.221.26.10 with SMTP id rk10mr28489584vcb.0.1392120733462; Tue, 11 Feb 2014 04:12:13 -0800 (PST) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id qi7si5826370veb.72.2014.02.11.04.12.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 04:12:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.176 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.176; Received: by mail-vc0-f176.google.com with SMTP id la4so5727054vcb.21 for ; Tue, 11 Feb 2014 04:12:13 -0800 (PST) X-Received: by 10.52.185.196 with SMTP id fe4mr4995827vdc.27.1392120733368; Tue, 11 Feb 2014 04:12:13 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp241282vcz; Tue, 11 Feb 2014 04:12:12 -0800 (PST) X-Received: by 10.194.201.134 with SMTP id ka6mr297121wjc.93.1392120731836; Tue, 11 Feb 2014 04:12:11 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id eo11si9448754wjd.21.2014.02.11.04.12.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Feb 2014 04:12:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDCC1-0004sg-PW; Tue, 11 Feb 2014 12:12:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDCBz-0000Qu-DZ; Tue, 11 Feb 2014 12:11:59 +0000 Received: from mail-wi0-f175.google.com ([209.85.212.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDCBu-0000P4-EF for linux-arm-kernel@lists.infradead.org; Tue, 11 Feb 2014 12:11:56 +0000 Received: by mail-wi0-f175.google.com with SMTP id hm4so4117548wib.14 for ; Tue, 11 Feb 2014 04:11:32 -0800 (PST) X-Received: by 10.180.7.130 with SMTP id j2mr14641181wia.25.1392120692523; Tue, 11 Feb 2014 04:11:32 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ua8sm43596199wjc.4.2014.02.11.04.11.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Feb 2014 04:11:31 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: ux500: drop DMA channel platform data for storage Date: Tue, 11 Feb 2014 13:11:27 +0100 Message-Id: <1392120687-12572-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140211_071154_587612_F52B40C4 X-CRM114-Status: GOOD ( 11.21 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.175 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij , Lee Jones , Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The MMC/SD interface driver (MMCI) already supports picking its DMA channels out of the device tree, so there is no point in overriding them with identical platform data as well. Cc: Lee Jones Cc: Ulf Hansson Signed-off-by: Linus Walleij Acked-by: Ulf Hansson --- arch/arm/mach-ux500/board-mop500-sdi.c | 79 ---------------------------------- 1 file changed, 79 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index fcbf3a13a539..0addb1815fa6 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -11,13 +11,11 @@ #include #include #include -#include #include #include "db8500-regs.h" #include "board-mop500.h" -#include "ste-dma40-db8500.h" /* * v2 has a new version of this block that need to be forced, the number found @@ -29,20 +27,6 @@ * SDI 0 (MicroSD slot) */ -#ifdef CONFIG_STE_DMA40 -struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_DEV_TO_MEM, - .dev_type = DB8500_DMA_DEV29_SD_MM0, -}; - -static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_MEM_TO_DEV, - .dev_type = DB8500_DMA_DEV29_SD_MM0, -}; -#endif - struct mmci_platform_data mop500_sdi0_data = { .f_max = 100000000, .capabilities = MMC_CAP_4_BIT_DATA | @@ -56,30 +40,11 @@ struct mmci_platform_data mop500_sdi0_data = { MCI_ST_CMDDIREN | MCI_ST_DATA0DIREN | MCI_ST_DATA2DIREN, -#ifdef CONFIG_STE_DMA40 - .dma_filter = stedma40_filter, - .dma_rx_param = &mop500_sdi0_dma_cfg_rx, - .dma_tx_param = &mop500_sdi0_dma_cfg_tx, -#endif }; /* * SDI1 (SDIO WLAN) */ -#ifdef CONFIG_STE_DMA40 -static struct stedma40_chan_cfg sdi1_dma_cfg_rx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_DEV_TO_MEM, - .dev_type = DB8500_DMA_DEV32_SD_MM1, -}; - -static struct stedma40_chan_cfg sdi1_dma_cfg_tx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_MEM_TO_DEV, - .dev_type = DB8500_DMA_DEV32_SD_MM1, -}; -#endif - struct mmci_platform_data mop500_sdi1_data = { .ocr_mask = MMC_VDD_29_30, .f_max = 100000000, @@ -87,31 +52,12 @@ struct mmci_platform_data mop500_sdi1_data = { MMC_CAP_NONREMOVABLE, .gpio_cd = -1, .gpio_wp = -1, -#ifdef CONFIG_STE_DMA40 - .dma_filter = stedma40_filter, - .dma_rx_param = &sdi1_dma_cfg_rx, - .dma_tx_param = &sdi1_dma_cfg_tx, -#endif }; /* * SDI 2 (POP eMMC, not on DB8500ed) */ -#ifdef CONFIG_STE_DMA40 -struct stedma40_chan_cfg mop500_sdi2_dma_cfg_rx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_DEV_TO_MEM, - .dev_type = DB8500_DMA_DEV28_SD_MM2, -}; - -static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_MEM_TO_DEV, - .dev_type = DB8500_DMA_DEV28_SD_MM2, -}; -#endif - struct mmci_platform_data mop500_sdi2_data = { .ocr_mask = MMC_VDD_165_195, .f_max = 100000000, @@ -123,31 +69,11 @@ struct mmci_platform_data mop500_sdi2_data = { MMC_CAP_CMD23, .gpio_cd = -1, .gpio_wp = -1, -#ifdef CONFIG_STE_DMA40 - .dma_filter = stedma40_filter, - .dma_rx_param = &mop500_sdi2_dma_cfg_rx, - .dma_tx_param = &mop500_sdi2_dma_cfg_tx, -#endif }; /* * SDI 4 (on-board eMMC) */ - -#ifdef CONFIG_STE_DMA40 -struct stedma40_chan_cfg mop500_sdi4_dma_cfg_rx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_DEV_TO_MEM, - .dev_type = DB8500_DMA_DEV42_SD_MM4, -}; - -static struct stedma40_chan_cfg mop500_sdi4_dma_cfg_tx = { - .mode = STEDMA40_MODE_LOGICAL, - .dir = DMA_MEM_TO_DEV, - .dev_type = DB8500_DMA_DEV42_SD_MM4, -}; -#endif - struct mmci_platform_data mop500_sdi4_data = { .f_max = 100000000, .capabilities = MMC_CAP_4_BIT_DATA | @@ -158,9 +84,4 @@ struct mmci_platform_data mop500_sdi4_data = { MMC_CAP_CMD23, .gpio_cd = -1, .gpio_wp = -1, -#ifdef CONFIG_STE_DMA40 - .dma_filter = stedma40_filter, - .dma_rx_param = &mop500_sdi4_dma_cfg_rx, - .dma_tx_param = &mop500_sdi4_dma_cfg_tx, -#endif };