From patchwork Thu Sep 5 07:38:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11132323 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CD311510 for ; Thu, 5 Sep 2019 07:39:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C94722CE8 for ; Thu, 5 Sep 2019 07:39:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="Z2UiLHs+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732151AbfIEHjU (ORCPT ); Thu, 5 Sep 2019 03:39:20 -0400 Received: from sender4-pp-o95.zoho.com ([136.143.188.95]:25511 "EHLO sender4-pp-o95.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728072AbfIEHjT (ORCPT ); Thu, 5 Sep 2019 03:39:19 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1567669116; cv=none; d=zoho.com; s=zohoarc; b=TlFcqFBhTxkXFm+qZD2KmWorCV1Q995Frdh/169tde8AvUxfGyll78ONAE+W/T1spGsd4f3k6dn8JmsKz0qn4Vz0kIK2SFlmgfqxPoivyjPyuNLRweZMSu/JNC/QQSmHstUP0H1M5BikZkfyRK2bVJxMJCCV9nSTMd+XKg7XPNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567669116; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=no85iaJ0HmXEGz1jZcuzTck29a5rHbtxXoVG0kJSZfk=; b=jgr6OOi9C5oSZElvpTiQhWaHO5r3zCPwN7YOu4gSbUCkLR7YW+xfjJIA4QPCFDNlhWsTsQewe+Sj8lWQOGaRwXOsRnz21hpSIVnFcO9dfYLqhzrNhy1B7K4+xAkelpiXRMQMJKCA+p26vnmiqvq5chWO/axDD9arKKK6aTD2YU8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=zhouyanjie@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=iILQy9qJtg8BR1p8ai3nvXG+HInP2Q+AnD8DKMPFaK4wiCGHaEBdzx6qzmaqSBIqCz4oA9BqebaZ g39VXCqxKJ4fiokxmKhYhmFBoRHk8XJ49OIwa4LNfR2XAVT1cGYj DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1567669116; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=3100; bh=no85iaJ0HmXEGz1jZcuzTck29a5rHbtxXoVG0kJSZfk=; b=Z2UiLHs+5XZxY00bTJNE7UKyyiBbLUSkqIOEcvHTMNCSEy32mqBePScQM8cTF8ok mhnJWK5ff12hiVp0oeV2PYZ2DW3YLZ7ECytYU+472pE21GJbsLYYhv571qbDEwCglBn 5OI4+LIg7UQGrTBx+sbiuDJ+FFSdRbKPpG+IXqlA= Received: from zhouyanjie-virtual-machine.localdomain (125.71.5.36 [125.71.5.36]) by mx.zohomail.com with SMTPS id 1567669114862143.77120560367462; Thu, 5 Sep 2019 00:38:34 -0700 (PDT) From: Zhou Yanjie To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, ulf.hansson@linaro.org, paul.burton@mips.com, linus.walleij@linaro.org, paul@crapouillou.net, malat@debian.org, yuehaibing@huawei.com, ezequiel@collabora.com, robh+dt@kernel.org, mark.rutland@arm.com, syq@debian.org, jiaxun.yang@flygoat.com Subject: [PATCH 1/4] MMC: Ingenic: Adjust the macro definition name. Date: Thu, 5 Sep 2019 15:38:06 +0800 Message-Id: <1567669089-88693-2-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Adjust the macro definition name to match the corresponding register name in the datasheet. Signed-off-by: Zhou Yanjie --- drivers/mmc/host/jz4740_mmc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index ffdbfaa..1b1fcb7 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -28,7 +28,7 @@ #include #define JZ_REG_MMC_STRPCL 0x00 -#define JZ_REG_MMC_STATUS 0x04 +#define JZ_REG_MMC_STAT 0x04 #define JZ_REG_MMC_CLKRT 0x08 #define JZ_REG_MMC_CMDAT 0x0C #define JZ_REG_MMC_RESTO 0x10 @@ -40,7 +40,7 @@ #define JZ_REG_MMC_IREG 0x28 #define JZ_REG_MMC_CMD 0x2C #define JZ_REG_MMC_ARG 0x30 -#define JZ_REG_MMC_RESP_FIFO 0x34 +#define JZ_REG_MMC_RES 0x34 #define JZ_REG_MMC_RXFIFO 0x38 #define JZ_REG_MMC_TXFIFO 0x3C #define JZ_REG_MMC_DMAC 0x44 @@ -391,7 +391,7 @@ static void jz4740_mmc_clock_disable(struct jz4740_mmc_host *host) writew(JZ_MMC_STRPCL_CLOCK_STOP, host->base + JZ_REG_MMC_STRPCL); do { - status = readl(host->base + JZ_REG_MMC_STATUS); + status = readl(host->base + JZ_REG_MMC_STAT); } while (status & JZ_MMC_STATUS_CLK_EN && --timeout); } @@ -403,7 +403,7 @@ static void jz4740_mmc_reset(struct jz4740_mmc_host *host) writew(JZ_MMC_STRPCL_RESET, host->base + JZ_REG_MMC_STRPCL); udelay(10); do { - status = readl(host->base + JZ_REG_MMC_STATUS); + status = readl(host->base + JZ_REG_MMC_STAT); } while (status & JZ_MMC_STATUS_IS_RESETTING && --timeout); } @@ -446,7 +446,7 @@ static void jz4740_mmc_transfer_check_state(struct jz4740_mmc_host *host, { int status; - status = readl(host->base + JZ_REG_MMC_STATUS); + status = readl(host->base + JZ_REG_MMC_STAT); if (status & JZ_MMC_STATUS_WRITE_ERROR_MASK) { if (status & (JZ_MMC_STATUS_TIMEOUT_WRITE)) { host->req->cmd->error = -ETIMEDOUT; @@ -580,10 +580,10 @@ static bool jz4740_mmc_read_data(struct jz4740_mmc_host *host, /* For whatever reason there is sometime one word more in the fifo then * requested */ timeout = 1000; - status = readl(host->base + JZ_REG_MMC_STATUS); + status = readl(host->base + JZ_REG_MMC_STAT); while (!(status & JZ_MMC_STATUS_DATA_FIFO_EMPTY) && --timeout) { d = readl(fifo_addr); - status = readl(host->base + JZ_REG_MMC_STATUS); + status = readl(host->base + JZ_REG_MMC_STAT); } return false; @@ -614,7 +614,7 @@ static void jz4740_mmc_read_response(struct jz4740_mmc_host *host, { int i; uint16_t tmp; - void __iomem *fifo_addr = host->base + JZ_REG_MMC_RESP_FIFO; + void __iomem *fifo_addr = host->base + JZ_REG_MMC_RES; if (cmd->flags & MMC_RSP_136) { tmp = readw(fifo_addr); @@ -797,7 +797,7 @@ static irqreturn_t jz_mmc_irq(int irq, void *devid) struct mmc_command *cmd = host->cmd; uint32_t irq_reg, status, tmp; - status = readl(host->base + JZ_REG_MMC_STATUS); + status = readl(host->base + JZ_REG_MMC_STAT); irq_reg = jz4740_mmc_read_irq_reg(host); tmp = irq_reg; From patchwork Thu Sep 5 07:38:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11132359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71DAE1395 for ; Thu, 5 Sep 2019 07:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52CE02173B for ; Thu, 5 Sep 2019 07:54:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="naYOwA+x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729366AbfIEHyp (ORCPT ); Thu, 5 Sep 2019 03:54:45 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25490 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726073AbfIEHyp (ORCPT ); Thu, 5 Sep 2019 03:54:45 -0400 X-Greylist: delayed 948 seconds by postgrey-1.27 at vger.kernel.org; Thu, 05 Sep 2019 03:54:44 EDT ARC-Seal: i=1; a=rsa-sha256; t=1567669124; cv=none; d=zoho.com; s=zohoarc; b=mXDWIQQF0GBmUYjIgzV6AOoV/41THvi5CQbX3LvhjXiKWOqouDQpEaSuTzW2h+tyXe550aPfJNJbjTNKQT9xSInKOEje78IBjElzTS3+1PsbgUMBzWE2SN2BCMDT1Lhwsxa+HbAMVSCTBif0a3+pMv977pBjj6oeD7MxaSpGuAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567669124; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=egFOrDQp87JufeuaATPLZS9Nk9CVn431TNKVdr5uG9c=; b=mZ6KtAqlk9QrrhQ8RX4LrG2xZPUMF2CX9414cpcGJS7Q+t11nSmzmEoGvypyQxM+4i3V7OfHXnz6O90dO0KO5Sb2UKQExrLiAdP/oIRNkoL3n6frTchT06HmGVzThFuy+IgDQ12XRGlH97X6zCbCIlpFFdqDew86xCsPLVQ6CWY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=zhouyanjie@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=alkAaLA/LsC7OTHjGHQlx5pvPuth9fOvuM4HaxQ8hmNQ74Am2u0mO4wgagW1a/vEkieJiIUIgnxb UFu6XR11bqRIJIH7iCN6bUTQNPRIqRK25wabrBickIp7lZn9l3YN DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1567669124; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1598; bh=egFOrDQp87JufeuaATPLZS9Nk9CVn431TNKVdr5uG9c=; b=naYOwA+xzhDJnHqp0YPeAbCyWc82FkXn2Hv1PAZ2VqEtKv9ux9rYU7zvk153p9bD 47e81ajkIYFfKCimcCcFf+Rb8sneCXk84KYtckvkvetHwxUv6GXQNKHu3yFxQ7B3jZ/ Ewcggk5JpVAByXsXLqCpc7IgnTtd357cOb2HaJgQ= Received: from zhouyanjie-virtual-machine.localdomain (125.71.5.36 [125.71.5.36]) by mx.zohomail.com with SMTPS id 1567669122100996.8820523312266; Thu, 5 Sep 2019 00:38:42 -0700 (PDT) From: Zhou Yanjie To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, ulf.hansson@linaro.org, paul.burton@mips.com, linus.walleij@linaro.org, paul@crapouillou.net, malat@debian.org, yuehaibing@huawei.com, ezequiel@collabora.com, robh+dt@kernel.org, mark.rutland@arm.com, syq@debian.org, jiaxun.yang@flygoat.com Subject: [PATCH 2/4] MMC: Ingenic: Add 8bit mode support. Date: Thu, 5 Sep 2019 15:38:07 +0800 Message-Id: <1567669089-88693-3-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Add support for 8bit mode, now supports 1bit/4bit/8bit modes. Signed-off-by: Zhou Yanjie --- drivers/mmc/host/jz4740_mmc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 1b1fcb7..d6811a7 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -79,6 +79,8 @@ #define JZ_MMC_CMDAT_IO_ABORT BIT(11) #define JZ_MMC_CMDAT_BUS_WIDTH_4BIT BIT(10) +#define JZ_MMC_CMDAT_BUS_WIDTH_8BIT (BIT(10) | BIT(9)) +#define JZ_MMC_CMDAT_BUS_WIDTH_MASK (BIT(10) | BIT(9)) #define JZ_MMC_CMDAT_DMA_EN BIT(8) #define JZ_MMC_CMDAT_INIT BIT(7) #define JZ_MMC_CMDAT_BUSY BIT(6) @@ -899,11 +901,16 @@ static void jz4740_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) switch (ios->bus_width) { case MMC_BUS_WIDTH_1: - host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_4BIT; + host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_MASK; break; case MMC_BUS_WIDTH_4: + host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_MASK; host->cmdat |= JZ_MMC_CMDAT_BUS_WIDTH_4BIT; break; + case MMC_BUS_WIDTH_8: + host->cmdat &= ~JZ_MMC_CMDAT_BUS_WIDTH_MASK; + host->cmdat |= JZ_MMC_CMDAT_BUS_WIDTH_8BIT; + break; default: break; } @@ -1034,7 +1041,8 @@ static int jz4740_mmc_probe(struct platform_device* pdev) dev_info(&pdev->dev, "Using %s, %d-bit mode\n", host->use_dma ? "DMA" : "PIO", - (mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1); + (mmc->caps & MMC_CAP_8_BIT_DATA) ? 8 : + ((mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1)); return 0; From patchwork Thu Sep 5 07:38:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11132327 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB9041510 for ; Thu, 5 Sep 2019 07:40:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAF652168B for ; Thu, 5 Sep 2019 07:40:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="Nb9f65Al" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732183AbfIEHkX (ORCPT ); Thu, 5 Sep 2019 03:40:23 -0400 Received: from sender4-pp-o95.zoho.com ([136.143.188.95]:25501 "EHLO sender4-pp-o95.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731361AbfIEHkX (ORCPT ); Thu, 5 Sep 2019 03:40:23 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1567669130; cv=none; d=zoho.com; s=zohoarc; b=dhcLkStAdsTM1o4nHBlvqvbUNxZuGcQyUBirvZm4qmhgSWCaIq6TwuZb4N+RhEWsruQPJkpV5lr31JLTRGKe2NgRy0pHCmx/JXCyPqWeE/lUm4CRkf/GPP8Qs66u2BMOHt96ibGtLwkRTE8XtUlNRZDa2/WLPGjO7GWJojycFHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567669130; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=Heqr9SZkadaVS8gLSB7N1qy++ZERfguRdtxZqkfJX0A=; b=TeeCahrW1FxZNnGtRY/HJ++aIRXxwzEaA1R6vuHtSYigzOWIDtpG64Embd1UxvnfnfTyUfIcb+c80fWktW4vyhoTg4rNwu0yKqnZeYaLpG+8yXzlpQAUjxcKDHUo/0WV37Uc3NkuX2cVom7V3t0mVvdXAeEHeRVsG0hlHN7/hxE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=zhouyanjie@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=i2voXQ3nizZYL+xtYxnA9lL4pNt7arpQADgXeZk8KBRkG+XHjmm9js3xtqrcz9NsYWfkTb1On1BX +ZD+G5tdImbqQ7t6fAjhQWT+bCNoN/ILCimAZhrf8DBgaeyo2Cb8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1567669130; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=873; bh=Heqr9SZkadaVS8gLSB7N1qy++ZERfguRdtxZqkfJX0A=; b=Nb9f65AlyTRCbjP1L15gZrRZ5ns0cq40NUB1ZR2y62PwUa/zeX+S4Y/or0AAaIgI P7a52uJKv5F9IOlwKTxxHZPwzPBfvjk/P66XpOw8BiPV8RBYfcE12wxdfcS/qxm0SbN +y7S6t7ZB5SWP/2jeqNNVBsaNNnEt/bvrg9MPBTE= Received: from zhouyanjie-virtual-machine.localdomain (125.71.5.36 [125.71.5.36]) by mx.zohomail.com with SMTPS id 1567669129342200.53823429847387; Thu, 5 Sep 2019 00:38:49 -0700 (PDT) From: Zhou Yanjie To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, ulf.hansson@linaro.org, paul.burton@mips.com, linus.walleij@linaro.org, paul@crapouillou.net, malat@debian.org, yuehaibing@huawei.com, ezequiel@collabora.com, robh+dt@kernel.org, mark.rutland@arm.com, syq@debian.org, jiaxun.yang@flygoat.com Subject: [PATCH 3/4] dt-bindings: MMC: Add JZ4760 bindings. Date: Thu, 5 Sep 2019 15:38:08 +0800 Message-Id: <1567669089-88693-4-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Add the MMC bindings for the JZ4760 Soc from Ingenic. Signed-off-by: Zhou Yanjie Acked-by: Rob Herring --- Documentation/devicetree/bindings/mmc/jz4740.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/mmc/jz4740.txt b/Documentation/devicetree/bindings/mmc/jz4740.txt index 8a6f87f..13796fe 100644 --- a/Documentation/devicetree/bindings/mmc/jz4740.txt +++ b/Documentation/devicetree/bindings/mmc/jz4740.txt @@ -8,6 +8,7 @@ Required properties: - compatible: Should be one of the following: - "ingenic,jz4740-mmc" for the JZ4740 - "ingenic,jz4725b-mmc" for the JZ4725B + - "ingenic,jz4760-mmc" for the JZ4760 - "ingenic,jz4780-mmc" for the JZ4780 - reg: Should contain the MMC controller registers location and length. - interrupts: Should contain the interrupt specifier of the MMC controller. From patchwork Thu Sep 5 07:38:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11132333 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3856A15E9 for ; Thu, 5 Sep 2019 07:40:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1907D2168B for ; Thu, 5 Sep 2019 07:40:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="dUSE5lBy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732204AbfIEHkn (ORCPT ); Thu, 5 Sep 2019 03:40:43 -0400 Received: from sender4-pp-o95.zoho.com ([136.143.188.95]:25521 "EHLO sender4-pp-o95.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730769AbfIEHkn (ORCPT ); Thu, 5 Sep 2019 03:40:43 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1567669138; cv=none; d=zoho.com; s=zohoarc; b=bbyvOXRs9Tcc7kCLTdH0JOWp66Ask/teV8N0yAkNv48JTvvEUDgEhhnXrQodA10ECo4qAoybzPdOKU7HuRIINfedgwsGu7ddyEKPwKroxZtidaGrMcHd3UYHV0UhPMsglZPxPg6fDEZAhAZg2sM6+7bh4fg6a6usIRrJXGKh3Ng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567669138; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To:ARC-Authentication-Results; bh=I5Jl+lRwVJSmYK5N04Ftz1awAcGGAYjkgicsp1LfCyk=; b=T69p+TdOmZIXKkTIxE6daC9rT68eKWGSI7M4Qw1Gg4XZBkfAcuRPg5v7VTzt4JGiy8jBiPqh6UhPYs++ZpGj8ajN94RQ969HQR8cYmknPiX87lHtCxDAkZDGVzTwHekpqYq2QJjn2axa8ym7Ebpig37hjLD4B9obON1g/hAbC/4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass header.i=zoho.com; spf=pass smtp.mailfrom=zhouyanjie@zoho.com; dmarc=pass header.from= header.from= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id:in-reply-to:references; b=EJYjrjBwwp5bhvwJq7W/6i9l8gYEDG/kQEHJI7Rm5ndzu6VEyqW7m5E/mdYOox0/BEqKrtqWtM8A Eu7A26gfmN9kVyprQG+uEeicCp8eJKNswoXiAnB2Wc+bg1kJKBgW DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1567669138; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1944; bh=I5Jl+lRwVJSmYK5N04Ftz1awAcGGAYjkgicsp1LfCyk=; b=dUSE5lByWPHkV4P5NSPYSBiFnFagA3tbZyL/er/zkLkExddUjgqzZ3DiY8GHPhUR mtHNy0WggqLNGv2OiQZvNNBaODLDFfH6HThC8BQleFsPuiOTMDl0aLfxQPWQlNbCcvg m7AcmotbrC9O2ZKYH6GwKXmCOrYW9n3vE8q6GWnY= Received: from zhouyanjie-virtual-machine.localdomain (125.71.5.36 [125.71.5.36]) by mx.zohomail.com with SMTPS id 1567669136703108.89236573844028; Thu, 5 Sep 2019 00:38:56 -0700 (PDT) From: Zhou Yanjie To: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, ulf.hansson@linaro.org, paul.burton@mips.com, linus.walleij@linaro.org, paul@crapouillou.net, malat@debian.org, yuehaibing@huawei.com, ezequiel@collabora.com, robh+dt@kernel.org, mark.rutland@arm.com, syq@debian.org, jiaxun.yang@flygoat.com Subject: [PATCH 4/4] MMC: Ingenic: Add support for JZ4760 and support for LPM. Date: Thu, 5 Sep 2019 15:38:09 +0800 Message-Id: <1567669089-88693-5-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 1.add support for probing mmc driver on the JZ4760 Soc from Ingenic. 2.add support for Low Power Mode of Ingenic's MMC/SD Controller. Signed-off-by: Zhou Yanjie --- drivers/mmc/host/jz4740_mmc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index d6811a7..1e61f1b 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -43,6 +43,7 @@ #define JZ_REG_MMC_RES 0x34 #define JZ_REG_MMC_RXFIFO 0x38 #define JZ_REG_MMC_TXFIFO 0x3C +#define JZ_REG_MMC_LPM 0x40 #define JZ_REG_MMC_DMAC 0x44 #define JZ_MMC_STRPCL_EXIT_MULTIPLE BIT(7) @@ -102,11 +103,15 @@ #define JZ_MMC_DMAC_DMA_SEL BIT(1) #define JZ_MMC_DMAC_DMA_EN BIT(0) +#define JZ_MMC_LPM_DRV_RISING BIT(31) +#define JZ_MMC_LPM_LOW_POWER_MODE_EN BIT(0) + #define JZ_MMC_CLK_RATE 24000000 enum jz4740_mmc_version { JZ_MMC_JZ4740, JZ_MMC_JZ4725B, + JZ_MMC_JZ4760, JZ_MMC_JZ4780, }; @@ -858,6 +863,16 @@ static int jz4740_mmc_set_clock_rate(struct jz4740_mmc_host *host, int rate) } writew(div, host->base + JZ_REG_MMC_CLKRT); + + if (host->version >= JZ_MMC_JZ4760) { + if (real_rate > 25000000) + writel(JZ_MMC_LPM_DRV_RISING | + JZ_MMC_LPM_LOW_POWER_MODE_EN, + host->base + JZ_REG_MMC_LPM); + } else if (host->version >= JZ_MMC_JZ4725B) + writel(JZ_MMC_LPM_LOW_POWER_MODE_EN, + host->base + JZ_REG_MMC_LPM); + return real_rate; } @@ -935,6 +950,7 @@ static const struct mmc_host_ops jz4740_mmc_ops = { static const struct of_device_id jz4740_mmc_of_match[] = { { .compatible = "ingenic,jz4740-mmc", .data = (void *) JZ_MMC_JZ4740 }, { .compatible = "ingenic,jz4725b-mmc", .data = (void *)JZ_MMC_JZ4725B }, + { .compatible = "ingenic,jz4760-mmc", .data = (void *) JZ_MMC_JZ4760 }, { .compatible = "ingenic,jz4780-mmc", .data = (void *) JZ_MMC_JZ4780 }, {}, };