From patchwork Sat Oct 12 05:13:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11186635 X-Patchwork-Delegate: paulburton@kernel.org 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 BBCEE14E5 for ; Sat, 12 Oct 2019 05:15:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AFEA21850 for ; Sat, 12 Oct 2019 05:15:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="mFBrZ0ir" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727594AbfJLFP0 (ORCPT ); Sat, 12 Oct 2019 01:15:26 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25401 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725308AbfJLFP0 (ORCPT ); Sat, 12 Oct 2019 01:15:26 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1570857264; cv=none; d=zoho.com; s=zohoarc; b=B3gLLuONyg+jjiweDkI+r6Vk5TafUG4pB72BfKtsqJrWoX04rJmfZoYq5fuRpF2q0iYU78EiDi5Z3f+YtMX3xWOW3/PDDV2AvheqAw++9XQVc0TIbp5f381mLdj/t9a/b2JyjwCVTfM+CjtDE83y2XDa3g9XuphoOSbvZPN+eOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570857264; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=HLJOVc0FoZwSAt3EYRYKW8jAHE/pfwdL8B/KwgIP7u0=; b=k22pK2A5Sj8w5O8YelisoAhs+P/m/+C53imayfVFQT7qaPqkuH1UBbpCr9OoQavqwXp/hRzI4lz+bLvcAVa7CxV5Rta6R9PgdHFQIPUF/t0QpVzGJzy6X2laPyhjMy3q9RpG1d9BZGPkCLa2ll/AzeHGqRtANW0rTuKZdq1JYuQ= 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=R79UcXmQAjb2aS+fGS5TOfvkwy9xAR5nDSBziOyjDoTZ4u+WMg8C05nh8tNqtuogAhjbx+OiLVEZ 021FadywLmEiUuhd6fEH9TUOBVD9ilaPCNbgRVc4YX3k1BHL7UBR DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1570857264; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1598; bh=HLJOVc0FoZwSAt3EYRYKW8jAHE/pfwdL8B/KwgIP7u0=; b=mFBrZ0irah5kOn6dd2YnnQD9OGx1FA4Aw9mvpzDEurkVQpZj5L/8quBMzuVtU+Pd XHCiSYpDjcW3LhqsQNeP2VTiBVGhVxvHSHVSegcB+rYrJDGN6rtG3RNjNwBNxgHBKEG /IDJpcuXTtrjG8t6uqOR++UlcTpOusosyyOg8nOw= Received: from zhouyanjie-virtual-machine.localdomain (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1570857263687742.2424629736723; Fri, 11 Oct 2019 22:14:23 -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, robh+dt@kernel.org, paul.burton@mips.com, mark.rutland@arm.com, syq@debian.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, armijn@tjaldur.nl, tglx@linutronix.de, yuehaibing@huawei.com, malat@debian.org, ezequiel@collabora.com, paul@crapouillou.net Subject: [PATCH 1/6 v2] MMC: Ingenic: Add 8bit mode support. Date: Sat, 12 Oct 2019 13:13:15 +0800 Message-Id: <1570857203-49192-2-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@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 ffdbfaa..69c4a8b 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 Sat Oct 12 05:13:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11186639 X-Patchwork-Delegate: paulburton@kernel.org 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 C5CF5912 for ; Sat, 12 Oct 2019 05:15:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A66442087E for ; Sat, 12 Oct 2019 05:15:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="U6szIocd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726891AbfJLFPu (ORCPT ); Sat, 12 Oct 2019 01:15:50 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25412 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbfJLFPu (ORCPT ); Sat, 12 Oct 2019 01:15:50 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1570857274; cv=none; d=zoho.com; s=zohoarc; b=QeLsWy3lt0LjPqHfImMYFVVxd53Vsh1xflVauNzHcBq6NbV38SjwEd7fm6Fm5+SPGa6VjUIkhGPEKIYqT7FhCaKI/gV7m8fkTp74GUM4dTPwPBxzXN0oWdbTZqZXLVWUesg6F9reaJbbGOBJYAO4MfZkAcPV9x4+NhjiTgp6rtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570857274; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=as6/lLUVaBlu4heB6IDs3nZKYIfHPEdzxPDiM55f+iE=; b=SeQ43zEeGWA0NMwUVPTUfBk79QQK4bhLVm/h1OGkFIevt9czYykYCj1zOkJ4J0Q/ntWtlHibpUmtRmMWglmYhhDjOTyYR6T+WrFAzAndtCrDmwWzyDSkOt1oU+Uk2CDbtyloQR0SKoSldEBHQYJbbue+milscV8zyL5kKC+UDzI= 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=fRAKLVv8EtX/+wEP7ZpuVAcsL7911f5ip5Mj3dXlc4qbiQMeNNakOq4MYHj69p2l3vlqohH72Rru cqRzivWyx1vdg/rVxaHk9rDMhbMtJGmFOrdnfYf8+aZIh/AcTgcu DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1570857274; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=914; bh=as6/lLUVaBlu4heB6IDs3nZKYIfHPEdzxPDiM55f+iE=; b=U6szIocdkwc14BjeZeaND6xlAOyMeZzIo5eumUMiYramn/wSFRwB0JDeNlLF6yo1 WOBG0CzINWbcOZm8WBP0r46ooEJoxBq4EcX+O5mK9wDxjZH1thGzb9zxmKu5BIPksN9 ntgxPjOoXRT/08bUOuFOog8i13jpAHdFEpG6wQnA= Received: from zhouyanjie-virtual-machine.localdomain (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1570857273287174.23289133560195; Fri, 11 Oct 2019 22:14:33 -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, robh+dt@kernel.org, paul.burton@mips.com, mark.rutland@arm.com, syq@debian.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, armijn@tjaldur.nl, tglx@linutronix.de, yuehaibing@huawei.com, malat@debian.org, ezequiel@collabora.com, paul@crapouillou.net Subject: [PATCH 2/6 v2] dt-bindings: MMC: Add JZ4760 bindings. Date: Sat, 12 Oct 2019 13:13:16 +0800 Message-Id: <1570857203-49192-3-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@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 Sat Oct 12 05:13:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11186643 X-Patchwork-Delegate: paulburton@kernel.org 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 74060912 for ; Sat, 12 Oct 2019 05:16:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5368721850 for ; Sat, 12 Oct 2019 05:16:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="K5+tkkNF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727231AbfJLFQX (ORCPT ); Sat, 12 Oct 2019 01:16:23 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25430 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbfJLFQW (ORCPT ); Sat, 12 Oct 2019 01:16:22 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1570857294; cv=none; d=zoho.com; s=zohoarc; b=ZTWaLQmc0gjhBy84aeTb3RYtvDuiYIFuAD/lUzcXoefgXHqwHS/Gql82SXd+QaStZCp8lnxgEm3kMaJJTIKsjXaxEaJpcNrPURbCyQ9bSBb06fmhSA3wAW0E/4mTliwtqkhR4+vykJO3k8pPSJY4CaxOKBNtn1v4AvkCENMK1bE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570857294; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=C0apDRgSc6LA8qMRVIi13ga9yNXfuBb7StrbdjX9Oiw=; b=bn3yCie7C0tC3JJntbdUCKm0XAyXhlu6aNhWRJE2XEd7FO6dWSWGJ1d1Z60QoJdWov9AGpKYA3gcji6p6ydKi1dcC9UEsnG4N8/Tpsz/Sik41Bm+phqfDI3VIw4pENpHMp8+SyZNwC/saTgMAwMsfokLxUOJ47oUa0d7oE2O4fM= 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=UssMQhHqA8isLkEmOs24Do3vgqgoIvrWaUpDiMvVe8AfqKa+AFwsQsWJ/GxXhOUZEmO863PGt6FJ cF8gfX369YOCtcged+CAAWkL+LY1qtpgU2068q1szLjwrY6P5ciS DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1570857294; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=961; bh=C0apDRgSc6LA8qMRVIi13ga9yNXfuBb7StrbdjX9Oiw=; b=K5+tkkNFQ521rAH7mIuZ88NPMjZpgzYN4YSCzCEXJaA3sS2EyN0XmxfFtTQmPbTy V0Ii422nmQIAKJrC8xXC6dzUsp+xhKNqFYglc+Yp6LIdAKpuWWjKTEYTHnB7xy3Ff9i yTdxfq3g+X3B3zJHNj3iVDLT8qRkPzahlouTLTHM= Received: from zhouyanjie-virtual-machine.localdomain (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1570857293413883.9512660333022; Fri, 11 Oct 2019 22:14:53 -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, robh+dt@kernel.org, paul.burton@mips.com, mark.rutland@arm.com, syq@debian.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, armijn@tjaldur.nl, tglx@linutronix.de, yuehaibing@huawei.com, malat@debian.org, ezequiel@collabora.com, paul@crapouillou.net Subject: [PATCH 3/6 v2] MMC: JZ4740: Add support for the JZ4760. Date: Sat, 12 Oct 2019 13:13:17 +0800 Message-Id: <1570857203-49192-4-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add support for probing mmc driver on the JZ4760 Soc from Ingenic. Signed-off-by: Zhou Yanjie --- drivers/mmc/host/jz4740_mmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 69c4a8b..f4c4890 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -107,6 +107,7 @@ enum jz4740_mmc_version { JZ_MMC_JZ4740, JZ_MMC_JZ4725B, + JZ_MMC_JZ4760, JZ_MMC_JZ4780, }; @@ -935,6 +936,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 }, {}, }; From patchwork Sat Oct 12 05:13:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11186649 X-Patchwork-Delegate: paulburton@kernel.org 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 7935514E5 for ; Sat, 12 Oct 2019 05:16:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59D3B21850 for ; Sat, 12 Oct 2019 05:16:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="MQ6vTdZb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726891AbfJLFQx (ORCPT ); Sat, 12 Oct 2019 01:16:53 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25441 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725308AbfJLFQw (ORCPT ); Sat, 12 Oct 2019 01:16:52 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1570857304; cv=none; d=zoho.com; s=zohoarc; b=og8Z0iLjQrQ1a+eGc5mQaLkXaL2dqJXyVn9kML8R3Cl8G4DitK7Hf7cQl7ELKewo34ZeEjne81HOD0nizck0aAUUcZpW6ZP0Vfo5wjjtlmtoERoNv0sdNtPVgd/0WRQWv0b0uyquhaR2cUjuKmU/9GEm34pDqXjTd7eXCJQ1Wm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570857304; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=KFYQcdgcXC9B1WkAHZsdC5Ju3diJLqLVfUVt06xuMHc=; b=SaPMV99ITpnz2RP7lQvtryzh21Zg8Rap8dftnDWhuccZOld7xLbp/H33O6cKw8478Lna79c86MnMshuhUFPqKvRO/V/WvDMJflwstUBiWfu1/rMfyaaBUR4GulRNhP9ZjGyYXkAUI7lo4kBU7y9TY1EhhRt7uqkwtz+00myi59c= 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=PNsfRz1mE7646HixXca2ESvv3TZgG57oL1CYoL73nu7uE2OYwxzio+iSlr86loaL3Oo2SVRAlbUJ ihaNAk+9CCHBbt/eBT8iK4A2BSaF+Ei1gQw+StR0YNoirkIF+HrN DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1570857304; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1350; bh=KFYQcdgcXC9B1WkAHZsdC5Ju3diJLqLVfUVt06xuMHc=; b=MQ6vTdZble2Ojbfbk3WdIOVdQ06su536BqOW8FBYsSfmaIUftWy5bt47U8J4OOYs RKV8emrqCt+aQJ0rSX4cDBhVBgyUyLrOA5Y29m9x9M1gkEOmBPcGpWn3yp/GMESrecQ XuUM+OnaEk0WBMLXEBqDCpgGoHIEYA2VBxUvNc7g= Received: from zhouyanjie-virtual-machine.localdomain (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1570857303707410.1200901788326; Fri, 11 Oct 2019 22:15:03 -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, robh+dt@kernel.org, paul.burton@mips.com, mark.rutland@arm.com, syq@debian.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, armijn@tjaldur.nl, tglx@linutronix.de, yuehaibing@huawei.com, malat@debian.org, ezequiel@collabora.com, paul@crapouillou.net Subject: [PATCH 4/6 v2] dt-bindings: MMC: Add X1000 bindings. Date: Sat, 12 Oct 2019 13:13:18 +0800 Message-Id: <1570857203-49192-5-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add the MMC bindings for the X1000 Soc from Ingenic. Signed-off-by: Zhou Yanjie Acked-by: Rob Herring --- Documentation/devicetree/bindings/mmc/jz4740.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/jz4740.txt b/Documentation/devicetree/bindings/mmc/jz4740.txt index 13796fe..453d3b9 100644 --- a/Documentation/devicetree/bindings/mmc/jz4740.txt +++ b/Documentation/devicetree/bindings/mmc/jz4740.txt @@ -1,8 +1,8 @@ -* Ingenic JZ47xx MMC controllers +* Ingenic XBurst MMC controllers This file documents the device tree properties used for the MMC controller in -Ingenic JZ4740/JZ4780 SoCs. These are in addition to the core MMC properties -described in mmc.txt. +Ingenic JZ4740/JZ4760/JZ4780/X1000 SoCs. These are in addition to the core MMC +properties described in mmc.txt. Required properties: - compatible: Should be one of the following: @@ -10,6 +10,7 @@ Required properties: - "ingenic,jz4725b-mmc" for the JZ4725B - "ingenic,jz4760-mmc" for the JZ4760 - "ingenic,jz4780-mmc" for the JZ4780 + - "ingenic,x1000-mmc" for the X1000 - reg: Should contain the MMC controller registers location and length. - interrupts: Should contain the interrupt specifier of the MMC controller. - clocks: Clock for the MMC controller. From patchwork Sat Oct 12 05:13:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11186653 X-Patchwork-Delegate: paulburton@kernel.org 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 8B1CE912 for ; Sat, 12 Oct 2019 05:17:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CD482087E for ; Sat, 12 Oct 2019 05:17:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="LkyJdh/I" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728679AbfJLFRR (ORCPT ); Sat, 12 Oct 2019 01:17:17 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25452 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725308AbfJLFRR (ORCPT ); Sat, 12 Oct 2019 01:17:17 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1570857320; cv=none; d=zoho.com; s=zohoarc; b=YeawjWwiXbR8M8QWqY/iJ0oChdbqdndjqrNdtRDhygcR5BkVMnhpzOhsOBkmOOM7lK4g7wplp7JLI/uit6XpVx+Y0qBe7tma9xlig24RwO2oNAPhrt/xneW0CDQwIAE+eFCrRLpzpiXRbI02kFWgaduGI+G1vPS1v45Id/BCblQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570857320; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=mQkuPqcgYxHQ2t9MHwAuqBVCAWtQ59OGQM0El1IqWCU=; b=EPEoM9lFTuf05lhCuM6JbLa0GYo0E2MhORBv3UcPSJ8UUMEa+YlX2Rq/z3bpyyoAPaa6IoOc6uGj+uV2h1OSsE7nFiQquhZ0JMNF5fCTOq2E58LOd1Qokme6BuydoI3v0pxsG7lLpOYGpX9d/VM56mwQjT8dSLIzfFLDLhONyX4= 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=ZxdZ9ztKjruIaoGralUlkoZyLh42MPhI1+ATQVedi2wjxM0Kw0xES/PFCAKOQ89kd6mZqgIj/lL5 sQk5k9WQvwi6Wq4AsP6SdJg5vpJp70Sw6TIk4YrhEwTZjOosqIZP DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1570857320; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1377; bh=mQkuPqcgYxHQ2t9MHwAuqBVCAWtQ59OGQM0El1IqWCU=; b=LkyJdh/InAnzJOHtpt+aWW5AyEMDmMkzwCyHcUOqpIry+BBFHbk6hfyKa6QhINQR +k/fNk+g8Dhn90boFQZop7m9nY4FgkbaTPwbuf6xHRVKTXZzja9PNQIYsTZIvO1x+FS GuavbyAMWKmutYfnMjJ8ZZC6j1qehBBLCtQ6UwJ0= Received: from zhouyanjie-virtual-machine.localdomain (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1570857318470431.8767101475063; Fri, 11 Oct 2019 22:15:18 -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, robh+dt@kernel.org, paul.burton@mips.com, mark.rutland@arm.com, syq@debian.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, armijn@tjaldur.nl, tglx@linutronix.de, yuehaibing@huawei.com, malat@debian.org, ezequiel@collabora.com, paul@crapouillou.net Subject: [PATCH 5/6 v2] MMC: JZ4740: Add support for the X1000. Date: Sat, 12 Oct 2019 13:13:19 +0800 Message-Id: <1570857203-49192-6-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add support for probing mmc driver on the X1000 Soc from Ingenic. Signed-off-by: Zhou Yanjie --- drivers/mmc/host/jz4740_mmc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index f4c4890..44a04fe 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -109,6 +109,7 @@ enum jz4740_mmc_version { JZ_MMC_JZ4725B, JZ_MMC_JZ4760, JZ_MMC_JZ4780, + JZ_MMC_X1000, }; enum jz4740_mmc_state { @@ -938,6 +939,7 @@ static const struct of_device_id jz4740_mmc_of_match[] = { { .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 }, + { .compatible = "ingenic,x1000-mmc", .data = (void *) JZ_MMC_X1000 }, {}, }; MODULE_DEVICE_TABLE(of, jz4740_mmc_of_match); @@ -1039,7 +1041,7 @@ static int jz4740_mmc_probe(struct platform_device* pdev) dev_err(&pdev->dev, "Failed to add mmc host: %d\n", ret); goto err_release_dma; } - dev_info(&pdev->dev, "JZ SD/MMC card driver registered\n"); + dev_info(&pdev->dev, "Ingenic SD/MMC card driver registered\n"); dev_info(&pdev->dev, "Using %s, %d-bit mode\n", host->use_dma ? "DMA" : "PIO", From patchwork Sat Oct 12 05:13:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Yanjie X-Patchwork-Id: 11186655 X-Patchwork-Delegate: paulburton@kernel.org 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 BBC571575 for ; Sat, 12 Oct 2019 05:19:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99B0A21850 for ; Sat, 12 Oct 2019 05:19:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=zoho.com header.i=zhouyanjie@zoho.com header.b="ZPkcFFI2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727014AbfJLFTf (ORCPT ); Sat, 12 Oct 2019 01:19:35 -0400 Received: from sender4-pp-o94.zoho.com ([136.143.188.94]:25464 "EHLO sender4-pp-o94.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726821AbfJLFTf (ORCPT ); Sat, 12 Oct 2019 01:19:35 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1570857550; cv=none; d=zoho.com; s=zohoarc; b=SZoeCaq43vnqx636xq+d47jFuUOHkcg3B3mFBDdKoXePF+YYEipoFtgftohELNivwKQSwpZJeKHbXgTpahcZ5NEWYl5FFcB8qbksAgVy9UIC0naGAzhbVjsKw3WtVc5wdW6HzujreC5Ho3BlsPEyTmNlZ17KsM6b7wj5uUcIwmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570857550; h=Cc:Date:From:In-Reply-To:Message-ID:References:Subject:To; bh=kNG3xydqXngTUammBkGfvZpeHfz2ntKv8HXBufYT2PU=; b=oHGZd7rKEg2V+9sz360ucoNevX8ReblPtCkUFRrMkFHKZVDeFi5A69oHBI0Xv6fGXVRSBKx+xUaxaUE5ilM6JwyzQfs7dSdy2B4ONCY0xZtB11mXjUwnquxcn4RsatbTNKnWi6RrCPOjlvuZRSTn3p/ZdbUlTr058XemhnvyIZI= 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=W4EYP2ghWrGTzbWrXYfkSVRYDM2+j9JrS6EYzDpUKqReNndFaNr9vp1Lw9CdhpQWlpikPBb4ikUd G6gEwG1rmtGrFmqGgUiHUeokH0Sqpi7Jg3MdQTZxN+2NZ1b2hDuf DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1570857550; s=zm2019; d=zoho.com; i=zhouyanjie@zoho.com; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; l=1745; bh=kNG3xydqXngTUammBkGfvZpeHfz2ntKv8HXBufYT2PU=; b=ZPkcFFI2knRCYCAk3/tUuE3fLp/aaG1cAQTX+jBhb9VoHdO2nZHvsda1DlmA0sqQ 5rFp3iaZ3U230t8A1yJD04q+kPLpcqRuYYr/xMoghCeOVyuywO8ExyhP7f1g2SPimYH vuo8/F2r+XLTpYqyz50LG+iHCHLYigb/X89o2tC4= Received: from zhouyanjie-virtual-machine.localdomain (182.148.156.27 [182.148.156.27]) by mx.zohomail.com with SMTPS id 1570857550559909.507456529966; Fri, 11 Oct 2019 22:19:10 -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, robh+dt@kernel.org, paul.burton@mips.com, mark.rutland@arm.com, syq@debian.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, armijn@tjaldur.nl, tglx@linutronix.de, yuehaibing@huawei.com, malat@debian.org, ezequiel@collabora.com, paul@crapouillou.net Subject: [PATCH 6/6 v2] MMC: JZ4740: Add support for LPM. Date: Sat, 12 Oct 2019 13:13:20 +0800 Message-Id: <1570857203-49192-7-git-send-email-zhouyanjie@zoho.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> References: <1567669089-88693-1-git-send-email-zhouyanjie@zoho.com> <1570857203-49192-1-git-send-email-zhouyanjie@zoho.com> X-ZohoMailClient: External Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org add support for low power mode of Ingenic's MMC/SD Controller. Signed-off-by: Zhou Yanjie --- drivers/mmc/host/jz4740_mmc.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 44a04fe..4cbe7fb 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -43,6 +43,7 @@ #define JZ_REG_MMC_RESP_FIFO 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,6 +103,12 @@ #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_DRV_RISING_QTR_PHASE_DLY BIT(31) +#define JZ_MMC_LPM_DRV_RISING_1NS_DLY BIT(30) +#define JZ_MMC_LPM_SMP_RISING_QTR_OR_HALF_PHASE_DLY BIT(29) +#define JZ_MMC_LPM_LOW_POWER_MODE_EN BIT(0) + #define JZ_MMC_CLK_RATE 24000000 enum jz4740_mmc_version { @@ -860,6 +867,22 @@ static int jz4740_mmc_set_clock_rate(struct jz4740_mmc_host *host, int rate) } writew(div, host->base + JZ_REG_MMC_CLKRT); + + if (real_rate > 25000000) { + if (host->version >= JZ_MMC_X1000) { + writel(JZ_MMC_LPM_DRV_RISING_QTR_PHASE_DLY | + JZ_MMC_LPM_SMP_RISING_QTR_OR_HALF_PHASE_DLY | + JZ_MMC_LPM_LOW_POWER_MODE_EN, + host->base + JZ_REG_MMC_LPM); + } else if (host->version >= JZ_MMC_JZ4760) { + 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; }