From patchwork Tue Dec 15 15:56:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Porotchkin X-Patchwork-Id: 344219 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BA75C4361B for ; Tue, 15 Dec 2020 16:02:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 35C5522509 for ; Tue, 15 Dec 2020 16:02:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730483AbgLOQCR (ORCPT ); Tue, 15 Dec 2020 11:02:17 -0500 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:51526 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730682AbgLOP5c (ORCPT ); Tue, 15 Dec 2020 10:57:32 -0500 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BFFufUD006224; Tue, 15 Dec 2020 07:56:45 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=4JQngb4vTl2z5Km2Q0sbQvmvyYV/348D1o4EIdvAylU=; b=VcjHAP/L6ixPh8FDDztcYdPy2HBlETzr+OXdnZbRL/NDQPmWKy7yWXpFAHH30kGgxE12 VCYQKv+mGNfqG4hpMSM+ZnhHFffEF6uO3lH/tJRio+6Ygk5Uz0bMLdVQBYK3i0YhTR1g 5LYcAud8RIZhhcbFx/T9lDNkRRf8/VGYheyce1qg2JfHAv20+Fd0ftdCuVAwsVMx6Y9v YJZB3FZtUcwAGLWsQtepJ+vrBQdZSZxUwglKSJwN1xuAXAfgOMYawtygSEyl3fXdh/vq erTbCMHvjmjhN8UqFer1wvFDZke9DtcpPqzmsIH4HY0x+bMuiBAe5Mpbt3XgOdwxcnGY /A== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 35cx8t84ej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 07:56:45 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 07:56:44 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 15 Dec 2020 07:56:44 -0800 Received: from octopus.marvell.com (unknown [10.5.24.3]) by maili.marvell.com (Postfix) with ESMTP id 0ACCC3F703F; Tue, 15 Dec 2020 07:56:41 -0800 (PST) From: To: CC: , , , , , , , Subject: [PATCH 1/3] dt-bindings: mmc: xenon: add AP807 compatible string Date: Tue, 15 Dec 2020 17:56:34 +0200 Message-ID: <20201215155636.28474-2-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215155636.28474-1-kostap@marvell.com> References: <20201215155636.28474-1-kostap@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-15_12:2020-12-15,2020-12-15 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Marcin Wojtas This patch adds DT binding description for the Xenon SD/MMC controller included in AP807 north bridge. Signed-off-by: Marcin Wojtas --- Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt index ed1456f5c94d..c51a62d751dc 100644 --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt @@ -12,6 +12,7 @@ Required Properties: - "marvell,armada-3700-sdhci": For controllers on Armada-3700 SoC. Must provide a second register area and marvell,pad-type. - "marvell,armada-ap806-sdhci": For controllers on Armada AP806. + - "marvell,armada-ap807-sdhci": For controllers on Armada AP807. - "marvell,armada-cp110-sdhci": For controllers on Armada CP110. - clocks: From patchwork Tue Dec 15 15:56:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Porotchkin X-Patchwork-Id: 344220 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DA75C4361B for ; Tue, 15 Dec 2020 16:02:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4469224F4 for ; Tue, 15 Dec 2020 16:02:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730423AbgLOQCF (ORCPT ); Tue, 15 Dec 2020 11:02:05 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:33234 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730540AbgLOP5i (ORCPT ); Tue, 15 Dec 2020 10:57:38 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BFFtZZt012595; Tue, 15 Dec 2020 07:56:48 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=AVFfhemX/P7UIP+KKACd/jBpapBdjMQQk4eYqAjzAoU=; b=ddwbzqgnequ4k75WPWXNnX82lzwaY+FT6pQ2sdUTmQP0JBfDPuISjUsv6SPfksPmNUAo kWLmwMtZZpwry+BngA2oeweiJ1x2p+nyohfenomBQAg5w78xIXgecAknhCqs+f9iNAbf RIPmoIwDo1f9IVD1c67Lfa0kXjL1LyXOE/oXi0O2AO6BIc+TfiguIaIYXPobnt3e3qV5 H6IgKmgno3UFetV10H9EtPolRydivNJgykx++x+VPZYf3K0WfX5hqvGdQr9iI6luEQ2D tpREMaQzSXn7ssFZU35zdR6GD/x8PBkVU8voHiV6kJkANnju0JTIQsU+47LTzcDyelI2 5A== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 35cv3t0fmt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 07:56:48 -0800 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 07:56:47 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 07:56:46 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 15 Dec 2020 07:56:47 -0800 Received: from octopus.marvell.com (unknown [10.5.24.3]) by maili.marvell.com (Postfix) with ESMTP id B645D3F703F; Tue, 15 Dec 2020 07:56:44 -0800 (PST) From: To: CC: , , , , , , , Subject: [PATCH 2/3] mmc: xenon: add AP807 compatible string Date: Tue, 15 Dec 2020 17:56:35 +0200 Message-ID: <20201215155636.28474-3-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215155636.28474-1-kostap@marvell.com> References: <20201215155636.28474-1-kostap@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-15_12:2020-12-15,2020-12-15 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Marcin Wojtas This patch adds new compatible string to differentiate between the controllers versions included in the AP807 north bridge. Thanks to this change, the SoCs which use AP807 will not run unintentionally in the 'slow mode' with disabled UHS modes. Signed-off-by: Marcin Wojtas --- arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 4 ++++ drivers/mmc/host/sdhci-xenon.c | 1 + 2 files changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi index 623010f3ca89..e9a740ec22cb 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi @@ -27,3 +27,7 @@ #clock-cells = <1>; }; }; + +&ap_sdhci0 { + compatible = "marvell,armada-ap807-sdhci"; +}; diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c index 24c978de2a3f..29f6bede9b96 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -668,6 +668,7 @@ static const struct dev_pm_ops sdhci_xenon_dev_pm_ops = { static const struct of_device_id sdhci_xenon_dt_ids[] = { { .compatible = "marvell,armada-ap806-sdhci",}, + { .compatible = "marvell,armada-ap807-sdhci",}, { .compatible = "marvell,armada-cp110-sdhci",}, { .compatible = "marvell,armada-3700-sdhci",}, {} From patchwork Tue Dec 15 15:56:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Porotchkin X-Patchwork-Id: 344718 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4059C4361B for ; Tue, 15 Dec 2020 16:02:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 915A722509 for ; Tue, 15 Dec 2020 16:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730422AbgLOQCF (ORCPT ); Tue, 15 Dec 2020 11:02:05 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:64434 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730691AbgLOP5i (ORCPT ); Tue, 15 Dec 2020 10:57:38 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BFFtM6u012342; Tue, 15 Dec 2020 07:56:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=OFtdhfLcdlDzMQ6doHiOqaevA86pZtCfTrLtkeMiaw0=; b=fWMS+yx6g09UK1A1Y9WC/aP02XtqnidIPBpRvx1278PmbtJMHz8ieOEZI3Jpfx5rGECo Ala3q/v193RTIKJEe+m2WpvUANz7wLDJzPUmgvJ9jAOOe7i8AZmHtFA4yyDcGNHYYnTV 75F4qAODOl60+15u7jgedPmH8bXEOXsfey0ZIY4QOAXhR+FkhOLHymBrTZkNedrJj30e G3jSw65hsktIs7bxo8iqarJXI64hpq8EQjXWO7up4NK4EfnCWwplsX5uJJKq9iukJVNY 2yigScpQw7c+diR0W9LT6Mo/4pHBSm0WiSVOE53fePkA89wbSaOVtrNEBSbM51ixSpEC xQ== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 35cv3t0fn2-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 07:56:51 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 07:56:50 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 07:56:49 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 15 Dec 2020 07:56:49 -0800 Received: from octopus.marvell.com (unknown [10.5.24.3]) by maili.marvell.com (Postfix) with ESMTP id 643913F703F; Tue, 15 Dec 2020 07:56:47 -0800 (PST) From: To: CC: , , , , , , , Subject: [PATCH 3/3] arm64: dts: cn913x-db: enable MMC HS400 Date: Tue, 15 Dec 2020 17:56:36 +0200 Message-ID: <20201215155636.28474-4-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215155636.28474-1-kostap@marvell.com> References: <20201215155636.28474-1-kostap@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2020-12-15_12:2020-12-15,2020-12-15 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Marcin Wojtas This patch adds necessary flags in the device tree which enable HS400 mode on AP807 MMC controller on the CN913x-DB board. Signed-off-by: Marcin Wojtas --- arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dts index d24294888400..741ae534b477 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9130-db.dts @@ -113,6 +113,8 @@ &ap_sdhci0 { pinctrl-names = "default"; bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; vqmmc-supply = <&ap0_reg_sd_vccq>; status = "okay"; };