From patchwork Wed Aug 10 08:05:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 596464 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 4C861C25B0C for ; Wed, 10 Aug 2022 08:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229636AbiHJIF2 (ORCPT ); Wed, 10 Aug 2022 04:05:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231272AbiHJIF0 (ORCPT ); Wed, 10 Aug 2022 04:05:26 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A8C425C6B for ; Wed, 10 Aug 2022 01:05:23 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id t1so20164738lft.8 for ; Wed, 10 Aug 2022 01:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=BpcLPBAGuiZcpVrA8pcR24viGnpJaVJd3XMXiJb1Rfg=; b=huxWhU8+f11jDxhBwD0M/5LlAFH+ebBTILIwhjbkIe0sEzWtGUi7Rw4KpaIs2JvgTG OcC2MiMXatY5dRFtuFsC12r8sRuOO97nA7JptuozHen0gHM94+uF4UVzJ1cZql0aNpeE 6vjuxGrA+K0FUYg4z0gY5uGsNpmdM+dGEQBpm1xYY8GqMevp2rRlv1plnAndv6lgsm2n 6xnZt1naQN89p2EDZdnpmUMnMeahCzvDck4eUcU80IE8W/tvO4+x5BThnJNS8eDUpHds HmuUIYk++sPiL3jUBmou8Qc3c1yHHqQ4OpfoQ/k/lY1ygVqv6gPFcNbk5L4Qw62qD+jL VcgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=BpcLPBAGuiZcpVrA8pcR24viGnpJaVJd3XMXiJb1Rfg=; b=147mjH5l3BmcIVh+9tFSE++ilHDWECS8ShNmaGql3AZHcCZzWLaf5o+//7X+Se3e/Q 1cU9akM4ee8nWPLTK6GTsdYpSMje6UQGjnSYMdkpEAAXPzPd5SiIgtafsl6GsTTIlApl espaOqFKQ1gFM7lxRDkEpEqoP6GBZvXx/KDqzXF88FDCS1ocMeKpC9P2JuAC7nnvFVa5 3UTJsB72rmQslP+f9vG0VnilMH6JkkobXv2qXfLqAeJ+RV3pzsQQdZR9wx6nuTONl6d7 e8HnLOwMMYZBh0XSL5AmItDWpyzBFtVTjRACsdq5HhzpxpFL2KqqK4Hfqse1ghn7vwZu egjA== X-Gm-Message-State: ACgBeo0wTIuk/TqSBYlHTdlPSI2Wl8ZzIW+voRyIi14h5qfnkTYXhxGn V6RKfbDlfWm9fw/czLPqTlsIdQ== X-Google-Smtp-Source: AA6agR4u4BvlM/9iAHgtwXaT7uSI8+FBhSL8xrlmU3bF+vRMEGIsIBnljKY7isbFKHhLwk9D2IpIOg== X-Received: by 2002:a05:6512:2989:b0:48a:f4b9:84bf with SMTP id du9-20020a056512298900b0048af4b984bfmr9836809lfb.39.1660118721868; Wed, 10 Aug 2022 01:05:21 -0700 (PDT) Received: from localhost.localdomain ([83.146.140.105]) by smtp.gmail.com with ESMTPSA id h12-20020a2ea48c000000b0025e040510e7sm309571lji.74.2022.08.10.01.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 01:05:21 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/4] ARM: dts: qcom: msm8660: override nodes by label Date: Wed, 10 Aug 2022 11:05:15 +0300 Message-Id: <20220810080516.166866-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> References: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Using node paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). This also reduces the indentation making the code easier to read. The pre/post DTBS are the same. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8660-surf.dts | 41 ++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts index 414280d9bdba..63b8f4285ace 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -16,14 +16,6 @@ chosen { }; soc { - gsbi@19c00000 { - status = "okay"; - qcom,mode = ; - serial@19c40000 { - status = "okay"; - }; - }; - /* Temporary fixed regulator */ vsdcc_fixed: vsdcc-regulator { compatible = "regulator-fixed"; @@ -32,21 +24,16 @@ vsdcc_fixed: vsdcc-regulator { regulator-max-microvolt = <2700000>; regulator-always-on; }; + }; +}; - amba { - /* eMMC */ - sdcc1: mmc@12400000 { - status = "okay"; - vmmc-supply = <&vsdcc_fixed>; - }; +&gsbi12 { + qcom,mode = ; + status = "okay"; +}; - /* External micro SD card */ - sdcc3: mmc@12180000 { - status = "okay"; - vmmc-supply = <&vsdcc_fixed>; - }; - }; - }; +&gsbi12_serial { + status = "okay"; }; &pm8058 { @@ -76,3 +63,15 @@ MATRIX_KEY(5, 4, KEY_MENU) keypad,num-columns = <5>; }; }; + +/* eMMC */ +&sdcc1 { + vmmc-supply = <&vsdcc_fixed>; + status = "okay"; +}; + +/* External micro SD card */ +&sdcc3 { + vmmc-supply = <&vsdcc_fixed>; + status = "okay"; +};