From patchwork Sat Dec 10 11:57:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1272008wrr; Sat, 10 Dec 2022 04:00:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf5BEspdEJRa/hvNXncT/27xkoZ1gKYjln60DaDB847tvXDh9/jtDDz0p+WIor83Lglqztm+ X-Received: by 2002:a17:90a:4814:b0:219:7742:9bcf with SMTP id a20-20020a17090a481400b0021977429bcfmr9499358pjh.40.1670673653048; Sat, 10 Dec 2022 04:00:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670673653; cv=none; d=google.com; s=arc-20160816; b=PExsUqr25fvKWrl59+Go2rSD6QhsrraMAhTTx+NhvrmQqmOspEsUaVxyUpBw3Cgzux 0t5K+pA6daOtjkiaHnn8t73z6dffSLI0Gpv9WMY7Wr8QYnL0sUbCJ3JdRo/KsTtbiNeC pl1pWqAZ6TGj09Vg0DGS9ZhfIlMhbX4bAp8KfpPm7PDTaJZRJR0soJN+3anuSLFDq03+ D1Zl8mMJyByymEBEhdyDY4vBQInz+KqBT+cIksnurtde1gTOBDCzr8BeWBuHulJu2m2g jpyJ6gKErnvtsNm3cA/CbObPv0MDbQ6FnZSAsfcN35L57SyGwf9ubc/RE0OQKi57CafW p/xA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=PXM/ZzQf3i83h9TWbUQNWzaHxNpC3fWU4P5IeO/SlrM=; b=ktOVpHqIojXdhiDsBjdeT4qE32q7wVnf97b4D8ZbzYkL8rnt4QKVxKDWGSC/SPkEWR 8vStfMKCMje+73bcBiCZFyxmIvT/kIOOdxszoML3XYZh9y99IyjwI2KWO8KFTHHWQgcI wOf1AK25yMR2Fl901MWYCH4ubDybbYVa1fIYRkhp1TBCsr8P2SWOwYkRhoNk/lQhaHJM Oy6Z3NabgtXzATGIvbNl7HsWsheS3bCRmJiE9h2+vgRMddOH42TXG+dRpzJcQToHQel3 isjOo6aaZ0E39oTTxAtWI/GLNunxrkrHQaxjH+tpJ2yvX61ihsxt0M3DP31/4zwSv9R1 wFsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="pi/xxaQJ"; 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 g70-20020a636b49000000b00478e0f629a8si4106760pgc.269.2022.12.10.04.00.38; Sat, 10 Dec 2022 04:00:52 -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="pi/xxaQJ"; 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 S229763AbiLJL5M (ORCPT + 99 others); Sat, 10 Dec 2022 06:57:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbiLJL5K (ORCPT ); Sat, 10 Dec 2022 06:57:10 -0500 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8446110B45 for ; Sat, 10 Dec 2022 03:57:09 -0800 (PST) Received: by mail-lf1-x136.google.com with SMTP id s8so11048887lfc.8 for ; Sat, 10 Dec 2022 03:57:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PXM/ZzQf3i83h9TWbUQNWzaHxNpC3fWU4P5IeO/SlrM=; b=pi/xxaQJP3Gab0CcC8mIr8CIVqw5IgnkcLFWRo8KmH9qXJg6yESHyINGyzUKjb5fmF 0D89U8j6bo5hy1JIHnKczyEfHvL6STsIutwDlm+sLu5EPZqu1N3ALILNjj5POrY4p8Lt JXjU3Wp8BPvcAmXJ/rrLMBcK54xQoI202IXBhUeqj5haVaTHqRxsFxO0ZV3y6TrbgiZs cfkwd4hV7pP95Abx2fRmYiWg4L79WvsJyLi0Ep3gOKHK2wR7SY9bfphqLyUMWGRwV9zM k0DeR6a0Soq5xI1HdXlvkwP2R/QmtvrKmpnC+lHwI6kHPan2qYFPaj4fON1/cRlAPSfS WbKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PXM/ZzQf3i83h9TWbUQNWzaHxNpC3fWU4P5IeO/SlrM=; b=TuUTjM7YyJDldld1OqmVgNeYXCmDpjaDWq7Yq+lecuhC2tB3DoqyoZg9jgbn994B7d vnmWYCngSweik6Wk3r5D2OisqrXrLH+rlieDyYO+wM/7HQDCCbmMMdQqXAU3+TfsF3xr mRuDiuBFBpv1zJ2t3ewhghEAu/KP2MkbkBHvgvHWJQ45c5XH05RQ1SxMWmPY8pLZDtK8 rsajP1sqmW6lemxrGAkiGsEIQXRcb72zyoOcOUAJogKiZQ9OpiL1F4BP4koPhXD0wMFQ DiBe5aVTpkJca7ePP2R52qD71TRJWszeJFLuZuqD1gk1YsnKWNBuYgQAfoYERwaUP5hP cYlg== X-Gm-Message-State: ANoB5pnivAIC0toh7RLTQI6zu1XSi+FA/c2iOosLYW13jxtA5NVigKKj 2qGrRxGbd2lzw4lMqjXll4N6bg== X-Received: by 2002:a05:6512:3c99:b0:4b5:5f2e:3cc6 with SMTP id h25-20020a0565123c9900b004b55f2e3cc6mr4395279lfv.47.1670673427883; Sat, 10 Dec 2022 03:57:07 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id u20-20020a2eb814000000b002778d482800sm578343ljo.59.2022.12.10.03.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 03:57:07 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] arm64: dts: qcom: sc7180: move QUP and QSPI opp tables out of SoC node Date: Sat, 10 Dec 2022 12:57:01 +0100 Message-Id: <20221210115704.97614-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 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 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?1751828296619734575?= X-GMAIL-MSGID: =?utf-8?q?1751828296619734575?= The SoC node is a simple-bus and its schema expect to have nodes only with unit addresses: sc7180-trogdor-lazor-r3.dtb: soc@0: opp-table-qspi: {'compatible': ['operating-points-v2'], 'phandle': [[186]], 'opp-75000000': ... 'required-opps': [[47]]}} should not be valid under {'type': 'object'} Move to top-level OPP tables: - QUP which is shared between multiple nodes, - QSPI which cannot be placed in its node due to address/size cells. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 76 ++++++++++++++-------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index ea886cf08b4d..735581097295 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -538,6 +538,44 @@ cpu6_opp16: opp-2553600000 { }; }; + qspi_opp_table: opp-table-qspi { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-150000000 { + opp-hz = /bits/ 64 <150000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + + qup_opp_table: opp-table-qup { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-128000000 { + opp-hz = /bits/ 64 <128000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + memory@80000000 { device_type = "memory"; /* We expect the bootloader to fill in the size */ @@ -739,25 +777,6 @@ opp-384000000 { }; }; - qup_opp_table: opp-table-qup { - compatible = "operating-points-v2"; - - opp-75000000 { - opp-hz = /bits/ 64 <75000000>; - required-opps = <&rpmhpd_opp_low_svs>; - }; - - opp-100000000 { - opp-hz = /bits/ 64 <100000000>; - required-opps = <&rpmhpd_opp_svs>; - }; - - opp-128000000 { - opp-hz = /bits/ 64 <128000000>; - required-opps = <&rpmhpd_opp_nom>; - }; - }; - qupv3_id_0: geniqup@8c0000 { compatible = "qcom,geni-se-qup"; reg = <0 0x008c0000 0 0x6000>; @@ -2655,25 +2674,6 @@ opp-202000000 { }; }; - qspi_opp_table: opp-table-qspi { - compatible = "operating-points-v2"; - - opp-75000000 { - opp-hz = /bits/ 64 <75000000>; - required-opps = <&rpmhpd_opp_low_svs>; - }; - - opp-150000000 { - opp-hz = /bits/ 64 <150000000>; - required-opps = <&rpmhpd_opp_svs>; - }; - - opp-300000000 { - opp-hz = /bits/ 64 <300000000>; - required-opps = <&rpmhpd_opp_nom>; - }; - }; - qspi: spi@88dc000 { compatible = "qcom,sc7180-qspi", "qcom,qspi-v1"; reg = <0 0x088dc000 0 0x600>; From patchwork Sat Dec 10 11:57:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32018 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1273762wrr; Sat, 10 Dec 2022 04:03:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf7NG7zwj7caJO+5H6XqD1LsP/A0uhfN3RqWuHD9DnkmTNEq7RCLfNz/dl1g8K5QcRaJw3Qq X-Received: by 2002:a17:90a:b010:b0:220:987d:d28a with SMTP id x16-20020a17090ab01000b00220987dd28amr2926131pjq.47.1670673832863; Sat, 10 Dec 2022 04:03:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670673832; cv=none; d=google.com; s=arc-20160816; b=msQWBXjJnXQj897/QNbbH9xiLq5TkPFLf4IAviMhYJ73GJHa81izmkOxxYqPFKXbpo a8964HkXCSN5Rt1Ee6cx0NheIlMugxZZksq0/SmPYkukfSbIgT7UXHdX8YOrOFQkiIrQ XkYHGmLNx8hexNmuISTvwHTPouwrK4mIjMnyRc+5gzfMYNJiJ4kgjhBHwpr4PmOPLAF2 XcRWmxGMk9eDY8CioK6B1UwdvbyyvHyxCHLFKNY+Xh8cA8EPPetSUFmHDNqTX+QqFLwI 9GHWprjgIN6qZORwuKlSBu4T12I0M8FCm+/Jd4w7hKb+Y90HlMjhGA4PFLDEKoTumcSo fpmg== 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=sFb4si21ffSYYK/qJ1bR5Dkl24vvEDw+ifpOVVdfTyQ=; b=ytYOMNzA9Bv6Tq590rGwDrMAfd422yZ2k9920J9OfgNWaeP8Iub7eC+EuyZw+Ym2hn kgqXRb0ZbPVhOn0lxQjVHTTf+4Uz19oz4Bd2Z+9OTv+K0rh136Tjh7KaSs523/ZWbf2m Q2v6JKxMuigrf0ZJ+FVXg+7arUHtMhuXV6CieEnzo/tc69A8kffV2eVub+uTYVi462rn XjrIFhO2Vg98P6OS+fyHaMIMuZDLM2YD+wkmnzMUnX9/oquIrm4pMMslSQGolL7KqvCS t6LFa3SbfWoiTkzoczQgPNYHMI9iyN06sbvomkGMAKSltAcco2F24+f3FgAzUlHx6Deb qiTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TX2ru+NJ; 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 12-20020a17090a194c00b00214201e8996si4111054pjh.18.2022.12.10.04.03.26; Sat, 10 Dec 2022 04:03:52 -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=TX2ru+NJ; 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 S229830AbiLJL5Q (ORCPT + 99 others); Sat, 10 Dec 2022 06:57:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbiLJL5M (ORCPT ); Sat, 10 Dec 2022 06:57:12 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD58B19282 for ; Sat, 10 Dec 2022 03:57:10 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id c1so11056393lfi.7 for ; Sat, 10 Dec 2022 03:57:10 -0800 (PST) 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:subject:date :message-id:reply-to; bh=sFb4si21ffSYYK/qJ1bR5Dkl24vvEDw+ifpOVVdfTyQ=; b=TX2ru+NJpghvCb+IXtJGwGG6Nc5NTKU288N2csOarkbl0pD0ruQ39dpozQaV6ojKbr SoyBthYq4tlUZigKQY8rRfuFKivi8cUQLdiuPxBN/9NS8+I1xvsIDi/ysjQWu24Qg6jt y5DCZpiUnEvMWHP/Aa5n5lQZw5w4xLAhWDFJkSBb7QuDaMbhie1JgbD/bH/b9XKmvs4g mtA9ERZrFwca918p8OrpMOA40JANfa0Pty1MKJX0jrl0qG91AKpb6mo5u/p1ICxhLYFr ax7j8b5wmByy/bjjDwEci+OugXb1Au4z0Sq3ehF95prXOMQKN4ZIfTaRpk5Pj0QUOPf7 eBww== 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 :subject:date:message-id:reply-to; bh=sFb4si21ffSYYK/qJ1bR5Dkl24vvEDw+ifpOVVdfTyQ=; b=LD94BInODNT3PQOnAwbBI+S4+ZUlZWoj4O8Vrx/oEdzOOT9n9NFRr6IJi1UOtS0LAj eo0RYkg/3ts/QnhRcQk8WuLJ9hbV/1X1QHHanrEiyddFt5Bc0Vwe/o/KLTxvAZiwq00S qxTadfUk3vKMJ63v0GXZjWRc/IWiZn+pvnKH33yZAIUpt25JK/utGgyPNUrTRLT4E0ob CSmp0Dkl0/mI/8uGyPEgrDsnG+8GgkfDi9267rq5u2MtgapmLcMVFoFtTXJ/5Z6pZxgc iNR+UrnoCrRVtps98PeHM9lUxIaLUASgyPHK+uFT5N3xvVhOzQgbb4rf/IHQZEAr1yR+ ScMw== X-Gm-Message-State: ANoB5pktAkWWgTbkS30caunCTfEC4vKcoTc0j/v6DWrR0VKZXVRvSVU5 2QDPwAvWhF0akDis5/1lqENs4A== X-Received: by 2002:ac2:4c49:0:b0:4a9:f2e3:3cfa with SMTP id o9-20020ac24c49000000b004a9f2e33cfamr3304944lfk.32.1670673429236; Sat, 10 Dec 2022 03:57:09 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id u20-20020a2eb814000000b002778d482800sm578343ljo.59.2022.12.10.03.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 03:57:08 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] arm64: dts: qcom: sdm845: move DSI/QUP/QSPI opp tables out of SoC node Date: Sat, 10 Dec 2022 12:57:02 +0100 Message-Id: <20221210115704.97614-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221210115704.97614-1-krzysztof.kozlowski@linaro.org> References: <20221210115704.97614-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 autolearn=unavailable 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?1751828485048415274?= X-GMAIL-MSGID: =?utf-8?q?1751828485048415274?= The SoC node is a simple-bus and its schema expect to have nodes only with unit addresses: sdm850-lenovo-yoga-c630.dtb: soc@0: opp-table-qup: {'compatible': ['operating-points-v2'], 'phandle': [[60]], 'opp-50000000': ... 'required-opps': [[55]]}} should not be valid under {'type': 'object'} Move to top-level OPP tables: - DSI and QUP which are shared between multiple nodes, - QSPI which cannot be placed in its node due to address/size cells. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 154 +++++++++++++-------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index a63dbd12230f..573b2394e63f 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -696,6 +696,83 @@ cpu4_opp32: opp-2803200000 { }; }; + dsi_opp_table: opp-table-dsi { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-180000000 { + opp-hz = /bits/ 64 <180000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-275000000 { + opp-hz = /bits/ 64 <275000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-328580000 { + opp-hz = /bits/ 64 <328580000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-358000000 { + opp-hz = /bits/ 64 <358000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + + qspi_opp_table: opp-table-qspi { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-150000000 { + opp-hz = /bits/ 64 <150000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + + qup_opp_table: opp-table-qup { + compatible = "operating-points-v2"; + + opp-50000000 { + opp-hz = /bits/ 64 <50000000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-128000000 { + opp-hz = /bits/ 64 <128000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + pmu { compatible = "arm,armv8-pmuv3"; interrupts = ; @@ -1125,30 +1202,6 @@ rng: rng@793000 { clock-names = "core"; }; - qup_opp_table: opp-table-qup { - compatible = "operating-points-v2"; - - opp-50000000 { - opp-hz = /bits/ 64 <50000000>; - required-opps = <&rpmhpd_opp_min_svs>; - }; - - opp-75000000 { - opp-hz = /bits/ 64 <75000000>; - required-opps = <&rpmhpd_opp_low_svs>; - }; - - opp-100000000 { - opp-hz = /bits/ 64 <100000000>; - required-opps = <&rpmhpd_opp_svs>; - }; - - opp-128000000 { - opp-hz = /bits/ 64 <128000000>; - required-opps = <&rpmhpd_opp_nom>; - }; - }; - gpi_dma0: dma-controller@800000 { #dma-cells = <3>; compatible = "qcom,sdm845-gpi-dma"; @@ -3807,30 +3860,6 @@ opp-201500000 { }; }; - qspi_opp_table: opp-table-qspi { - compatible = "operating-points-v2"; - - opp-19200000 { - opp-hz = /bits/ 64 <19200000>; - required-opps = <&rpmhpd_opp_min_svs>; - }; - - opp-100000000 { - opp-hz = /bits/ 64 <100000000>; - required-opps = <&rpmhpd_opp_low_svs>; - }; - - opp-150000000 { - opp-hz = /bits/ 64 <150000000>; - required-opps = <&rpmhpd_opp_svs>; - }; - - opp-300000000 { - opp-hz = /bits/ 64 <300000000>; - required-opps = <&rpmhpd_opp_nom>; - }; - }; - qspi: spi@88df000 { compatible = "qcom,sdm845-qspi", "qcom,qspi-v1"; reg = <0 0x088df000 0 0x600>; @@ -4428,35 +4457,6 @@ clock_camcc: clock-controller@ad00000 { clock-names = "bi_tcxo"; }; - dsi_opp_table: opp-table-dsi { - compatible = "operating-points-v2"; - - opp-19200000 { - opp-hz = /bits/ 64 <19200000>; - required-opps = <&rpmhpd_opp_min_svs>; - }; - - opp-180000000 { - opp-hz = /bits/ 64 <180000000>; - required-opps = <&rpmhpd_opp_low_svs>; - }; - - opp-275000000 { - opp-hz = /bits/ 64 <275000000>; - required-opps = <&rpmhpd_opp_svs>; - }; - - opp-328580000 { - opp-hz = /bits/ 64 <328580000>; - required-opps = <&rpmhpd_opp_svs_l1>; - }; - - opp-358000000 { - opp-hz = /bits/ 64 <358000000>; - required-opps = <&rpmhpd_opp_nom>; - }; - }; - mdss: mdss@ae00000 { compatible = "qcom,sdm845-mdss"; reg = <0 0x0ae00000 0 0x1000>; From patchwork Sat Dec 10 11:57:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1273021wrr; Sat, 10 Dec 2022 04:02:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf4J/oWD7kUEGB5H8j8iZfPCPI9m1UCKEEhhxwOCGaw3Jq+eYZm+8n0cFvl6wOk9xIhznA37 X-Received: by 2002:a17:906:36d7:b0:7ae:607d:6005 with SMTP id b23-20020a17090636d700b007ae607d6005mr8676250ejc.42.1670673755944; Sat, 10 Dec 2022 04:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670673755; cv=none; d=google.com; s=arc-20160816; b=pe9XWYFSvHexblxAW9nREC+GDCUQ6CFAn0utd5RSEVDkPWH9on6/E2TlAe9X42qHzf hIxemMwI5lijcw+po23aTmJ1CEd4lguIBJ3nBqppdpAPSuS5/dngKrfkTvzGhy5JK5Ga R6w8zoCwOfS8/ndy+zweCX6Ei/ioMM8TgDP9xZqIp+NolqC8OgvKob3T8xVtSPuAW7vg LgLvOw4NqIpC718EJWbnOUEUFatiOvVleKaQPIRwHPjwtItvAymPbDl543O/JtfOugAF byMjPvR0WF7A952JKsTQAIO4+pkdWe7FXizmsxTTZdAsCYoHIxl72YfTGSR6SkE2ZcQv 5hqQ== 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=/8J7c5ip60j6K/JbDvYbnc+qe1oxX+R6vxNfFBKP6mI=; b=gFn6SiarDjphTunOXWCRJgVWz4IkNQTi96uELMtA/IHN9vT+RuHAXMK8vkQ+zu2NDt sXrxvNVby+tUbaF0goCbaSF8X0OSuAYLX//EycyAHRo+mLwWTerVV9IqSDiNme6MFHHe LkfooRSi4JgevlQTzJEvCrzB1AiX2CjzOOKdYUvjJmCWWyUB0PLrn+FSLY3Zn4mv6VU1 I6l1s5cEX8LEIdoqZn6iC6XMCjf4RbAn7GZ6gHT00W+cQaIXhQJ+jiQqMAhyxYNLSi5m mRRMOy3y6O6o4i58ikQpCBRaI22946vsxV69dL+/I5RquDyDhC/o7/2vDvGVizpsYqB9 Ga8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ILOeS5dw; 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 sb16-20020a1709076d9000b0078e27f2ef4bsi2518180ejc.956.2022.12.10.04.02.11; Sat, 10 Dec 2022 04:02:35 -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=ILOeS5dw; 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 S229851AbiLJL5U (ORCPT + 99 others); Sat, 10 Dec 2022 06:57:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229734AbiLJL5M (ORCPT ); Sat, 10 Dec 2022 06:57:12 -0500 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECF1210B45 for ; Sat, 10 Dec 2022 03:57:11 -0800 (PST) Received: by mail-lj1-x22c.google.com with SMTP id z4so7585915ljq.6 for ; Sat, 10 Dec 2022 03:57:11 -0800 (PST) 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:subject:date :message-id:reply-to; bh=/8J7c5ip60j6K/JbDvYbnc+qe1oxX+R6vxNfFBKP6mI=; b=ILOeS5dw91ME9cPOMXoepd4GIifn49WO18NnhwymKNNVGi4DrN6ELixXe0frM5T7wl YkVEHac/CAhvGQrcqRmybyb7sgT54ynatCT3I+n/pk4AJ1sCodr7XbXHlTMIqrowZwae hb3UaqYZbrmG96Kq4cqfA5h8Mkq7Hmzh44b9plu3Jho+O/vpL/PJdnnq+FS0hxr+1A61 zB2GHee7IW4QWY9QGIOV3vo7/hhye2q69WRTFgWEUnk1hFEeiWFVHcDj6Rr/9wQJMQ3O nB+PI+zl3e1Exjug1jKIVp755W0weAcuYt5YweoTYH7zCxNH64inQfPshuAVE+Qs61Mh enYw== 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 :subject:date:message-id:reply-to; bh=/8J7c5ip60j6K/JbDvYbnc+qe1oxX+R6vxNfFBKP6mI=; b=jqvlsoi+XF+g5s+FW0IJLq9RjNglmOLEZMO7O7bS7A8gthLIniRV1lrHeJVGoizrQo XzGkjTw7rkQH6PO1xq2pVpVrRVYJsTHCK5O80cg6UW92Ua/gol4w2+44flGcadTQURV+ q57P5TimKgLhfeQysaArUn8ROoGxQzVlc8woZbQPYbOq0g2oHoq5uk6tSIVBxf6InWAL wPH0syu6aGDkh3vEIV95H3EcM4L5KQgdsBOX7W84KlHa4ZUSxpkfYnkug1g9hJMjiFi7 tRKa9PPDtFUMbXkUHU9/WPqHkeTZtn0Ql+NAqDKNf3ReJagO3Sx0iCK6XnoBYY00r/lI LN/w== X-Gm-Message-State: ANoB5plgc2nJUUAjIkHgr5Fwodf0GnQWqJWnUN6p61NNDd7oe3aEYP8p xTkitaXneslB6mcFay3Cq1S/mw== X-Received: by 2002:a2e:8508:0:b0:279:f169:7a4f with SMTP id j8-20020a2e8508000000b00279f1697a4fmr2335629lji.47.1670673430379; Sat, 10 Dec 2022 03:57:10 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id u20-20020a2eb814000000b002778d482800sm578343ljo.59.2022.12.10.03.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 03:57:10 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] arm64: dts: qcom: sdm845: move sound node out of soc Date: Sat, 10 Dec 2022 12:57:03 +0100 Message-Id: <20221210115704.97614-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221210115704.97614-1-krzysztof.kozlowski@linaro.org> References: <20221210115704.97614-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 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?1751828404233783591?= X-GMAIL-MSGID: =?utf-8?q?1751828404233783591?= The sound node is not a property of a soc, but rather board as it describes the sound configuration. It also does not have unit address: sdm845-shift-axolotl.dtb: soc@0: sound: {} should not be valid under {'type': 'object'} Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 573b2394e63f..14a409f22bfd 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -3972,9 +3972,6 @@ lmh_cluster0: lmh@17d78800 { #interrupt-cells = <1>; }; - sound: sound { - }; - usb_1_hsphy: phy@88e2000 { compatible = "qcom,sdm845-qusb2-phy", "qcom,qusb2-v2-phy"; reg = <0 0x088e2000 0 0x400>; @@ -5349,6 +5346,9 @@ wifi: wifi@18800000 { }; }; + sound: sound { + }; + thermal-zones { cpu0-thermal { polling-delay-passive = <250>; From patchwork Sat Dec 10 11:57:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1273997wrr; Sat, 10 Dec 2022 04:04:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf7WLO/99o9hyhfKRVCOfu96fWoTDX1TW/fFwuLz+qWSZXZPRlJTgby1xS85KBIyuqMmg3C/ X-Received: by 2002:a17:907:2994:b0:7c0:e535:13fd with SMTP id eu20-20020a170907299400b007c0e53513fdmr6581027ejc.70.1670673856154; Sat, 10 Dec 2022 04:04:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670673856; cv=none; d=google.com; s=arc-20160816; b=LbwFcWeNUu2FC0GPKlIXsJK+1CPoeTsHVCm0WnEus5qRlHGVN/EtSwyqpC88yb82my ONFEOJokZi0ptf+i4UCUj7LpKRHG3cxG3gFTsR938WQRV6eCDQhvGGVdcC2TThpJ/v0I vaQ/uVHmsDlpl6/wup712gWPlCXWNFlqPIb2OWuskGj6Ws1+SdO+9nZyTJxXgJkQGj+s EA25SHiWGnnnhqcGvJ1TDc+J5tAWRfuLD65SNNNeFgy3XFU3jb/tbRNFMkRQT0yfE1VP mVcAWCiVmwZMq0n5TYherrGanyZZqFvsx12bppx7EVGwop1kg+xfz3v0dOypQe+3HQ/u fL/Q== 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=2aKGT7tvm+U766DlUeQvJkK/b6wDdJYC7cAMniFsjLY=; b=pcOlPIGF3xlh1+4dwIG0LKm9z23vUs3w7S0aJKaz/tvX2rF33mPWGBcCVeYr6scU3u EU3ZFW1V/uGLifS+oRcdUwTFUnIIQSdwDikuA/boMtHTWN3bDmfYs4lMUO2WzfjVq5IK t8N6i5/n7zatylRTuIiEtpOp8KlImotqWhURLsKkxYIv0cSsS4qya2dZVnV1dtCRhk7A kh0oQ816gyO55ZgQx5YSBMjNoLlcA7nz6A5+fD9Yk3y2TzKbhfAsTC5xeZQIx513A3V/ YsdIYXovDo4aTb+KvO/IaojU81pzfXgWc25e48S8LwX27dwT30hwkEVoruRJD0KReT8L GHGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sGcZyKf2; 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 e9-20020a170906080900b0078db6f56d51si1654018ejd.808.2022.12.10.04.03.50; Sat, 10 Dec 2022 04:04:16 -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=sGcZyKf2; 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 S229853AbiLJL5X (ORCPT + 99 others); Sat, 10 Dec 2022 06:57:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbiLJL5Q (ORCPT ); Sat, 10 Dec 2022 06:57:16 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACC15192B8 for ; Sat, 10 Dec 2022 03:57:13 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id y25so11035933lfa.9 for ; Sat, 10 Dec 2022 03:57:13 -0800 (PST) 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:subject:date :message-id:reply-to; bh=2aKGT7tvm+U766DlUeQvJkK/b6wDdJYC7cAMniFsjLY=; b=sGcZyKf2v871JJabnGjzz5G2LGfTbsnyH9ThYrjJOSD0YFCF1BKxYVVZaDtA0JkO9Z RHvziHlT2PJlKCnTZxk+NIAmn+XDfnM+9NYfMnCX2MnGkioCQwLrifkbsWhaHI2k6RRO qHUj6ZmvYW+4oAdi4sSdor0PBEi2NI7zQohHcr8n2q+lCjZk3FmbqGiNIugcMff2Fu5v HYniOkmyBWtltL2jHYFksYyqNFHNC9nXDElwEhdCGftFTyh5pyqxorYYxGrbAUykuovK 5Pl6zS96n1a1nJwv5qU6nqpS5u5Li5eC0rZEy4xP2lPftl3WAa21d9r1soxp1tymLCl6 Ufgg== 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 :subject:date:message-id:reply-to; bh=2aKGT7tvm+U766DlUeQvJkK/b6wDdJYC7cAMniFsjLY=; b=daiAzEKVQ8uoQJfR3Mb+1A5hQa8Y0eUIP9CxNZgf31oJo+YI1zydOHKGY0fK3wd8Ct xy0+fRI2jGx7EdEMPE3VCQiClUK+tI0y46H+7lIn+t7+J0+XbSIhRbSVVIeXjxsQM9vp IIkY/a1Ykpioc50r4GlZ/UQ1wz1f1WUffvU/M2fu9tjQCDJ8cSg3d+0/0Y+tHKkXI5t9 vD+VU7Vj+LNNDq8x3kmJLJA+tXwpg4fJUgDW4GtYVSkgLamp+dq85V0lQFcoz5xbzynv 8r8exmttn/tv31MC2yrTxMbyCL8CLKpvC3YPy/hvAYrO61bZA/gVecoGRU8k1qd9FtL5 +4DQ== X-Gm-Message-State: ANoB5pkU2rkO2Vh31wVg1ztNWFZK1+lp2SpKobLBhIcBO/zunMXdZ7Xp +3ocY+LwIkTKYS9bZ2Y7EP2L8Q== X-Received: by 2002:ac2:4305:0:b0:4b0:25f9:14ea with SMTP id l5-20020ac24305000000b004b025f914eamr1985735lfh.21.1670673431731; Sat, 10 Dec 2022 03:57:11 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id u20-20020a2eb814000000b002778d482800sm578343ljo.59.2022.12.10.03.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 03:57:11 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] arm64: dts: qcom: sm8250: move sound and codec nodes out of soc Date: Sat, 10 Dec 2022 12:57:04 +0100 Message-Id: <20221210115704.97614-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221210115704.97614-1-krzysztof.kozlowski@linaro.org> References: <20221210115704.97614-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 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?1751828509277929022?= X-GMAIL-MSGID: =?utf-8?q?1751828509277929022?= The sound and codec nodes are not a property of a soc, but rather board as it describes the sound configuration. It also does not have unit address: sm8250-hdk.dtb: soc@0: sound: {} should not be valid under {'type': 'object'} Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 ++++++++++++------------- arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 ++-- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts index 3ed8c84e25b8..b741b7da1afc 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts @@ -27,6 +27,25 @@ chosen { stdout-path = "serial0:115200n8"; }; + wcd938x: codec { + compatible = "qcom,wcd9380-codec"; + #sound-dai-cells = <1>; + reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; + vdd-buck-supply = <&vreg_s4a_1p8>; + vdd-rxtx-supply = <&vreg_s4a_1p8>; + vdd-io-supply = <&vreg_s4a_1p8>; + vdd-mic-bias-supply = <&vreg_bob>; + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + }; + thermal-zones { camera-thermal { polling-delay-passive = <0>; @@ -631,27 +650,6 @@ &slpi { firmware-name = "qcom/sm8250/slpi.mbn"; }; -&soc { - wcd938x: codec { - compatible = "qcom,wcd9380-codec"; - #sound-dai-cells = <1>; - reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>; - vdd-buck-supply = <&vreg_s4a_1p8>; - vdd-rxtx-supply = <&vreg_s4a_1p8>; - vdd-io-supply = <&vreg_s4a_1p8>; - vdd-mic-bias-supply = <&vreg_bob>; - qcom,micbias1-microvolt = <1800000>; - qcom,micbias2-microvolt = <1800000>; - qcom,micbias3-microvolt = <1800000>; - qcom,micbias4-microvolt = <1800000>; - qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; - qcom,mbhc-headset-vthreshold-microvolt = <1700000>; - qcom,mbhc-headphone-vthreshold-microvolt = <50000>; - qcom,rx-device = <&wcd_rx>; - qcom,tx-device = <&wcd_tx>; - }; -}; - &sound { compatible = "qcom,sm8250-sndcard"; model = "SM8250-MTP-WCD9380-WSA8810-VA-DMIC"; diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index d517d6a80bdc..fbbbae29e0c2 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2826,9 +2826,6 @@ compute-cb@8 { }; }; - sound: sound { - }; - usb_1_hsphy: phy@88e3000 { compatible = "qcom,sm8250-usb-hs-phy", "qcom,usb-snps-hs-7nm-phy"; @@ -4910,6 +4907,9 @@ cpufreq_hw: cpufreq@18591000 { }; }; + sound: sound { + }; + timer { compatible = "arm,armv8-timer"; interrupts =