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: 660559 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 8304EC74A44 for ; Wed, 8 Mar 2023 13:00:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbjCHNAJ (ORCPT ); Wed, 8 Mar 2023 08:00:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbjCHM72 (ORCPT ); Wed, 8 Mar 2023 07:59:28 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1A8E746E6 for ; Wed, 8 Mar 2023 04:59:20 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id u9so65460827edd.2 for ; Wed, 08 Mar 2023 04:59:20 -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=1rZtyzZvxyou2sxRPoG9THOsAJ1MGxdVje+epyrv7KlZpMN+jDffQXKFK1gxvFdxTw Ni6QOUD4vd+8oO7b4rveD9iNK8MUlslSxgIxSOpIhqRIc/yM3BvSNjnkaMiaTVY0OVvK dot6BQ5GySBTWDT55p4T7WPvUOSL2RUy9m2hAl7t4dw+TjzCBgJhvXaTtfSvmYfk2eJb XA4Alam7Esd3I4n+wk9YiNI7Pu1IEMkViz+DpZPcTnU2lWVMbrLULO9DsEDOt81afsu4 s8tmaf6roroPR9drZvBYLySMijbdz/kzyRTDA8HnowuOyyylVgNQwcvtn3o1czYH8CbO AzDQ== X-Gm-Message-State: AO0yUKXqsgujyfP2ogGJ5rym5GRnGLF0NkyIiMxOx/46BJ/0tAHR/Z5T aagNH4rDOTCbEfEk492OVAD79A== X-Google-Smtp-Source: AK7set9oNdnuX0f4MvhnHStYIyiVAVetbxLKMQwiPT3mSYnsKFPTKtwHVaG7Ct3T6eSirdqajWRyPw== 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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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"; };