From patchwork Sun Apr 22 14:21:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 10355099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9120A6023A for ; Sun, 22 Apr 2018 14:22:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DE4822A68 for ; Sun, 22 Apr 2018 14:22:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70F1821F61; Sun, 22 Apr 2018 14:22:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E703D212BE for ; Sun, 22 Apr 2018 14:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ruXgHQ40bF0a9Qkb+XEoHOvw2bOWRq1FclmGDsmbpCw=; b=Na7 koUO/0BHS3wb30r85ITCBvG+ItrS9DyP3ZgEnVErSRi5MSEkweG0FeMP6Z1HzhhMGgtkcOH3Dud4Y QV27lHHzt2rmcgFqvHwPSsSxltDm6o3O1JS+zA4x30zSYyg3wr1o7XsmiJ8MIsE3xlxsGnOnc4scL 4C8z2BropmGoKH1trLx0B0GLYnY/s47tFcrmkNUCdmIs36aMwmyvvp9Qul5YkFMnAdcuQKGrE56Is //5ZKriGNy9iHqsGtpu8ZtIOtDn//yKVfruq4EmS21bqbpGZOEjbEJW449/05wnM+B0JQSq5TXmsf 1sG6PvxotftmIchI9Y8XFZnJeiQbz5Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAFt5-0003eu-J2; Sun, 22 Apr 2018 14:22:43 +0000 Received: from leonov.paulk.fr ([185.233.101.22]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAFso-0003b6-22 for linux-arm-kernel@lists.infradead.org; Sun, 22 Apr 2018 14:22:28 +0000 Received: from gagarine.paulk.fr (gagarine [192.168.1.127]) by leonov.paulk.fr (Postfix) with ESMTPS id 279E8C07E9 for ; Sun, 22 Apr 2018 16:22:03 +0200 (CEST) Received: by gagarine.paulk.fr (Postfix, from userid 114) id E8B51C0C38; Sun, 22 Apr 2018 16:22:01 +0200 (CEST) Received: from localhost.localdomain (collins [192.168.1.129]) by gagarine.paulk.fr (Postfix) with ESMTP id 9794EC05FC; Sun, 22 Apr 2018 16:21:53 +0200 (CEST) From: Paul Kocialkowski To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: dts: imx6qdl-cubox-i: Move card-detect GPIO to 1.5 SOM devices only Date: Sun, 22 Apr 2018 16:21:51 +0200 Message-Id: <20180422142151.17910-1-contact@paulk.fr> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180422_072226_455728_FD87DD11 X-CRM114-Status: GOOD ( 14.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Russell King , Paul Kocialkowski , Rob Herring , Sascha Hauer , Fabio Estevam , Shawn Guo MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The Solid-Run CuBox-i lower board used in the first generation of CuBox-i devices feature a hinged micro SD card slot, that does not have card-detect capability. Since the card-detect GPIO was specified in the common cubox-i dtsi, it is moved to each device using the 1.5 SOM and is thus removed from the imx6q-cubox-i dts. Enabling the card-detect GPIO on the first generation CuBox-i devices results in waiting for a card-detect event (that never occurs) and thus not detecting the mmc card. Since the CD pin is still dedicated to the purpose on the SOM board even on the first generation CuBox-i devices, the pin control properties are kept untouched regardless of the slot capability. Signed-off-by: Paul Kocialkowski --- arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts | 4 ++++ arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts | 4 ++++ arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts | 4 ++++ arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts | 4 ++++ arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 1 - 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts b/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts index 2b2fc360b865..90a15f3b4fc0 100644 --- a/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts +++ b/arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts @@ -50,3 +50,7 @@ model = "SolidRun Cubox-i Solo/DualLite (1.5som+emmc)"; compatible = "solidrun,cubox-i/dl", "fsl,imx6dl"; }; + +&usdhc2 { + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts b/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts index e09c565d1d1f..9bdec07fefe3 100644 --- a/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts +++ b/arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts @@ -49,3 +49,7 @@ model = "SolidRun Cubox-i Solo/DualLite (1.5som)"; compatible = "solidrun,cubox-i/dl", "fsl,imx6dl"; }; + +&usdhc2 { + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts b/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts index 3e59ebbb3608..679a5431cbdb 100644 --- a/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts +++ b/arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts @@ -58,3 +58,7 @@ fsl,transmit-atten-16ths = <9>; fsl,no-spread-spectrum; }; + +&usdhc2 { + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts b/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts index dab70d1230a2..b9b8733f13c3 100644 --- a/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts +++ b/arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts @@ -57,3 +57,7 @@ fsl,transmit-atten-16ths = <9>; fsl,no-spread-spectrum; }; + +&usdhc2 { + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; +}; diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi index d1cfdc264126..170b3d27f875 100644 --- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi @@ -254,7 +254,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>; vmmc-supply = <&vcc_3v3>; - cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; };