From patchwork Thu Dec 7 15:19:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Riegel X-Patchwork-Id: 10099409 X-Patchwork-Delegate: agross@codeaurora.org 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 D317D602BF for ; Thu, 7 Dec 2017 15:20:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2D7A1FF29 for ; Thu, 7 Dec 2017 15:20:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B782D1FF60; Thu, 7 Dec 2017 15:20:37 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5204B1FF29 for ; Thu, 7 Dec 2017 15:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754561AbdLGPT7 (ORCPT ); Thu, 7 Dec 2017 10:19:59 -0500 Received: from mail.savoirfairelinux.com ([208.88.110.44]:54874 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754353AbdLGPTz (ORCPT ); Thu, 7 Dec 2017 10:19:55 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id CA5A79C3019; Thu, 7 Dec 2017 10:19:54 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id BagGfxiBzzcB; Thu, 7 Dec 2017 10:19:54 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 1060D9C304E; Thu, 7 Dec 2017 10:19:54 -0500 (EST) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id f-UwsyHDjUmZ; Thu, 7 Dec 2017 10:19:53 -0500 (EST) Received: from workotop.localdomain (modemcable073.90-22-96.mc.videotron.ca [96.22.90.73]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 96E459C3042; Thu, 7 Dec 2017 10:19:53 -0500 (EST) From: Damien Riegel To: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Bjorn Andersson , Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , kernel@savoirfairelinux.com, Damien Riegel Subject: [PATCH v2 08/10] arm64: dts: qcom: msm8916-pins: move sdhc2 cd node with its siblings Date: Thu, 7 Dec 2017 10:19:40 -0500 Message-Id: <20171207151942.5805-9-damien.riegel@savoirfairelinux.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171207151942.5805-1-damien.riegel@savoirfairelinux.com> References: <20171207151942.5805-1-damien.riegel@savoirfairelinux.com> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Nodes relative to the first sdhc node were interlaced with node of the second sdhc. Move sdhc2_cd_pin with its siblings to prevent that. Also rename the grouping node from sdhc2_cd_pin to pmx_sdc2_cd_pin, as "pmx_sdc" is the prefix used by other nodes. Signed-off-by: Damien Riegel Acked-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi index c79301f204b7..7704ddecb6c4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi @@ -194,21 +194,6 @@ }; }; - sdhc2_cd_pin { - sdc2_cd_on: cd_on { - pinmux { - function = "gpio"; - pins = "gpio38"; - }; - }; - sdc2_cd_off: cd_off { - pinmux { - function = "gpio"; - pins = "gpio38"; - }; - }; - }; - pmx_sdc1_clk { sdc1_clk_on: clk_on { pinmux { @@ -287,6 +272,21 @@ }; }; + pmx_sdc2_cd_pin { + sdc2_cd_on: cd_on { + pinmux { + function = "gpio"; + pins = "gpio38"; + }; + }; + sdc2_cd_off: cd_off { + pinmux { + function = "gpio"; + pins = "gpio38"; + }; + }; + }; + cdc-pdm-lines { cdc_pdm_lines_act: pdm_lines_on { pinmux {