From patchwork Thu Nov 3 13:31:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 80659 Delivered-To: patch@linaro.org Received: by 10.80.170.210 with SMTP id r18csp621706edc; Thu, 3 Nov 2016 06:32:20 -0700 (PDT) X-Received: by 10.107.41.4 with SMTP id p4mr8201501iop.16.1478179940310; Thu, 03 Nov 2016 06:32:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xs9si8030476pab.86.2016.11.03.06.32.20; Thu, 03 Nov 2016 06:32:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153AbcKCNcT (ORCPT + 3 others); Thu, 3 Nov 2016 09:32:19 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:36602 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752503AbcKCNcS (ORCPT ); Thu, 3 Nov 2016 09:32:18 -0400 Received: by mail-pf0-f173.google.com with SMTP id 189so32091134pfz.3 for ; Thu, 03 Nov 2016 06:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9Xli1L7gNxZYS62UxdlZMjSLmlGNDukDHh8E12vu1tE=; b=d//BDOvKPtFdwxQsej+7aM7d5SzTYoKZrok/B/PleqVF7zRMdMADigPjiEZ0enMZ2b aQp6xV0DSQY8ug78Kjmrnt3zpQBsSHv7lA/YvxOHrU2Db/ee8TXdAlQA0ji6ZTiIhNEn GBeuNeQR+g1BJBUaYAloay5Ko5j338CRkKVpU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9Xli1L7gNxZYS62UxdlZMjSLmlGNDukDHh8E12vu1tE=; b=gnB2ml7//nX3XwA/1fCUD3cYgLiEJBJFNQFB5VepghPMjuxBS87HKzneW2Mosr6oJy E6rXacqRqYpSgeHN/qv1p30cChTFAgcvvhoBZdGxvBX3MdUoDZ/lEd/vRs+tbcTjI0jN Oi53BJIUG6CbhTj3IGim9lOIb4C3HfXgpQcCV2Nk3IWTdXzZrKFPgNFuUSwakEpX1RgP p8pAsd4EhWLNXunlXQuY86dCPwPfydpyTxS9IGtrodZBFQ0/o3uPZ4WTPyjTQWOe6wul /WUkEgQip0NIcgnZI5qRlv+fplQ5gfMxDsahW1zVgyFzMOYwY+Nmm0zfL7linJS+9qmT RKLQ== X-Gm-Message-State: ABUngvcgxoL2b0HzbQ0eAo4uFv3ZJwTTKGFPH7R0INN5r/gPspM5Q1EOMV3/IB6MaMam7Ogh X-Received: by 10.98.73.203 with SMTP id r72mr17040251pfi.4.1478179937937; Thu, 03 Nov 2016 06:32:17 -0700 (PDT) Received: from localhost.localdomain ([188.42.252.253]) by smtp.gmail.com with ESMTPSA id j192sm12926803pfc.60.2016.11.03.06.32.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 06:32:17 -0700 (PDT) From: Jun Nie To: shawn.guo@linaro.org, xie.baoyou@zte.com.cn Cc: ulf.hansson@linaro.org, jh80.chung@samsung.com, jason.liu@linaro.org, linux-mmc@vger.kernel.org, Jun Nie Subject: [PATCH v3 4/5] mmc: dw: Add fifo address property Date: Thu, 3 Nov 2016 21:31:40 +0800 Message-Id: <1478179901-25645-5-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478179901-25645-1-git-send-email-jun.nie@linaro.org> References: <1478179901-25645-1-git-send-email-jun.nie@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The FIFO address may break default address assumption of 0x100 (version < 0x240A) and 0x200(version >= 0x240A) in current driver. The new property is introduced to override fifo address via DT node information. Signed-off-by: Jun Nie --- drivers/mmc/host/dw_mmc.c | 6 +++++- include/linux/mmc/dw_mmc.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1c9ee36..696b5e6 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2955,6 +2955,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) of_property_read_u32(np, "card-detect-delay", &pdata->detect_delay_ms); + of_property_read_u32(np, "data-addr", &host->data_addr_override); + if (!of_property_read_u32(np, "clock-frequency", &clock_frequency)) pdata->bus_hz = clock_frequency; @@ -3158,7 +3160,9 @@ int dw_mci_probe(struct dw_mci *host) host->verid = SDMMC_GET_VERID(mci_readl(host, VERID)); dev_info(host->dev, "Version ID is %04x\n", host->verid); - if (host->verid < DW_MMC_240A) + if (host->data_addr_override) + host->fifo_reg = host->regs + host->data_addr_override; + else if (host->verid < DW_MMC_240A) host->fifo_reg = host->regs + DATA_OFFSET; else host->fifo_reg = host->regs + DATA_240A_OFFSET; diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index f5af2bd..17cb95a 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -107,6 +107,7 @@ struct dw_mci_dma_slave { * @ciu_clk: Pointer to card interface unit clock instance. * @slot: Slots sharing this MMC controller. * @fifo_depth: depth of FIFO. + * @data_addr_override: override fifo reg offset with this value. * @data_shift: log2 of FIFO item size. * @part_buf_start: Start index in part_buf. * @part_buf_count: Bytes of partial data in part_buf. @@ -154,6 +155,7 @@ struct dw_mci { spinlock_t irq_lock; void __iomem *regs; void __iomem *fifo_reg; + u32 data_addr_override; struct scatterlist *sg; struct sg_mapping_iter sg_miter;