From patchwork Mon Oct 24 09:11:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 78915 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp2463469qge; Mon, 24 Oct 2016 02:12:32 -0700 (PDT) X-Received: by 10.98.57.84 with SMTP id g81mr26545106pfa.115.1477300352367; Mon, 24 Oct 2016 02:12:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t62si14420970pfd.133.2016.10.24.02.12.32; Mon, 24 Oct 2016 02:12:32 -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 S936277AbcJXJMb (ORCPT + 3 others); Mon, 24 Oct 2016 05:12:31 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33038 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934500AbcJXJMa (ORCPT ); Mon, 24 Oct 2016 05:12:30 -0400 Received: by mail-pf0-f172.google.com with SMTP id 128so95652053pfz.0 for ; Mon, 24 Oct 2016 02:12:30 -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=+DrUvTUAc2isjZQd97KcsXI7sZWVNFlPvwtR/cW6cLk=; b=dhCXxa1idMhz85p5bqTk7gITWXT7Q1At5a81iGqApVSNZnKA1oD5l5HzoSQ1B/rv57 /HgzyJN+w6F36rR8/VZAXusbwzk51dn/eqXfuWwilB9df/gxo/mMg0iaMiN9ZxyLJsUM PKkv02kuoDG33mMFCfNJ0cBanYizp0EEbytzU= 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=+DrUvTUAc2isjZQd97KcsXI7sZWVNFlPvwtR/cW6cLk=; b=FwZDb8LpoFh2pwyPiJejPAfG5LAx5BMbbCFqctk6At2NmaYywCEyt+rZGCaE9BT05z eRrzLTV6RcmkoaFUTgic50SqsqFYxzWTASrKwEKLsUCi4zY28HtXOM2MPNYQ//YCJSvJ ndZN0dlhGaBVhR7TzLr7JpXr3fgtznAvx6WO9JjCzTuvVB2IhX6+mUUvJzh9qutSDTSb eYk8TmAiidYI7jmMoYvVsZnWIDs9VfaHk2z+JIS5zR7zrrJJ+goWD5gRHNucrDlCktYs hGhhmnDpjJ9+xmhqqJ74JMgJ0o0JorcGWKlGq9ebuunKkfeSwKIwoj7xlS7VF4Feanwa NJ+g== X-Gm-Message-State: ABUngvd1YKw+XeY4ThsT6i7NP2iUf5l5ufq0FWkMG6ZX4pj7gKtnGGEXR+SJrD3PemGh8nyF X-Received: by 10.99.155.9 with SMTP id r9mr22058016pgd.52.1477300349910; Mon, 24 Oct 2016 02:12:29 -0700 (PDT) Received: from localhost.localdomain ([188.42.255.214]) by smtp.gmail.com with ESMTPSA id q23sm23464603pfg.95.2016.10.24.02.12.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Oct 2016 02:12:29 -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 4/5] mmc: dw: Add fifo address override property Date: Mon, 24 Oct 2016 17:11:55 +0800 Message-Id: <1477300316-1420-5-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477300316-1420-1-git-send-email-jun.nie@linaro.org> References: <1477300316-1420-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 of version 0x210A conflict with assumption that 0x100(version < 0x240A) and 0x200(version >= 0x240A) in some dw mmc implementation. So this property serves as a workaround to set fifo address with value provided by DT node. Signed-off-by: Jun Nie --- drivers/mmc/host/dw_mmc.c | 6 ++++++ include/linux/mmc/dw_mmc.h | 2 ++ 2 files changed, 8 insertions(+) -- 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..9dcd6da 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2955,6 +2955,9 @@ 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, "fifo-addr-override", + &host->fifo_addr_override); + if (!of_property_read_u32(np, "clock-frequency", &clock_frequency)) pdata->bus_hz = clock_frequency; @@ -3163,6 +3166,9 @@ int dw_mci_probe(struct dw_mci *host) else host->fifo_reg = host->regs + DATA_240A_OFFSET; + if (host->fifo_addr_override) + host->fifo_reg = host->regs + host->fifo_addr_override; + tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host); ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt, host->irq_flags, "dw-mci", host); diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index f5af2bd..4866ef5 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. + * @fifo_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 fifo_addr_override; struct scatterlist *sg; struct sg_mapping_iter sg_miter;