From patchwork Sat Apr 2 19:39:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12799430 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DD20C4332F for ; Sat, 2 Apr 2022 19:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344891AbiDBTlr (ORCPT ); Sat, 2 Apr 2022 15:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344315AbiDBTlr (ORCPT ); Sat, 2 Apr 2022 15:41:47 -0400 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27D9E5BD03; Sat, 2 Apr 2022 12:39:54 -0700 (PDT) Received: by mail-il1-x129.google.com with SMTP id 8so4191097ilq.4; Sat, 02 Apr 2022 12:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qk+7Fg1Zoh8JjazLypzcfYRZulzMbo4YuMWQZUu9Rmo=; b=NyymN1uEmKv3L742+Ma6teYe+Mu9M9cUhovjD9CR5MlApKgvyrC53C8Fe/YsVJiQik F/qhAVFBHDVepiA9zCdmlteOpE4dgxZ0vzznKpnSuwXKNOtcvfWYL+jzdpb4sLYg/nef q1VvmshzjTso1IP37yUz2iIBay6prVjdvqjn5ZKAxwhkPHBwE0WXCRnmf0qbXn6RLwXD rLJ9gg9mZ88U5ckNWwj5zU2b7LT6wIDUfVObu+xSjXo0woJDBoSXZknOEeDJLua0NDyv 8BkloeRpFt9xg0PsmdLdQxFjzKm/xN0+1/jLSBvPMEyNLS1+JvjhkBaBZREU7fdP90zT 1l6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qk+7Fg1Zoh8JjazLypzcfYRZulzMbo4YuMWQZUu9Rmo=; b=DUN/jCauPj9z4tPYLp6Rz+yMm+IuvM/B6ngYtpYfU0nN+z11kjpnKR1TNSQA8sSxsr d50a451vWxeY/XhqD/bueMYlNJDbDVlq8qh1SffCCtmH/Ef3TdDh8CMUKNFUNSkM9D37 fg3FE3oFcNUBh+dJJTlGOxKK/f18noecDjJRuRCNZ1lVF7qRKjHuxz9NQJTFJnHYvJTD cVWMOsxdrawK9f1CioMrKzTiBMG1pk4brl4yAMUe1ErgYnr1XGGutj/tjVJLlexHTbVA oW51e5SYioI63Jxds5scbmMvEZQjh0a5HIOpKdeAl05CcIRNAY/HN7N6H8oF/7Z0XzKv 5ahA== X-Gm-Message-State: AOAM533agHia78IR63EIAROG0c0HbUCljddCJnz5mo3h3BF72Voig6ZI 61QwA/OobABT+mdJn6bNh3sKq8eav5LRvQ== X-Google-Smtp-Source: ABdhPJwO9Cu3DTwuQ7YnaGBlaodb7nn2ATOa+6kpgNs3kj4GgKRCCPZUVtBFvIhAsPocfcuYIo5ZWQ== X-Received: by 2002:a92:c247:0:b0:2ca:8e7:58c3 with SMTP id k7-20020a92c247000000b002ca08e758c3mr2448917ilo.40.1648928393148; Sat, 02 Apr 2022 12:39:53 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:6ab1:a455:ad1b:e8da]) by smtp.gmail.com with ESMTPSA id a14-20020a056e020e0e00b002c9e2f0fd76sm3261756ilk.13.2022.04.02.12.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 12:39:52 -0700 (PDT) From: Adam Ford To: linux-mmc@vger.kernel.org Cc: haibo.chen@nxp.com, aford@beaconembedded.com, Adam Ford , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 1/3] dt-bindings: mmc: imx-esdhc: Update compatible fallbacks Date: Sat, 2 Apr 2022 14:39:39 -0500 Message-Id: <20220402193942.744737-2-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220402193942.744737-1-aford173@gmail.com> References: <20220402193942.744737-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The SDHC controller in the imx8mn and imx8mp have the same controller as the imx8mm which is slightly different than that of the imx7d. Using the fallback of the imx8mm enables the controllers to support HS400-ES which is not available on the imx7d. After discussion with NXP, it turns out that the imx8qm should fall back to the imx8qxp, because those have some additional flags not present in the imx8mm. Suggested-by: haibo.chen@nxp.com Signed-off-by: Adam Ford --- V3: Marked the imx7d-usdhc as deprecated when there are better fallback options or the fallback isn't needed. Leave the deprecated fallback in the YAML to prevent errors Remove Reviewed-by from Krzysztof Kozlowski due to the above V2: Update the table per recomendation from Haibo. diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml index 7dbbcae9485c..11f039320d79 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml @@ -34,23 +34,34 @@ properties: - fsl,imx6ull-usdhc - fsl,imx7d-usdhc - fsl,imx7ulp-usdhc + - fsl,imx8mm-usdhc + - fsl,imx8qxp-usdhc - fsl,imxrt1050-usdhc - nxp,s32g2-usdhc - items: - enum: - fsl,imx8mm-usdhc + - fsl,imx8mq-usdhc + # fsl,imx7d-usdhc fallback is deprecated for imx8mm-usdhc + - const: fsl,imx7d-usdhc + - items: + - enum: - fsl,imx8mn-usdhc - fsl,imx8mp-usdhc - - fsl,imx8mq-usdhc - - fsl,imx8qm-usdhc - - fsl,imx8qxp-usdhc + - const: fsl,imx8mm-usdhc + # fsl,imx7d-usdhc fallback is deprecated - const: fsl,imx7d-usdhc - items: - enum: - - fsl,imx93-usdhc - fsl,imx8ulp-usdhc + - fsl,imx93-usdhc - const: fsl,imx8mm-usdhc - + - items: + - enum: + - fsl,imx8qm-usdhc + - const: fsl,imx8qxp-usdhc + # fsl,imx7d-usdhc fallback is deprecated + - const: fsl,imx7d-usdhc reg: maxItems: 1 From patchwork Sat Apr 2 19:39:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12799431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EAFFC433F5 for ; Sat, 2 Apr 2022 19:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230298AbiDBTls (ORCPT ); Sat, 2 Apr 2022 15:41:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345250AbiDBTlr (ORCPT ); Sat, 2 Apr 2022 15:41:47 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C05FF5C84D; Sat, 2 Apr 2022 12:39:55 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id z6so6921251iot.0; Sat, 02 Apr 2022 12:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kONCy+L4837y2p0w8BZs1PjYyStHLqcIFx2rz6iTVeE=; b=iSarmlkKTkcdzX8tAzc2M2OYHancQQ4Nvmzfe1TGzY007BXQEP6Cac6g8OTJSufI2E aNQR92hUytvA3Ioo5J7iRciiSBFq7kOTnK6wgC4SutsNfSSrlGyL3P8FGUY+ZkOVsWNo /85wkhv/ccz8rVOSx8aVdClgeIr6qn1ivtYO03qJQUi02acQypOeIm6JZVJ/8jEdXEkZ R28jH2+wwRhjreZRl0iB/MAQvxitBQByV0HNXZBaWmxNTd+Hwq41YNmf0lfAGOKw3iEz soMZt8TFwCG+zsZJR34BIwX42WPR79cjgte+v9PpcATwKTSr19+P5R8zwaf9uT2pvCY9 Un8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kONCy+L4837y2p0w8BZs1PjYyStHLqcIFx2rz6iTVeE=; b=A74Acgpz8MU8VG0WdwBemGosn6ain95krqaryJrah4UXl+Lui0rl8GrLz28n9Cs7hm BU/JYgr4XQ29zzzs/9m6tYoKd2r8Fxht6cJJisuBW6pKHSzSKlKHGNJXfsY93ecSsMoI WWOoAj3QAue9O84AOQYfm1gQdHJM0lmwQRaTgrcrscoLfCDNqTYJ35Lr0IwJ2y44vA6Z P2JQAYYc+xBROucz4PJN/7oiolGnJ4OgJ2aqPequ12k2ZFfuWOkYVCp1dFQyLiLiKQ2/ euue7HSWU477PtleTfF8PIgyEugipnWQT1Fuz8Acgfhdjx/t9R0mIHKjBmrLJAuqP4wQ HTFw== X-Gm-Message-State: AOAM531bvK0jSu8Z1L+IjQCQNE6QMfImwb1tBw7LZ3TtlhcGb+5Wb1EQ GleO2MdKNEiIk8CXJW5SG4uDDgKZ23frGg== X-Google-Smtp-Source: ABdhPJwiUwdMQPJbZlUd9T0RrBa18B5TGL9rYfD8yMUPu9Jj/6m718gBAECI1gyB+xPNGXCHOkdA9A== X-Received: by 2002:a05:6602:1593:b0:648:aa01:8d89 with SMTP id e19-20020a056602159300b00648aa018d89mr2295191iow.149.1648928394836; Sat, 02 Apr 2022 12:39:54 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:6ab1:a455:ad1b:e8da]) by smtp.gmail.com with ESMTPSA id a14-20020a056e020e0e00b002c9e2f0fd76sm3261756ilk.13.2022.04.02.12.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 12:39:54 -0700 (PDT) From: Adam Ford To: linux-mmc@vger.kernel.org Cc: haibo.chen@nxp.com, aford@beaconembedded.com, Adam Ford , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 2/3] arm64: dts: imx8mn: Enable HS400-ES Date: Sat, 2 Apr 2022 14:39:40 -0500 Message-Id: <20220402193942.744737-3-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220402193942.744737-1-aford173@gmail.com> References: <20220402193942.744737-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The SDHC controller in the imx8mn has the same controller as the imx8mm which supports HS400-ES. Change the compatible fallback to imx8mm to enable it, but keep the imx7d-usdhc to prevent breaking backwards compatibility. Signed-off-by: Adam Ford --- V3: Keep the fsl,imx7d-usdhc to keep backwards compatiblity and prevent breaking something. diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index 99f0f5026674..13c51363cc06 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -933,7 +933,7 @@ mu: mailbox@30aa0000 { }; usdhc1: mmc@30b40000 { - compatible = "fsl,imx8mn-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8mn-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; reg = <0x30b40000 0x10000>; interrupts = ; clocks = <&clk IMX8MN_CLK_IPG_ROOT>, @@ -947,7 +947,7 @@ usdhc1: mmc@30b40000 { }; usdhc2: mmc@30b50000 { - compatible = "fsl,imx8mn-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8mn-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; reg = <0x30b50000 0x10000>; interrupts = ; clocks = <&clk IMX8MN_CLK_IPG_ROOT>, @@ -961,7 +961,7 @@ usdhc2: mmc@30b50000 { }; usdhc3: mmc@30b60000 { - compatible = "fsl,imx8mn-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8mn-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; reg = <0x30b60000 0x10000>; interrupts = ; clocks = <&clk IMX8MN_CLK_IPG_ROOT>, From patchwork Sat Apr 2 19:39:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12799432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40606C433FE for ; Sat, 2 Apr 2022 19:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346590AbiDBTly (ORCPT ); Sat, 2 Apr 2022 15:41:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346869AbiDBTlt (ORCPT ); Sat, 2 Apr 2022 15:41:49 -0400 Received: from mail-il1-x129.google.com (mail-il1-x129.google.com [IPv6:2607:f8b0:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62C075BD03; Sat, 2 Apr 2022 12:39:57 -0700 (PDT) Received: by mail-il1-x129.google.com with SMTP id r11so4201001ila.1; Sat, 02 Apr 2022 12:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WinkjzPa9wNFBdfy3cxVUCM43zQXmo5BiQJvI8WCurc=; b=ASj9IEj8cG/7QQLiAkmWuFhJL9OADrLLXAirU/FwNlgk4qxOvQSyAXFP9bbGzv4u66 8NgyjVZkcDheQ1H98yr54cxU+ipQ/S2TmKXypASk1SsFJ2DoUoX2pLwWHkbVPPPuAFFe wmmTqUWmx2K3eTkhH1d6+Y7QBR878pVUvx6iyE4tnHMbAr1jtEum2U3cZ72+KQjAApzC T/27MuFH20Ztrk6eXO5a0TmadOKckTj7zae3bRMkmLGjgdvS7hwSmxhvLz1LdiqFcwqt uaTNhKoiRHF/Fk85+6TQ5H373UeSCuFshnQeqZeGo0+pxSP/Gt+WRBvyCoVojS7/A+qY qE0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WinkjzPa9wNFBdfy3cxVUCM43zQXmo5BiQJvI8WCurc=; b=wX2GEi0m8eTgRCnCpkOe7S/r+uVQH6pWgS+YcUyBqscY7zImLB0GaSFWn26RK5X4Ds 8ZrjntCm9PN7V/W8egYcudh+9EjbyZFSOZCzyPZiRBRRNYSM3QD07eHn+go/gO/EKX+M NHbsUdTWbhAWUsUkvkq3Jt6GqwlQATmkJNo7MTSacfvuYXNfxJ1XowR2wBtgcDmPiIlQ ssC3x9ewIDGN1x4+fFYllPAbtMbDhToiHFFBroVZ6i53AQodbtz7PHfZG6qTXLkVmdZJ Ip3Jl3J5BVvd5LSjyeHwaQ/5M3+hSfWLLcNN7a8b9yc7vEiMRb6X/oNIA9zZnSQS3Mqd ysbA== X-Gm-Message-State: AOAM531rbVRKekzIF8jiIctitx0m4t3jdx4tWb47b/XoBe8qyDqZ/ssq nDTbnUexJa8H5v2a2MCzamm4CFVTli1ZmA== X-Google-Smtp-Source: ABdhPJwQphokNGlMTGeK1MygO57M1D4ndFS+PkiMH7OKaVbdkJR1seQDISbuD/XZnllVbdeqZ5IuAg== X-Received: by 2002:a05:6e02:1a2c:b0:2ca:2f11:c60b with SMTP id g12-20020a056e021a2c00b002ca2f11c60bmr762906ile.75.1648928396410; Sat, 02 Apr 2022 12:39:56 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:6ab1:a455:ad1b:e8da]) by smtp.gmail.com with ESMTPSA id a14-20020a056e020e0e00b002c9e2f0fd76sm3261756ilk.13.2022.04.02.12.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 12:39:55 -0700 (PDT) From: Adam Ford To: linux-mmc@vger.kernel.org Cc: haibo.chen@nxp.com, aford@beaconembedded.com, Adam Ford , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 3/3] arm64: dts: imx8mp: Enable HS400-ES Date: Sat, 2 Apr 2022 14:39:41 -0500 Message-Id: <20220402193942.744737-4-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220402193942.744737-1-aford173@gmail.com> References: <20220402193942.744737-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The SDHC controller in the imx8mp has the same controller as the imx8mm which supports HS400-ES. Change the compatible fallback to imx8mm to enable it, but keep the imx7d-usdhc to prevent breaking backwards compatibility. Signed-off-by: Adam Ford --- V3: Keep the fsl,imx7d-usdhc to keep backwards compatiblity and prevent breaking something. diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi index 794d75173cf5..8578ff1062e6 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi @@ -769,7 +769,7 @@ i2c6: i2c@30ae0000 { }; usdhc1: mmc@30b40000 { - compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; reg = <0x30b40000 0x10000>; interrupts = ; clocks = <&clk IMX8MP_CLK_DUMMY>, @@ -783,7 +783,7 @@ usdhc1: mmc@30b40000 { }; usdhc2: mmc@30b50000 { - compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; reg = <0x30b50000 0x10000>; interrupts = ; clocks = <&clk IMX8MP_CLK_DUMMY>, @@ -797,7 +797,7 @@ usdhc2: mmc@30b50000 { }; usdhc3: mmc@30b60000 { - compatible = "fsl,imx8mp-usdhc", "fsl,imx7d-usdhc"; + compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc"; reg = <0x30b60000 0x10000>; interrupts = ; clocks = <&clk IMX8MP_CLK_DUMMY>,