From patchwork Wed Jun 15 11:50:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Krummenacher X-Patchwork-Id: 12882239 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 434ACC433EF for ; Wed, 15 Jun 2022 11:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hF4+cHL5kI82a3l81GPcaIR3CNpXZAT9omIFEe0J/2s=; b=1GmQl5I6lJPhU2 xsyTClc20axHVOTTAjLpyRfLg8z8U94QA3cKO9pKKo1+72zebXUNmRcZ1CjcccJ2sXwBqEqeNCBJY vDRwAu/S7wpg3vLO3iK1TP1/YVW47Gkd4LbYwxQXlM84L0I2QL9hO041aSHfc9DmjjS8sS5IlK2+Z GXR3MD3Kyq646BxtuEyc6k4D39QEB0WY5QCAyOo1E5FOVrszH+BF08LlMM3fvZgod4xGspxot5j1Y 0Wz6mhFC2BQV7xWq9k0dH1Q7XWPy+n95gzfvr1qF8alJ3WETrVjiwY00AS5+UJbB45kYqusNgRJh+ YfwH2Xg7pZng1Ct75tvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Rdu-00EJmN-Bn; Wed, 15 Jun 2022 11:57:02 +0000 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1RY6-00EGqA-T6 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 11:51:04 +0000 Received: by mail-ej1-x62f.google.com with SMTP id v1so22646078ejg.13 for ; Wed, 15 Jun 2022 04:51:01 -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=hG0DQrrpzmf9pK0gpz+otWlL1eUOYhl7swC6XNn6u3Y=; b=TvI48J5Y9XPIJ7/pmfaUV+mPUivD0/X0C1W+6tVLYxiVx8EHhs8ztVAdra6t3ef4xi wOXijsGvskxYvyPjSkNqgwtZA/oasUeJa9p2UUvqvaQfv+B56QEWyEtmvEvuEiIwbmln dQh8cv7So0S0Z/6YR2AjxMceXUETP4AL/KlA3dR4ZWRcizZeYgxJWNgHK+hITZAcjhPl aMOYgqQn7ok+CyPbE8FLlskKr5cZE63PWxVHTYrPJclwyjME4ZyoXzf5JU5XvTvzOQ/4 5oDLYKJiGIhUjfmWIGK0DjZpBrFUs6WiAG0k3lwWDIkZfTRUi2yUdRl99+HhbLszFUnH oVig== 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=hG0DQrrpzmf9pK0gpz+otWlL1eUOYhl7swC6XNn6u3Y=; b=L4Vc13xwO3/1h96U6+sItfniLFuZL5upZU+nB+hjJdqlGy7O6ppgN4Cq1fMmuHhrgZ WKJPNb+xDEd1Uv1DHX/OndcTDOYjgHT1jmaNh4JsY+gRQXvoZdugmIK0G/hk5o9k9vLS df1xxf0m4haE2ZQkE2SRhw90ZLXMGS3abhl8CG1CZY2h1AhIcoN7s3I7PSXt1rNA12DS zM7h/IID/uqO4INJq2Vjm9EgxCd5sEaA6TMOiMrcIXqL3wdVt2zpuzi+u+JMDuiymcBU vEAOp5hQzSbIVvUN9lao6yOv/zMBOirJtb9hmUCBbzmjMDa0osYg9DSmE5GMaAr8v6Ge NoHg== X-Gm-Message-State: AOAM532wkZQB39e5EUUWRq1G/Tup2fxngJvaWipJWSort8kwYoGaXzvU +MtlRBEsDP96Qg77DI4wJq0= X-Google-Smtp-Source: ABdhPJxJav8egmgVGQfvwcuVGKlHqlncBGrHi9htRZb+7ISkG3FS6UxcPQrrfBXt5LALzOvVII6ZXw== X-Received: by 2002:a17:906:3c07:b0:718:e1a7:b834 with SMTP id h7-20020a1709063c0700b00718e1a7b834mr4802775ejg.635.1655293860677; Wed, 15 Jun 2022 04:51:00 -0700 (PDT) Received: from linuxdev2.toradex.int (31-10-206-125.static.upc.ch. [31.10.206.125]) by smtp.gmail.com with ESMTPSA id t6-20020a17090616c600b00715a02874acsm4561158ejd.35.2022.06.15.04.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 04:51:00 -0700 (PDT) From: Max Krummenacher To: max.krummenacher@toradex.com Cc: Denys Drozdov , Fabio Estevam , Krzysztof Kozlowski , NXP Linux Team , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 14/18] ARM: dts: imx6q-apalis: Clean-up sd card support Date: Wed, 15 Jun 2022 13:50:02 +0200 Message-Id: <20220615115006.45672-15-max.oss.09@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220615115006.45672-1-max.oss.09@gmail.com> References: <20220615115006.45672-1-max.oss.09@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_045103_007110_1B706920 X-CRM114-Status: GOOD ( 13.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Denys Drozdov Configure SOM DTSI to 8-bit, card detect in the SoM dtsi as this is the Apalis family default functionality. Limit the interface to 4-bit only on the Ixora V1.1 carrier boards. Signed-off-by: Denys Drozdov Signed-off-by: Max Krummenacher --- (no changes since v1) arch/arm/boot/dts/imx6q-apalis-eval.dts | 3 --- arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 1 - arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index eeb20d7a637d..19aaffd71f3d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -158,9 +158,6 @@ /* MMC1 */ &usdhc1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts index b254e96d194a..2d0324103804 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -175,7 +175,6 @@ &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 6d072aa87952..4ff46ffd2300 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -832,7 +832,8 @@ /* MMC1 */ &usdhc1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>; + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; vqmmc-supply = <®_module_3v3>; bus-width = <8>; disable-wp;