From patchwork Tue Nov 8 01:24:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 81219 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1306677qge; Mon, 7 Nov 2016 17:26:03 -0800 (PST) X-Received: by 10.98.138.72 with SMTP id y69mr15759979pfd.52.1478568363450; Mon, 07 Nov 2016 17:26:03 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l81si28992469pfi.32.2016.11.07.17.26.03; Mon, 07 Nov 2016 17:26:03 -0800 (PST) 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 S1752569AbcKHBZv (ORCPT + 3 others); Mon, 7 Nov 2016 20:25:51 -0500 Received: from mail-pf0-f177.google.com ([209.85.192.177]:35207 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752535AbcKHBZt (ORCPT ); Mon, 7 Nov 2016 20:25:49 -0500 Received: by mail-pf0-f177.google.com with SMTP id i88so98059324pfk.2 for ; Mon, 07 Nov 2016 17:25:49 -0800 (PST) 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=OyTXngh1mvo2jUHi1i/NtFG+UYxIorgKIUeUqkxBb019tIe1alrQM/cn8mHi3+Zuzq q7wNSpwuwtLsM5Hj22pUKZNWw/bV4+K8W8JdegBcd/duhF65PpYehrP7D0SSbbByBn/o fjw7tDeWEDjFEi9ef7BYTaH5IWrzuCJ08Im3A= 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=YlvSPmMbas6rWlr26uBU6iLWy8UzXD88Q2QwHNLMQXBdo705XajPRuW8D9lqFDpmzc dcd7usRLv2/7XGjyPKfuyPm9b1wonnWzucos+E0xk0fdZ+NAJS12plReSErcBYx6hi1k 6v/fUMtDyPtql9Dp8PZ5y+IWN8ysIu1f7GiHoIdPKk+qp3WS7oDgnqrETPOMsfwlEWcq t5iPgraJxFoB32GMV+nm+Xgo2TZUKQgM9XtDwU8plFXEO71eO0FTyFQVPvoqUDvjtvjE hVe+zVdb1AQ6R+mWjwnAWrBF/1MgBvqWWFYm3EuTcEoUyh8SFytYZSVM825+js8c6LOf Ck8w== X-Gm-Message-State: ABUngvfjNEWBgYpzPEqzxu9O4BxwhZ7PA3gDXQCLir2Ahdg0ItE/ckUJEI3JsQruFY2oizNA X-Received: by 10.99.6.134 with SMTP id 128mr14749558pgg.53.1478568348550; Mon, 07 Nov 2016 17:25:48 -0800 (PST) Received: from localhost.localdomain ([188.42.255.211]) by smtp.gmail.com with ESMTPSA id a22sm43360056pfg.7.2016.11.07.17.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Nov 2016 17:25:48 -0800 (PST) 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 v5 4/5] mmc: dw: Add fifo address property Date: Tue, 8 Nov 2016 09:24:57 +0800 Message-Id: <1478568298-18380-5-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478568298-18380-1-git-send-email-jun.nie@linaro.org> References: <1478568298-18380-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 Reviewed-by: Shawn Lin 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;