From patchwork Wed Mar 8 12:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 66213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp323660wrd; Wed, 8 Mar 2023 05:15:28 -0800 (PST) X-Google-Smtp-Source: AK7set8zkItbsXVXDTaSvxUfaQcgFCv4ByJU5O7Uu6EwiKSfEYAAQ0Z9bzSw7IDHoWyAsSYtlaLN X-Received: by 2002:a05:6a20:8b8a:b0:cb:9df6:8360 with SMTP id m10-20020a056a208b8a00b000cb9df68360mr14758880pzh.49.1678281328113; Wed, 08 Mar 2023 05:15:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678281328; cv=none; d=google.com; s=arc-20160816; b=lWAzs3BvtXtYiVCeK47EynfNl+JVhMyjz6f7WkbPWw4l9r4ejbBqyBt3caiQISq5Z/ xwWegkk763EsDV7ZWIaTBxmAapaH2EFu+oobn4KMn0vERiklUX3hgnpVxbKOOlhT9Ay3 mV2doQ0E989C0+pMlYGiq9iEbS+njIUOoP0PuLxiObb0WSzuqNzm+EE856TBm/8xCPoJ mVz/h6FdX0MZR9cb6L4oh1clQRnf3aoimAiqfBEB8s5sRfQII8McnvHuomuaDaIwiwQ3 Pq5o8z1WUi8xVYc/QZi3sYWeOwB/qgxVzDEsgi084Z2NzHgmnYDoCDfCVe01pHUtZPbT AiFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9mfOwfdbZ8exDjskYwjwEpahRmFliTcBB+dyiGdmM5Y=; b=AHKVCBzPvt9/t6ITHuzxjqJQeyx6po5QdPPaCB/fkBKjR4lQAFruNphvo2npXVKY8b BQL1h60vaiOKtweGurjnryq0vHAPcdZbDpRLHj6eA8cFj5Y6Jr33x2xqS0WvhWxEb6NN E5mZfDiNZT8seL+/yumx7OFOxM3iaTgSN8Si4vYc1qxkHJUvSQO1bU08t0brbon9EXiI yVGTdEh0Mlbv7FivYUlgjDUGptrOGRaY/F3E9oOPBXWUs4hb2m5LlVUOO92oivpAjDE+ IkYwHBassYXy2x0cr/Ol/OgW3zvVn7Xhn0KT3QzVL79bitJ7JTkIyvBuIp5+KYtET9ZB w0LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ULyvRxpU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e68-20020a636947000000b004fb1d903b3csi15566141pgc.37.2023.03.08.05.15.14; Wed, 08 Mar 2023 05:15:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ULyvRxpU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbjCHNAM (ORCPT + 99 others); Wed, 8 Mar 2023 08:00:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231183AbjCHM71 (ORCPT ); Wed, 8 Mar 2023 07:59:27 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C59B385379 for ; Wed, 8 Mar 2023 04:59:19 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id o12so65297633edb.9 for ; Wed, 08 Mar 2023 04:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678280359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9mfOwfdbZ8exDjskYwjwEpahRmFliTcBB+dyiGdmM5Y=; b=ULyvRxpUzy0CMYgaNIiHjXHo5dPts/WbAbqxkj/5ve1xBAKhXPYUSKHTFsw6KEBxgI +zBQh/xbnhgIjJSvqtGHhK5FKaGTiEmhz8uGDqCWaeYOdYCa5xP+rVlVz5uUjWtymSsi 8hTSYC55YFlgpPXufnajXUR2NFM2wqcFZBXps7IQ2WT6dUvrdhuPKRV+aMrltPtBisKR P0bMV/bz2UUt/+k0xVVHfH4RnI4Er+cI22gBrt8+sxeCW4Z7etkW52q6S8PIzC7Hndxk FMMwP8o0iJUz92d1xMT+Z3KPcLPlvXxsXMXE6HPpaBnJ+oh7TyK+ynmNh7cgvKQJkJcq cGnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678280359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9mfOwfdbZ8exDjskYwjwEpahRmFliTcBB+dyiGdmM5Y=; b=BisvysuZTMIlxFGVGrk1Q3WM7xacUF9ZYHsGf/xw3hJtzVdFSBMtT57Fh4pl8DG3er pE3GHM2yDQxybXIpGUB4gjQQr39zGUg3D2W3QFFK5ba+LYw+DXlUCVhFHVjcD8q4pHG5 7o9RwFPmlrZ1NJfMCF2yhaLLLt/WgZ1+W7cfTUVaquUYO0nyrgnWfOn74zAchQAV0YXR cS3elmcd/oB5jtzzbDl+5fdfRHz4rR2wJoKrfSfCSM2WhqD2KgficbBNU/gv662EIBRS anumyQDOyTHfJtJzjkL7RUGRGDZ3FpZ+9/ytb0h0f1xRPgfUlU7hU6kqF0VXVir0Pog5 sjVA== X-Gm-Message-State: AO0yUKUveZczWvNdbtrqXLB5ZDP1eZ2nHWtn9Nd6VlwNot4JEhLT2xxl 9jfJqDRpA0N/AqsXiBstHTJBGg== X-Received: by 2002:a17:907:7f0b:b0:888:7ac8:c0f4 with SMTP id qf11-20020a1709077f0b00b008887ac8c0f4mr17839200ejc.25.1678280359078; Wed, 08 Mar 2023 04:59:19 -0800 (PST) Received: from krzk-bin.. ([2a02:810d:15c0:828:ff33:9b14:bdd2:a3da]) by smtp.gmail.com with ESMTPSA id h25-20020a1709063b5900b008d0dbf15b8bsm7464141ejf.212.2023.03.08.04.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 04:59:18 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Melody Olvera , Greg Kroah-Hartman , Souradeep Chowdhury , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 11/11] arm64: dts: qcom: msm8996-oneplus: do not enable incomplete nodes Date: Wed, 8 Mar 2023 13:59:06 +0100 Message-Id: <20230308125906.236885-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230308125906.236885-1-krzysztof.kozlowski@linaro.org> References: <20230308125906.236885-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759805521459254908?= X-GMAIL-MSGID: =?utf-8?q?1759805521459254908?= status=okay should appear in final place where all required properties are provided, because that makes the code the easiest to read. Move the status from common OnePlus DTSI to board DTS. No functional changes. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- Changes since v1: 1. None --- .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 17 ----------------- arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 ++++++ arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 ++++++ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi index 104deaee74e5..2adadc1e5b7c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi @@ -85,10 +85,6 @@ wlan_en: wlan-en-regulator { }; }; -&adsp_pil { - status = "okay"; -}; - &blsp1_i2c3 { status = "okay"; @@ -183,10 +179,6 @@ &dsi0_phy { status = "okay"; }; -&gpu { - status = "okay"; -}; - &hsusb_phy1 { vdd-supply = <&vreg_l28a_0p925>; vdda-pll-supply = <&vreg_l12a_1p8>; @@ -215,7 +207,6 @@ &mmcc { &mss_pil { pll-supply = <&vreg_l12a_1p8>; - status = "okay"; }; &pcie0 { @@ -548,10 +539,6 @@ wcd9335: codec@1,0 { }; }; -&slpi_pil { - status = "okay"; -}; - &sound { compatible = "qcom,apq8096-sndcard"; model = "OnePlus3"; @@ -812,7 +799,3 @@ &usb3_dwc3 { maximum-speed = "high-speed"; }; - -&venus { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts index 1bdc1b134305..dfe75119b8d2 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts @@ -17,6 +17,7 @@ / { &adsp_pil { firmware-name = "qcom/msm8996/oneplus3/adsp.mbn"; + status = "okay"; }; &battery { @@ -25,6 +26,8 @@ &battery { }; &gpu { + status = "okay"; + zap-shader { firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn"; }; @@ -33,12 +36,15 @@ zap-shader { &mss_pil { firmware-name = "qcom/msm8996/oneplus3/mba.mbn", "qcom/msm8996/oneplus3/modem.mbn"; + status = "okay"; }; &slpi_pil { firmware-name = "qcom/msm8996/oneplus3/slpi.mbn"; + status = "okay"; }; &venus { firmware-name = "qcom/msm8996/oneplus3/venus.mbn"; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts index 34f837dd0c12..51fce65e89f1 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts @@ -18,6 +18,7 @@ / { &adsp_pil { firmware-name = "qcom/msm8996/oneplus3t/adsp.mbn"; + status = "okay"; }; &battery { @@ -26,6 +27,8 @@ &battery { }; &gpu { + status = "okay"; + zap-shader { firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn"; }; @@ -34,12 +37,15 @@ zap-shader { &mss_pil { firmware-name = "qcom/msm8996/oneplus3t/mba.mbn", "qcom/msm8996/oneplus3t/modem.mbn"; + status = "okay"; }; &slpi_pil { firmware-name = "qcom/msm8996/oneplus3t/slpi.mbn"; + status = "okay"; }; &venus { firmware-name = "qcom/msm8996/oneplus3t/venus.mbn"; + status = "okay"; };