From patchwork Wed Dec 16 07:45:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Porotchkin X-Patchwork-Id: 344716 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 D974EC2BBCA for ; Wed, 16 Dec 2020 07:47:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8970723356 for ; Wed, 16 Dec 2020 07:47:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725906AbgLPHrN (ORCPT ); Wed, 16 Dec 2020 02:47:13 -0500 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:47570 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725988AbgLPHrN (ORCPT ); Wed, 16 Dec 2020 02:47:13 -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 0BG7fLn9009997; Tue, 15 Dec 2020 23:46:27 -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=NPb5S7s6hYBD1HL61yH1+Aa/XnTifB5fFbr20+dGV80cQWXjlFSXK22fjfnzOuSxVUbM Pp4ODuZ97d0XpbhFz3AHpS8cShTDbgRFXcMbUzse3o4eiuv/zG374q+Z0Ug8Qe6oucay CA5qYAZr9nhHSZ0myEll4x93qraD46+1gbHefZCHMjfiy+06nNP+tqIdZH1myPL9lKOR 6PRgHigjol1XRPlUScVEexEz58XgEFXz8LI4ZjFHPEUMDj0LFpreIm4jz5Do7X2ufu5x x5dlEeVTvg0jpd7GchHDAJdQiXq8ymknULRuoli83Nyk0m8AZ+v6T8/n3Q3Pu1g9gXv9 kw== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 35cx8tataf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 23:46:27 -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 23:46:26 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 15 Dec 2020 23:46:26 -0800 Received: from vb-cavnet.porotchkin.lan (PT-LT0319.marvell.com [10.6.202.166]) by maili.marvell.com (Postfix) with ESMTP id 3DC163F703F; Tue, 15 Dec 2020 23:46:24 -0800 (PST) From: To: CC: , , , , , , Subject: [PATCH v2 1/3] dt-bindings: mmc: xenon: add AP807 compatible string Date: Wed, 16 Dec 2020 09:45:38 +0200 Message-ID: <20201216074540.30616-2-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201216074540.30616-1-kostap@marvell.com> References: <20201216074540.30616-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-16_02:2020-12-15,2020-12-16 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 Wed Dec 16 07:45:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Porotchkin X-Patchwork-Id: 344715 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 44EE4C0018C for ; Wed, 16 Dec 2020 07:47:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B553A23357 for ; Wed, 16 Dec 2020 07:47:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726357AbgLPHrS (ORCPT ); Wed, 16 Dec 2020 02:47:18 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:11418 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726355AbgLPHrS (ORCPT ); Wed, 16 Dec 2020 02:47:18 -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 0BG7dZpm030944; Tue, 15 Dec 2020 23:46:30 -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=Puao5oWLLJfN2JnWB5z4+yCqLqmX11iEa7/vH7+sU2k=; b=h8kgeo4wuhTfKpjbOOq+3ZDCm0Z36znNQ0ggIllUeqHAih9JfNqjY7sPvMxV8CTLW6ld s2vlJLp8FNE/FwNpJcZzdPQnUlYgqyjPZVNWXpcoTK0piOpp4Royekv4lm4gjYxxgA5Z fSb/3c2lRGnrSaod+0SHUp4plhhZr42FDtsaMnuZKemdt1TbUJqeSoUMXX9lu1Bg2qK7 9P7g8vKDVWXIHsyKuC7NYhe3l9ZFl2naqJGNzN/UKNA6dSBeZe7LMvU7JwTj8rUR3eIY ZnJU3HJpDLAOdANXsMQ75Y3ZkUq8ltTJ5iNDbZLKLK7HlTDEaj7i1aQsDhnOaqW9ab6M HA== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 35cv3t34tw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 23:46:30 -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 23:46:29 -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 23:46:29 -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 23:46:29 -0800 Received: from vb-cavnet.porotchkin.lan (PT-LT0319.marvell.com [10.6.202.166]) by maili.marvell.com (Postfix) with ESMTP id CC46F3F703F; Tue, 15 Dec 2020 23:46:26 -0800 (PST) From: To: CC: , , , , , , Subject: [PATCH v2 2/3] mmc: xenon: add AP807 compatible string Date: Wed, 16 Dec 2020 09:45:39 +0200 Message-ID: <20201216074540.30616-3-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201216074540.30616-1-kostap@marvell.com> References: <20201216074540.30616-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-16_02:2020-12-15,2020-12-16 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 c67611fdaa8a..add1b4dcd5e5 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -684,6 +684,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", .data = (void *)XENON_AP806}, + { .compatible = "marvell,armada-ap807-sdhci", .data = (void *)XENON_AP807}, { .compatible = "marvell,armada-cp110-sdhci", .data = (void *)XENON_CP110}, { .compatible = "marvell,armada-3700-sdhci", .data = (void *)XENON_A3700}, {} From patchwork Wed Dec 16 07:45:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Porotchkin X-Patchwork-Id: 345240 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 68380C2BBCD for ; Wed, 16 Dec 2020 07:47:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18B0A23370 for ; Wed, 16 Dec 2020 07:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726355AbgLPHrS (ORCPT ); Wed, 16 Dec 2020 02:47:18 -0500 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:44604 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725988AbgLPHrS (ORCPT ); Wed, 16 Dec 2020 02:47:18 -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 0BG7ef29009856; Tue, 15 Dec 2020 23:46:33 -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=b2YF4QZ/ZEmPRUjyMs0RYkXpQlgxHoSvuA0+U/O7IGY=; b=klcyahHGdorpXatgD6LNsdW5mz3/d/W7LUKLnLY8yYWWbvvPvLef1QCF8D8ugbCRx5nL ur4EnbYlBbm5JeXo5rNknlP3YuRwFbGS34ctqJXCJU1VssN7Z3CcW+uOnlGlcIoWorsj Jg3krq8dZHD53wCMn7FImbGZU1SdwYAHeKhZGubIlfBJdELfMCHNbthr+XR1fdKm10Xu 3DyWDixbSlDNVZCDa8HcDUbqogVhym2P+uvFjWKCkQo7hVJa3tUobYh4FbH+6qLvceyU knpvwW0QJPAjTt3SUAcj2otNPXrcEFyV3BoZKUCyaWiibZ+BKxGcVM5Sc++DOXZRS8Nz XA== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 35cx8tataq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 23:46:32 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 15 Dec 2020 23:46:31 -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 23:46:31 -0800 Received: from vb-cavnet.porotchkin.lan (PT-LT0319.marvell.com [10.6.202.166]) by maili.marvell.com (Postfix) with ESMTP id 65CD13F7040; Tue, 15 Dec 2020 23:46:29 -0800 (PST) From: To: CC: , , , , , , Subject: [PATCH v2 3/3] arm64: dts: cn913x-db: enable MMC HS400 Date: Wed, 16 Dec 2020 09:45:40 +0200 Message-ID: <20201216074540.30616-4-kostap@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201216074540.30616-1-kostap@marvell.com> References: <20201216074540.30616-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-16_02:2020-12-15,2020-12-16 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 ce49a70d88a0..79020e6d2792 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"; };