From patchwork Thu Jan 25 12:46:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Niedermaier X-Patchwork-Id: 766143 Received: from mx4.securetransport.de (mx4.securetransport.de [178.254.6.145]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 56B844EB55; Thu, 25 Jan 2024 12:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.254.6.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706186866; cv=none; b=f/wjJplxDXspJivKKfH6qZ2F4c9zSPLYAdpDe8OjkW+AjL5mzfdZ+s2DIUHztNQgvRhkGDPWnUEN+t1I8n1AANLFkEnO4XVRisxBqOGOl3VpfzCRH/yyllbtUJOAW1EXx4Oaigot6VzrIFiauukJ55QBn4EP2kIB4pE30EnFgzc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706186866; c=relaxed/simple; bh=WHNYX9+EJRxk2fkvssctu49J3vAWfzkUKsCYIZ7poJc=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=daoHb/93gbf54CUttUK1XjxOqxMIFIRy1v0EGwiaF+5GdGf0tDBUD7WQQOvLTcA81w+/E/2hIOFeEF4uP4+kJ1KTlXHqSm1OJWQe0hlrjj74ww8O4btRlC8nRSgB2CPuwV60nu4olH9L9MXzdPvfercC77pkxl5j/hKb5wP4hw4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=dh-electronics.com; spf=pass smtp.mailfrom=dh-electronics.com; dkim=pass (2048-bit key) header.d=dh-electronics.com header.i=@dh-electronics.com header.b=ie/Xt2ng; arc=none smtp.client-ip=178.254.6.145 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=dh-electronics.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=dh-electronics.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=dh-electronics.com header.i=@dh-electronics.com header.b="ie/Xt2ng" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dh-electronics.com; s=dhelectronicscom; t=1706186815; bh=kvCjBh1lpWNwN8ASXjngcJYCu+H0FU6kjHgWOEasxvA=; h=From:To:CC:Subject:Date:From; b=ie/Xt2ngyb70Z53CBvzZ85zfFyzd1/wbYImwmeYVlbNfw3FSecAW9b+0SkautZu9x FBhk4Cz0ID8Ti/pF9rXedCJ1B3Jkk2sws+SN4b6dpaOsDoCxsi31vUXQf0Cnq8iRiz c93dUIpd7CvlnmePdRNymO5TCv1JpRS6HkWKoxiZQZ1l/N1BKrcbeHQ59JuLLk49wa a49Iuy29Fosczk5VpDl++qcawH/Bn7fLMMKrAvq3lUoX/14Y+QURHFgstFgp4Zro3M DTwSUflcZjnL0xYbsTjW5Ig4JnRj+lpx+6n3cyj4z30h0EmCwIGK6yO1Z4gAoiNtOx hF2KfrGcjywKQ== From: Christoph Niedermaier To: CC: Christoph Niedermaier , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Marek Vasut , Fabio Estevam , NXP Linux Team , , , Subject: [PATCH] ARM: dts: imx6ull-dhcom: Remove /omit-if-no-ref/ from node usdhc1-pwrseq Date: Thu, 25 Jan 2024 13:46:21 +0100 Message-ID: <20240125124621.16011-1-cniedermaier@dh-electronics.com> X-klartext: yes Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove /omit-if-no-ref/ from node usdhc1-pwrseq, because if the compile flag -@ (include symbols) is used the node will always be there. In this case, GPIO H is not released and therefore cannot be used. Therefore, remove this node manually from the corresponding devicetree file and don't rely on /omit-if-no-ref/. Signed-off-by: Christoph Niedermaier --- Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: Conor Dooley Cc: Shawn Guo Cc: Marek Vasut Cc: Fabio Estevam Cc: NXP Linux Team Cc: kernel@dh-electronics.com Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org To: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi | 4 +++- arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi index 040421f9c970..5e39f8dc1351 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som-cfg-sdcard.dtsi @@ -14,10 +14,12 @@ */ /* - * To use usdhc1 as SD card, the WiFi node must be deleted. + * To use usdhc1 as SD card, the WiFi node must be deleted. The associated + * pwrseq node is also deleted in order to ensure that GPIO H is released. * BT is also not available, so remove BT from the UART node. */ /delete-node/ &brcmf; +/delete-node/ &usdhc1_pwrseq; /delete-node/ &bluetooth; / { diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi index 830b5a5064f2..f914fe3818c2 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-dhcom-som.dtsi @@ -52,7 +52,7 @@ }; /* SoM with WiFi/BT: WiFi pin WL_REG_ON is connected to a DHCOM GPIO */ - /omit-if-no-ref/ usdhc1_pwrseq: usdhc1-pwrseq { + usdhc1_pwrseq: usdhc1-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; /* GPIO H */ };