From patchwork Mon Dec 12 10:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2149354wrr; Mon, 12 Dec 2022 02:03:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6fbPiW5CQ2Tqv4t9BCEpxmaI6BWKDNXPM1ImkGW8uYdyP94uzZuvPaYM9VKsm4WSx8hGQ5 X-Received: by 2002:a17:902:e38d:b0:189:6b31:dc4f with SMTP id g13-20020a170902e38d00b001896b31dc4fmr14291461ple.14.1670839401002; Mon, 12 Dec 2022 02:03:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670839400; cv=none; d=google.com; s=arc-20160816; b=ma9riSmplKL537rBuFF/RXK9xULFfW0iToltfHaX4HFknhUze0oyrK5ph19VfYZ5z1 00BI1D2rZtCsGhQUY7tyCNlGHGhUcfjPXp37ozuIK/cge/tbQnJGgXssdHI2JaOG7DaV O/K6jgFZ1Pk53kGVtTJZZArSLxsmF1zulLB1X4sNOva/SZbXIobePHZQgm7o7PKETxNC 1n1ncbvt6+aqDDtX8fFGG1zuv1oxkTILvb51+GSzA1n5LV6l0c1aONAA7dNw67O+Vwrb 8oEeYVrwxrqg+nBIN+jMTIbJwHvSLX9OeBNd+HMSAMOHUQUTI1ov+OPhGxt9yoZBy+2L K+Vw== 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=3vEjbU4OBSDOtUCM9Wt4KBN/qFz8DdboyKF7lJ0Y5bA=; b=GBoDI/0k7PF34RMVbm8Bf0MFbyab62hQB5jiQt+Dp5QeBHaM5eOx2q0+18JCpyyEy6 SrPE71eFakFB/Qjm0czl+nLm15mwdPyG/C1BwSNdlQ28z7NB0X6NaRk8O4tG1HN6unxF BSY3Ey8Zvfelf6pjVaCaWyY9ujYo9KUThGw+8tonD3dLOGDBI2fwEjHBiJqB/o6dtB9W EAXLCsMlIb8aekz8QR4urDEQ+jvyeAsrZ1YVIPqBtqcDobMxpI53RAJjqVmGZsAnMAN1 KeaZFRAJgl6zNy7p20MNFo0V0BvRZqfJY9UyfG1QSWcMgVz/yJPlztttp33rrOfRmm7E fFZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AQZfai+w; 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 b7-20020a170903228700b0018863e1bc39si9796335plh.248.2022.12.12.02.03.08; Mon, 12 Dec 2022 02:03:20 -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=AQZfai+w; 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 S231985AbiLLKDB (ORCPT + 99 others); Mon, 12 Dec 2022 05:03:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231998AbiLLKCs (ORCPT ); Mon, 12 Dec 2022 05:02:48 -0500 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D70C42DC for ; Mon, 12 Dec 2022 02:02:45 -0800 (PST) Received: by mail-lj1-x235.google.com with SMTP id n1so11952533ljg.3 for ; Mon, 12 Dec 2022 02:02:45 -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=3vEjbU4OBSDOtUCM9Wt4KBN/qFz8DdboyKF7lJ0Y5bA=; b=AQZfai+wn5sBVMoXTo5P2/oNGdHPFWIDDOxs/DDGifb5xh4E6qFlNGvvpdTXeNbcro ohnAKOwNnLBSpbUyVnKdLXNwsntNWt35/sNpM8ytt8JscxeWZ4Br4p2A/9uYLihyl/FU h5qWA0YpM9HrFCFstOz/8lB+mMhUiKp63NKLVaRCbBpgrHG7J7Mvl8hjs5xMtrsY70KP /gjTrW3rGZvZSgOvvuiZ7aVwVTVhDKwYOcy2m2e5lwfU9hG8c+qbvyQRmuIfpZ9CzfJi eIzzyjfsmlMCNyGK+dR2wJ2WvLdNczeZDXtVJUod3PBeOpX5Ynv4n0AI7fuITFRLHwZo DtRQ== 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=3vEjbU4OBSDOtUCM9Wt4KBN/qFz8DdboyKF7lJ0Y5bA=; b=vuQgaEtgUoUwaTjjfcCj4JeIuZB0NOJn/aoFsHfn1++3RPLRWey3D9uMukTslcq7Kt 6XkpiPPyww89J7Ard9S327L2iRpSTqPEV9R8XAeoTm8oSmWIbseWvmJs5LAAXvHqVccv uO7knKsYO1FsgjO2Uh1dX5AKxNpLCF8QiHb5qf5cbvv7sV1Tp934kPX350efLZTgQXrN 1iS2/v33pfhRqtv/kV76nc1aAe8lpcp7UJlKit3ihWZPy41HTQ5Mbi3Yt7LmFTG7Gp2E PPTycp9vbxB9j8lB7CZoXYnPBq1vq8CoFOynpVLzeRu0kNb2jZy7kZPGvAb/QXJuX+mE UPDQ== X-Gm-Message-State: ANoB5pnvVwUi5u7oVz3j8K1QXm6zSdUs/OG2ANpeOfC1ckXW4C6amNsT ew1l6TN7p3JpZKdMwCPcBzBtdQ== X-Received: by 2002:a2e:a58e:0:b0:279:8e95:a3d with SMTP id m14-20020a2ea58e000000b002798e950a3dmr5093821ljp.13.1670839364154; Mon, 12 Dec 2022 02:02:44 -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 i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:43 -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 v2 1/6] arm64: dts: qcom: sc7180: order top-level nodes alphabetically Date: Mon, 12 Dec 2022 11:02:27 +0100 Message-Id: <20221212100232.138519-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=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?1752002096214401835?= X-GMAIL-MSGID: =?utf-8?q?1752002096214401835?= Order top-level nodes like memory, reserved-memory, opp-table-cpu alphabetically for easier code maintenance. No functional change (same dtx_diff). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. New patch --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 144 +++++++++++++-------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index ea886cf08b4d..6d3e86ce2936 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -27,8 +27,6 @@ / { #address-cells = <2>; #size-cells = <2>; - chosen { }; - aliases { mmc1 = &sdhc_1; mmc2 = &sdhc_2; @@ -54,6 +52,8 @@ aliases { spi11 = &spi11; }; + chosen { }; + clocks { xo_board: xo-board { compatible = "fixed-clock"; @@ -68,62 +68,6 @@ sleep_clk: sleep-clk { }; }; - reserved_memory: reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - hyp_mem: memory@80000000 { - reg = <0x0 0x80000000 0x0 0x600000>; - no-map; - }; - - xbl_mem: memory@80600000 { - reg = <0x0 0x80600000 0x0 0x200000>; - no-map; - }; - - aop_mem: memory@80800000 { - reg = <0x0 0x80800000 0x0 0x20000>; - no-map; - }; - - aop_cmd_db_mem: memory@80820000 { - reg = <0x0 0x80820000 0x0 0x20000>; - compatible = "qcom,cmd-db"; - no-map; - }; - - sec_apps_mem: memory@808ff000 { - reg = <0x0 0x808ff000 0x0 0x1000>; - no-map; - }; - - smem_mem: memory@80900000 { - reg = <0x0 0x80900000 0x0 0x200000>; - no-map; - }; - - tz_mem: memory@80b00000 { - reg = <0x0 0x80b00000 0x0 0x3900000>; - no-map; - }; - - ipa_fw_mem: memory@8b700000 { - reg = <0 0x8b700000 0 0x10000>; - no-map; - }; - - rmtfs_mem: memory@94600000 { - compatible = "qcom,rmtfs-mem"; - reg = <0x0 0x94600000 0x0 0x200000>; - no-map; - - qcom,client-id = <1>; - qcom,vmid = <15>; - }; - }; - cpus { #address-cells = <2>; #size-cells = <0>; @@ -398,6 +342,18 @@ CLUSTER_SLEEP_0: cluster-sleep-0 { }; }; + firmware { + scm { + compatible = "qcom,scm-sc7180", "qcom,scm"; + }; + }; + + memory@80000000 { + device_type = "memory"; + /* We expect the bootloader to fill in the size */ + reg = <0 0x80000000 0 0>; + }; + cpu0_opp_table: opp-table-cpu0 { compatible = "operating-points-v2"; opp-shared; @@ -538,20 +494,69 @@ cpu6_opp16: opp-2553600000 { }; }; - memory@80000000 { - device_type = "memory"; - /* We expect the bootloader to fill in the size */ - reg = <0 0x80000000 0 0>; - }; - pmu { compatible = "arm,armv8-pmuv3"; interrupts = ; }; - firmware { - scm { - compatible = "qcom,scm-sc7180", "qcom,scm"; + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + + reserved_memory: reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + hyp_mem: memory@80000000 { + reg = <0x0 0x80000000 0x0 0x600000>; + no-map; + }; + + xbl_mem: memory@80600000 { + reg = <0x0 0x80600000 0x0 0x200000>; + no-map; + }; + + aop_mem: memory@80800000 { + reg = <0x0 0x80800000 0x0 0x20000>; + no-map; + }; + + aop_cmd_db_mem: memory@80820000 { + reg = <0x0 0x80820000 0x0 0x20000>; + compatible = "qcom,cmd-db"; + no-map; + }; + + sec_apps_mem: memory@808ff000 { + reg = <0x0 0x808ff000 0x0 0x1000>; + no-map; + }; + + smem_mem: memory@80900000 { + reg = <0x0 0x80900000 0x0 0x200000>; + no-map; + }; + + tz_mem: memory@80b00000 { + reg = <0x0 0x80b00000 0x0 0x3900000>; + no-map; + }; + + ipa_fw_mem: memory@8b700000 { + reg = <0 0x8b700000 0 0x10000>; + no-map; + }; + + rmtfs_mem: memory@94600000 { + compatible = "qcom,rmtfs-mem"; + reg = <0x0 0x94600000 0x0 0x200000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; }; }; @@ -640,11 +645,6 @@ ipa_smp2p_in: ipa-modem-to-ap { }; }; - psci { - compatible = "arm,psci-1.0"; - method = "smc"; - }; - soc: soc@0 { #address-cells = <2>; #size-cells = <2>; From patchwork Mon Dec 12 10:02:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2149446wrr; Mon, 12 Dec 2022 02:03:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5c2iQr+VhzNeL0savWTdI8NSYlVesw5sBoS9VPlf8aIfqaW8ts2xLI+ZtFGJ5bA7we+w/x X-Received: by 2002:a05:6a00:1988:b0:577:49da:6074 with SMTP id d8-20020a056a00198800b0057749da6074mr20088884pfl.19.1670839413456; Mon, 12 Dec 2022 02:03:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670839413; cv=none; d=google.com; s=arc-20160816; b=QTlroWwTkgn6TiLaBxoP5obc4TaK+YkiMg29LHC/OMBUtAKaHcZKnMsSuSXqVaOcjL 81sb8VVXbqszkAPc0G4sbOa3vBanjWK4f290y1CNePT5Yvw6S5mqqaPbLB7wA/c1uC1X QE4BxIrROTgl+z+SpCF6vYOq2PeE9idUJDll0M5w2npPEUB7x2dUZUAv78WCLz6dGNN9 p/KAmJBZM7JgXWoTxPsfb6q8EmhKnZh1QYhZDeMSn0P53rYOw2uAYyJbX4+7yf477w1L dfyJZFcXnA2h9FcJjAVYnwOE7sN0goe90Igu784zAN/EO6MyuxWxf0Y5xwlUHFd4tpXs L9lA== 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=PVQ6v7A609DhVKEKlf0Q+UIpn+1EhJyHwokdFRJhhyQ=; b=0yu1GLRBLGTc47K8xiMm9PXNOxTgZCqfpFiGCL0OG/Fw0/PIcfwKqqGoYu5NfoVvZO DNwwPlHLsTD1r2N77eqcjG7U/p/EtdqzF1BlOgc/AZ6y4WbtwLNHScqYsK39gTj2r67t 7mMZQtVmYlyXl8Gjo0IVqIU9Wpc0fj5OjIpNYnFhaz37jIV/zUSKeubE4nQxAmWZ7X/F 1+mB2Si64K4VL05qopo4xDbA4JO9tcV1aI/UIpj4mAhcCtAH4Ur5PPwLViTzi1elkH3V 3isrsmXb7mIvAiclfPrrWGQ0A/9rArc/AVMId+tL8KySkiltkmuXtb24ukwOVOjl/lxJ 9tkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VY5POQ+O; 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 t14-20020a056a00138e00b00575d6a4ba9bsi9784345pfg.307.2022.12.12.02.03.19; Mon, 12 Dec 2022 02:03:33 -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=VY5POQ+O; 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 S231980AbiLLKDD (ORCPT + 99 others); Mon, 12 Dec 2022 05:03:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231987AbiLLKCt (ORCPT ); Mon, 12 Dec 2022 05:02:49 -0500 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 133055F4B for ; Mon, 12 Dec 2022 02:02:48 -0800 (PST) Received: by mail-lf1-x12a.google.com with SMTP id p36so17650934lfa.12 for ; Mon, 12 Dec 2022 02:02:47 -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=PVQ6v7A609DhVKEKlf0Q+UIpn+1EhJyHwokdFRJhhyQ=; b=VY5POQ+OBBRnOXvTmWokGv/+Ebor0cPyqlibGkVFzRS/Dub01CwClEkTveydQzrY1c VeTj+1P8LiwIV5ZaWWfc5ObdqIn3anUjaIEY3uXcY41BG/KzH06dnpVgKPrj5UtA+elR BVuw/4BeL2oWemFAdnvwj/N+h73jCtjC/g16xbtml7M6XM1RsdL9XVCLUF9+vxFmRfuG t3t2TPLi3CuwFBJqv7qSSisURZ13c7AJ6dhkZYGfviU/GYdjUcJGTmNWNZeA+sesPqLv RQ5Twg7hcl/aVxm+B4iJYG22VdgRmyj4aceiHtWlbTsXczcE+fNMbaiSSyWokdvrP62x /1pw== 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=PVQ6v7A609DhVKEKlf0Q+UIpn+1EhJyHwokdFRJhhyQ=; b=3hJjAQ2Zf9sClHnrHmgY1evHOLQ+f5UqlTyKjI2pq5CBPV1NrVthSO+RohKJ0i3fIo 8o+Vb3wAhUCfcX1NeSsutZPa6ZDsmOlcCRNyKdwdyYRyyb9LtfMZPN5AOINzhKW1wIZo M3Vzmu0FkCkUWgAeI8fgdNoHtnoMGD3i1fwLGJRTJJxu+H69OSCyEDGAX0Qzo2qFD9ks xPTWVT4dnoc1KW/F6LFQsxTxPd+Sbyqb3dcJ71hsSBl3mfQ59Of4o6Pa6ql3QWrMybD3 visM9sGurqrc0BwGvSZ1aSY+LrWuC9c78/Cd2SE+msywg1RhuYk+ge0jlsparwtZMEON s2qw== X-Gm-Message-State: ANoB5pkx2Hj+C3+YK0mUP6p/UUL2B8R12JUlJc9uKCQfH4Oh62Tmq9G0 WNnEqexKyulRWN0oByf53E2wWQ== X-Received: by 2002:ac2:4c24:0:b0:4b4:900c:3a28 with SMTP id u4-20020ac24c24000000b004b4900c3a28mr3723025lfq.60.1670839366239; Mon, 12 Dec 2022 02:02:46 -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 i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:45 -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 v2 2/6] arm64: dts: qcom: sdm845: order top-level nodes alphabetically Date: Mon, 12 Dec 2022 11:02:28 +0100 Message-Id: <20221212100232.138519-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212100232.138519-1-krzysztof.kozlowski@linaro.org> References: <20221212100232.138519-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?1752002108777322631?= X-GMAIL-MSGID: =?utf-8?q?1752002108777322631?= Order top-level nodes like memory, reserved-memory, opp-table-cpu alphabetically for easier code maintenance. No functional change (same dtx_diff, except phandle changes). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. New patch --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 384 +++++++++++++-------------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index a63dbd12230f..88e7d4061aae 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -69,122 +69,18 @@ aliases { chosen { }; - memory@80000000 { - device_type = "memory"; - /* We expect the bootloader to fill in the size */ - reg = <0 0x80000000 0 0>; - }; - - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - hyp_mem: hyp-mem@85700000 { - reg = <0 0x85700000 0 0x600000>; - no-map; - }; - - xbl_mem: xbl-mem@85e00000 { - reg = <0 0x85e00000 0 0x100000>; - no-map; - }; - - aop_mem: aop-mem@85fc0000 { - reg = <0 0x85fc0000 0 0x20000>; - no-map; - }; - - aop_cmd_db_mem: aop-cmd-db-mem@85fe0000 { - compatible = "qcom,cmd-db"; - reg = <0x0 0x85fe0000 0 0x20000>; - no-map; - }; - - smem@86000000 { - compatible = "qcom,smem"; - reg = <0x0 0x86000000 0 0x200000>; - no-map; - hwlocks = <&tcsr_mutex 3>; - }; - - tz_mem: tz@86200000 { - reg = <0 0x86200000 0 0x2d00000>; - no-map; - }; - - rmtfs_mem: rmtfs@88f00000 { - compatible = "qcom,rmtfs-mem"; - reg = <0 0x88f00000 0 0x200000>; - no-map; - - qcom,client-id = <1>; - qcom,vmid = <15>; - }; - - qseecom_mem: qseecom@8ab00000 { - reg = <0 0x8ab00000 0 0x1400000>; - no-map; - }; - - camera_mem: camera-mem@8bf00000 { - reg = <0 0x8bf00000 0 0x500000>; - no-map; - }; - - ipa_fw_mem: ipa-fw@8c400000 { - reg = <0 0x8c400000 0 0x10000>; - no-map; - }; - - ipa_gsi_mem: ipa-gsi@8c410000 { - reg = <0 0x8c410000 0 0x5000>; - no-map; - }; - - gpu_mem: gpu@8c415000 { - reg = <0 0x8c415000 0 0x2000>; - no-map; - }; - - adsp_mem: adsp@8c500000 { - reg = <0 0x8c500000 0 0x1a00000>; - no-map; - }; - - wlan_msa_mem: wlan-msa@8df00000 { - reg = <0 0x8df00000 0 0x100000>; - no-map; - }; - - mpss_region: mpss@8e000000 { - reg = <0 0x8e000000 0 0x7800000>; - no-map; - }; - - venus_mem: venus@95800000 { - reg = <0 0x95800000 0 0x500000>; - no-map; - }; - - cdsp_mem: cdsp@95d00000 { - reg = <0 0x95d00000 0 0x800000>; - no-map; - }; - - mba_region: mba@96500000 { - reg = <0 0x96500000 0 0x200000>; - no-map; - }; - - slpi_mem: slpi@96700000 { - reg = <0 0x96700000 0 0x1400000>; - no-map; + clocks { + xo_board: xo-board { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <38400000>; + clock-output-names = "xo_board"; }; - spss_mem: spss@97b00000 { - reg = <0 0x97b00000 0 0x100000>; - no-map; + sleep_clk: sleep-clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32764>; }; }; @@ -436,6 +332,18 @@ CLUSTER_SLEEP_0: cluster-sleep-0 { }; }; + firmware { + scm { + compatible = "qcom,scm-sdm845", "qcom,scm"; + }; + }; + + memory@80000000 { + device_type = "memory"; + /* We expect the bootloader to fill in the size */ + reg = <0 0x80000000 0 0>; + }; + cpu0_opp_table: opp-table-cpu0 { compatible = "operating-points-v2"; opp-shared; @@ -701,32 +609,174 @@ pmu { interrupts = ; }; - timer { - compatible = "arm,armv8-timer"; - interrupts = , - , - , - ; - }; + psci: psci { + compatible = "arm,psci-1.0"; + method = "smc"; - clocks { - xo_board: xo-board { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <38400000>; - clock-output-names = "xo_board"; + CPU_PD0: power-domain-cpu0 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&LITTLE_CPU_SLEEP_0>; }; - sleep_clk: sleep-clk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32764>; + CPU_PD1: power-domain-cpu1 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&LITTLE_CPU_SLEEP_0>; + }; + + CPU_PD2: power-domain-cpu2 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&LITTLE_CPU_SLEEP_0>; + }; + + CPU_PD3: power-domain-cpu3 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&LITTLE_CPU_SLEEP_0>; + }; + + CPU_PD4: power-domain-cpu4 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&BIG_CPU_SLEEP_0>; + }; + + CPU_PD5: power-domain-cpu5 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&BIG_CPU_SLEEP_0>; + }; + + CPU_PD6: power-domain-cpu6 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&BIG_CPU_SLEEP_0>; + }; + + CPU_PD7: power-domain-cpu7 { + #power-domain-cells = <0>; + power-domains = <&CLUSTER_PD>; + domain-idle-states = <&BIG_CPU_SLEEP_0>; + }; + + CLUSTER_PD: power-domain-cluster { + #power-domain-cells = <0>; + domain-idle-states = <&CLUSTER_SLEEP_0>; }; }; - firmware { - scm { - compatible = "qcom,scm-sdm845", "qcom,scm"; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + hyp_mem: hyp-mem@85700000 { + reg = <0 0x85700000 0 0x600000>; + no-map; + }; + + xbl_mem: xbl-mem@85e00000 { + reg = <0 0x85e00000 0 0x100000>; + no-map; + }; + + aop_mem: aop-mem@85fc0000 { + reg = <0 0x85fc0000 0 0x20000>; + no-map; + }; + + aop_cmd_db_mem: aop-cmd-db-mem@85fe0000 { + compatible = "qcom,cmd-db"; + reg = <0x0 0x85fe0000 0 0x20000>; + no-map; + }; + + smem@86000000 { + compatible = "qcom,smem"; + reg = <0x0 0x86000000 0 0x200000>; + no-map; + hwlocks = <&tcsr_mutex 3>; + }; + + tz_mem: tz@86200000 { + reg = <0 0x86200000 0 0x2d00000>; + no-map; + }; + + rmtfs_mem: rmtfs@88f00000 { + compatible = "qcom,rmtfs-mem"; + reg = <0 0x88f00000 0 0x200000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; + }; + + qseecom_mem: qseecom@8ab00000 { + reg = <0 0x8ab00000 0 0x1400000>; + no-map; + }; + + camera_mem: camera-mem@8bf00000 { + reg = <0 0x8bf00000 0 0x500000>; + no-map; + }; + + ipa_fw_mem: ipa-fw@8c400000 { + reg = <0 0x8c400000 0 0x10000>; + no-map; + }; + + ipa_gsi_mem: ipa-gsi@8c410000 { + reg = <0 0x8c410000 0 0x5000>; + no-map; + }; + + gpu_mem: gpu@8c415000 { + reg = <0 0x8c415000 0 0x2000>; + no-map; + }; + + adsp_mem: adsp@8c500000 { + reg = <0 0x8c500000 0 0x1a00000>; + no-map; + }; + + wlan_msa_mem: wlan-msa@8df00000 { + reg = <0 0x8df00000 0 0x100000>; + no-map; + }; + + mpss_region: mpss@8e000000 { + reg = <0 0x8e000000 0 0x7800000>; + no-map; + }; + + venus_mem: venus@95800000 { + reg = <0 0x95800000 0 0x500000>; + no-map; + }; + + cdsp_mem: cdsp@95d00000 { + reg = <0 0x95d00000 0 0x800000>; + no-map; + }; + + mba_region: mba@96500000 { + reg = <0 0x96500000 0 0x200000>; + no-map; + }; + + slpi_mem: slpi@96700000 { + reg = <0 0x96700000 0 0x1400000>; + no-map; + }; + + spss_mem: spss@97b00000 { + reg = <0 0x97b00000 0 0x100000>; + no-map; }; }; @@ -1018,64 +1068,6 @@ slpi_smp2p_in: slave-kernel { }; }; - psci: psci { - compatible = "arm,psci-1.0"; - method = "smc"; - - CPU_PD0: power-domain-cpu0 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&LITTLE_CPU_SLEEP_0>; - }; - - CPU_PD1: power-domain-cpu1 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&LITTLE_CPU_SLEEP_0>; - }; - - CPU_PD2: power-domain-cpu2 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&LITTLE_CPU_SLEEP_0>; - }; - - CPU_PD3: power-domain-cpu3 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&LITTLE_CPU_SLEEP_0>; - }; - - CPU_PD4: power-domain-cpu4 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&BIG_CPU_SLEEP_0>; - }; - - CPU_PD5: power-domain-cpu5 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&BIG_CPU_SLEEP_0>; - }; - - CPU_PD6: power-domain-cpu6 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&BIG_CPU_SLEEP_0>; - }; - - CPU_PD7: power-domain-cpu7 { - #power-domain-cells = <0>; - power-domains = <&CLUSTER_PD>; - domain-idle-states = <&BIG_CPU_SLEEP_0>; - }; - - CLUSTER_PD: power-domain-cluster { - #power-domain-cells = <0>; - domain-idle-states = <&CLUSTER_SLEEP_0>; - }; - }; - soc: soc@0 { #address-cells = <2>; #size-cells = <2>; @@ -5771,4 +5763,12 @@ modem_alert0: trip-point0 { }; }; }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = , + , + , + ; + }; }; From patchwork Mon Dec 12 10:02:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2149483wrr; Mon, 12 Dec 2022 02:03:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4KVNEpumcNn+87sSsMZIer3AIHNivEQBx+Tvemr+8+VDDckgfoUl6f7GgFqfkCQs5KVHbm X-Received: by 2002:a17:902:8548:b0:18c:fd25:a934 with SMTP id d8-20020a170902854800b0018cfd25a934mr11578983plo.61.1670839420531; Mon, 12 Dec 2022 02:03:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670839420; cv=none; d=google.com; s=arc-20160816; b=eBlyAYx/8BWHAPfR4rw3GHLLGfcn/0xAqPVWD0xlktG6EkD6HyjUIJ2xwzYUOjeywk jXRyT62Pf0dU8V40CVH3QhXWWJI4SC1mCcU3oQTHLaNR+HYSfOUdXuaqWSjgk4CfmJZD C6gHYhV8xkzGbdK//FEns2FJx3pfSOn6wUd7HRfojpl5OloiszRGp1u9teFqxF13TW5u AQHXdavw65iWZEwugbMzZxVA7im7NZmo6/mgd558axQ1VQda3+Mut7lsdYRf2C0D/ALx yN8EuU6W1uOfnBjtkAVKHizRLkiMEYwNkqGvdhl6KVZq55k6McgOUHUu3Jy/woj+qEbf aPsA== 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=jNmkawudC9o2i2lApH4ifxK0mB62T36PSTxPxQ/BsK4=; b=Lpt8OSHG8w/ZU8ADQV1za0BtU/qFAiIlX752j6PDz7aXn5s1CkzuD1G2IllCp4UBJr hCHfQHHt/aG8LkXRJT5LILQXgeELjRor2a1eYo4j5c6yPQcfJCBsI0KdsbgvJZAMYMB8 1yxinINumPo75pX2XVGkWywQrfCL1BTMbcZNDBHLS2uCVe1mo4+kwK57wVtkpM3ChCTc cdr2oS/E+v/4sABGeZilMZ49dbTvZt8wSw0xfZ4GGGr7ODsUbmT7JZKhGzN5Q7NeVVxV iz561jrKJqs5CjJcp42kCiSH8n6jXaMAX4AXuQ0CQQ3qVjb05NA5/hgXCII/COENFkEa jizA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rUqzFcpY; 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 n14-20020a170902e54e00b001895ae69dc4si9613566plf.603.2022.12.12.02.03.26; Mon, 12 Dec 2022 02:03:40 -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=rUqzFcpY; 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 S232042AbiLLKDK (ORCPT + 99 others); Mon, 12 Dec 2022 05:03:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231989AbiLLKCv (ORCPT ); Mon, 12 Dec 2022 05:02:51 -0500 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5CCB25EB for ; Mon, 12 Dec 2022 02:02:49 -0800 (PST) Received: by mail-lj1-x235.google.com with SMTP id g14so7967906ljh.10 for ; Mon, 12 Dec 2022 02:02:49 -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=jNmkawudC9o2i2lApH4ifxK0mB62T36PSTxPxQ/BsK4=; b=rUqzFcpYL5kVxkWQUtgSuzazThU2VaUzB5HXOcoKqB8J/CAZAVlwDpvFCBvrw6Ycr1 PEowLQE7oIN9JiW7lt0XqpWx2LxeI2Sz2yYuC4elWP2B5KkkQIGnFRkwHrpfAxJSNq6G Y28JQ5BAd07Dxdob3Ixiqi2Rg7kpGz8OpnR3tTFBFubbvdSYdea59WqsiKss29UXe9/I 7zmNaGWWyFgESOKhoLSUF4Pa7DlAJ/hfXdCmW5Me9u6z0c0uY57YvLppk6Ev3BMMD2dv bSfA85C9+y7/tKd2w/f2Hs5eDeUlK4jjN0EGHDu6ehN8CIDgVxRbzKrAqlUjXoiuc6lO xGaw== 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=jNmkawudC9o2i2lApH4ifxK0mB62T36PSTxPxQ/BsK4=; b=TQNrjzb88X++0CwTI5NjIchKcFj8GbKVbz6+CeW/J4eRJ/xGCzESHgDDp9CV6iW5eZ UFEiXN5vXlKZ5uKO7YT7l2bpAFVQZkwbKifBAcBfzH+SeS4nkPJgTWUl2wccodeswgxx s1ubgimxgckgJlUtWaUt3RlqZCdFh7fFJZlYV2I3Ar+aq44adun6h/gO9Kz6dVt5hdt2 TNvUIwNaeqAW3JC/oezOjTKcIsJZtvmzOH2qPneF/bBTj/KI1zZTaaDBhNprfa/1Ab/I jfhC7XUuvPbh01ohcD1hn5OisxxPVOG21kTWZT6Wf8ba3NtNXrol81/gzowcrlbJ+EEl +GJg== X-Gm-Message-State: ANoB5pn/Qvs9FsaEKQSucg3/64Qp3Uc9ZHG7WUKL9aBOCZlC6einFTjX 1f4Pj8XJnBLbAyb7qox+lsPfh81zcMYzURzr7go= X-Received: by 2002:a05:651c:1148:b0:26f:db35:d1f8 with SMTP id h8-20020a05651c114800b0026fdb35d1f8mr3724792ljo.4.1670839368150; Mon, 12 Dec 2022 02:02:48 -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 i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:47 -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 v2 3/6] arm64: dts: qcom: sc7180: move QUP and QSPI opp tables out of SoC node Date: Mon, 12 Dec 2022 11:02:29 +0100 Message-Id: <20221212100232.138519-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212100232.138519-1-krzysztof.kozlowski@linaro.org> References: <20221212100232.138519-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?1752002116262677093?= X-GMAIL-MSGID: =?utf-8?q?1752002116262677093?= 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 Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. Only rebase due to node reorderings. 2. Add Rb tag. --- 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 6d3e86ce2936..eb1e1ea12ff6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -494,6 +494,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>; + }; + }; + pmu { compatible = "arm,armv8-pmuv3"; interrupts = ; @@ -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 Mon Dec 12 10:02:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2149775wrr; Mon, 12 Dec 2022 02:04:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf5nXryl5RVwna0HuBoJAE05oQFwuUbyPyfalGrcOuhMr4zadbQyYffa7wR0jKZqL2Y+AZTQ X-Received: by 2002:a17:90a:e58a:b0:20d:bd61:204e with SMTP id g10-20020a17090ae58a00b0020dbd61204emr15241958pjz.37.1670839462680; Mon, 12 Dec 2022 02:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670839462; cv=none; d=google.com; s=arc-20160816; b=jJCGm2YLl9i01sUpdaNuq8J4Lkia12frzfT5phxxSt2hXZuzUZSoxbV9Ujnvh9gmCi z5JT6SrcHE45kIKytSSt0KyXzLuGOJzVAoym5zpyg0xv1oj9rn/CRSItU2SGkkETLFe4 WtTurpm5fnJXvkXzDyjoB3O/X69fqOvM2s39QW2+eRM9aouTj0AX067a6X/N+HG3H8UW Oy+nYTuP1TVgQPwtSqWAbYg7F1ktKs8aOxqz/BiCM4muMTDMVY04SsWnqhACoHsjzKHw ZOvleVfm1b1hqwUl7Vkic0j7KToWb2ytJG8JyB5MkhcJtVBU8IBwX9h9U7qEtOIkqQR/ eDkQ== 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=vZWHacJeruYxFR3J1MJB9nSgpjJtyeDKFZvrWwuGNHA=; b=ap5WuQfpfytsAh37bam6EOUipu+LFmPx6ItudTiGBGFiNdwcjBQyOv3RCaYiS5rYHW /M6A2oWMe8/klTGz5j/4a3AvwOwLgmpaZR7TCq+hMc3ytM7dquRFQA3S2bznpOC9VgRI i+Sg3FF8U3QGoNtSLEx6H3XmfAWFmoOC419kWkJ30/1a7jWBl8bOi2zqmDqA47G5lO3L N1Sd0CNxzZ+OdrAXSaAYGAEYnvViuGUqT4Zvcc2HIXNMK1ltMkPXX50ljqpZrpYAn7Md SGVOB6GAm1PBXbfvceoLyZWzUX3MDW25DjDbh8evlxVEwB0lOuXYu0oOtX9nvgNAto/0 PbDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FZJSZNpz; 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 oa2-20020a17090b1bc200b00218ed5d3fc5si10287970pjb.35.2022.12.12.02.04.08; Mon, 12 Dec 2022 02:04:22 -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=FZJSZNpz; 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 S232058AbiLLKDQ (ORCPT + 99 others); Mon, 12 Dec 2022 05:03:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231991AbiLLKCw (ORCPT ); Mon, 12 Dec 2022 05:02:52 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F85A64E8 for ; Mon, 12 Dec 2022 02:02:51 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id f20so11958400lja.4 for ; Mon, 12 Dec 2022 02:02:51 -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=vZWHacJeruYxFR3J1MJB9nSgpjJtyeDKFZvrWwuGNHA=; b=FZJSZNpzm7/RAZPv0oeDgURlRfDtKH9M3oAjy81IDjF2lh1tJ5rIhesKLpcXTM24GR /NX8Wt+3SOQAEDNkQPs0FKGkb2I+FXLA0Jyb2T/RKq4lyRZAZGMVHbpAecBkhDb3wsT7 kTvAMD5USVLmByN7Qpw3eKC8VZa5DlJn4mNCI/BD6q8MEn/9jkEoz+PxvtIkn3H409CC 4HSpCAI6MZ0xIyLJ2ikZIivWi8FF01Mhpct6SfcLdTsiMQrhBVYtdoU5L1/N6vHN7UYZ epYlZw5tGMUfGCcNho7ULVuVqHt1XBOQmOLt6RN8DmmlVdRakqlif+fwn6gF85wCe9VV lDlA== 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=vZWHacJeruYxFR3J1MJB9nSgpjJtyeDKFZvrWwuGNHA=; b=U9U/fgySCQC0RkrhB7jYWfrrCxskD7ktbnywU4pa7fa2SF2G5oK1mM7OBzUjXnm9qj l+57bQsMwnXXidyApVX8A331aCsjGisXCHZlh6B35VR1gELlwahWHiaLYPkLsLoxg4AI yvdlqSQyKjvrbul28VGV50OH3w5OtT4j4yT1hlKYJbqzuovPDNzKMDbqs9gP2319w5pw COtelF15LmKUbM2WLmUHM44VOxX7P5mIsB5+B5h9zsZSaZdc9BqKwnTDR1Cs3AX4hLyf phH+TTSMqYs91MAlXV4myyt4+10vz9jsG4qAJ90rJSBe5Hxhm9PTInEj/007t6N/I30U gibA== X-Gm-Message-State: ANoB5plzYvLAsMmo/hdfvKCH6K7MHgSJOQqa82YSoJWy5NlTiw2sdTC6 P7g8vKzfbg3QdiUwy6YWyzeYQA== X-Received: by 2002:a2e:9f49:0:b0:27a:1d04:6709 with SMTP id v9-20020a2e9f49000000b0027a1d046709mr3929921ljk.42.1670839369710; Mon, 12 Dec 2022 02:02:49 -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 i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:49 -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 v2 4/6] arm64: dts: qcom: sdm845: move DSI/QUP/QSPI opp tables out of SoC node Date: Mon, 12 Dec 2022 11:02:30 +0100 Message-Id: <20221212100232.138519-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212100232.138519-1-krzysztof.kozlowski@linaro.org> References: <20221212100232.138519-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?1752002160226296458?= X-GMAIL-MSGID: =?utf-8?q?1752002160226296458?= 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 Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. Only rebase due to node reorderings. 2. Add Rb tag. --- 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 88e7d4061aae..8eeb3aa261d5 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -604,6 +604,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 = ; @@ -1117,30 +1194,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"; @@ -3799,30 +3852,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>; @@ -4420,35 +4449,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 Mon Dec 12 10:02:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2150205wrr; Mon, 12 Dec 2022 02:05:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf7GfydHApV0irXf5dUXt07Y1B2s0Frq1QdCu70HTttlpAo12T6TCkKGJCkDtqdHsfM/s0Sh X-Received: by 2002:a62:5501:0:b0:566:900e:1031 with SMTP id j1-20020a625501000000b00566900e1031mr15488946pfb.17.1670839525750; Mon, 12 Dec 2022 02:05:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670839525; cv=none; d=google.com; s=arc-20160816; b=m5+bd3ZNGf0PoEJWweA2jhB30b0e+ZRrG0L22JjpDtaCIFNiwOKcaVUgv3qe5dR3Mj d99vCJapoX2r24S9xEHnib2c/ES2DScpUQ4H/SojeknWzAJ/bzIohvhujK+kBavH/6fA BuShx8tZcVw8n5KkZ0BBcKb+9fXJIStWi4h0ANGkE/3o2EfKAqXFq8j2UlSbYPFUtRrr owSymIJV+LBiK0A8AkfeU9vXWcO/Ll+uVW6KyaQAOgDXJ+ft9wKSY1WUpBppR2byBH48 UIzzV/jYVe1GKlisgIDltQPVsqGmwnerTe8H3tFwZaT7IldEc7yIa+BA0BhZx1rLtfYJ Dvlw== 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=Fclng8ESbq3XjgOkvuI1GIyaTCatPo7DiLR9f+XR1rI=; b=T4vgEwqffUMCcHZfDDUPaK3ejZ7Ohlxuy7uAaZ7OI3OLF2lmlyArlbVv9qaE37GlSG fg5+8VE+WTrTr8W8YodeqkOSfjFZAxeMp+TZMzF+v/+IoP59O+bO9yRPGDlU55RNUp4O uCaUNKHW2Wc+lMikGEGiSmbeLk8nnWmzdBW6ev3G+zAUMeZkR9TieoS+IHXCN4eF6t72 6mVlEpH1zLePLPX9haDSfHTR2eRD4VMWWISPYRmsbjUNY2Pbv3ivc858+LbpkGH7VDdm rTrc5sOEh7Mz8E5nPg9jJ0V4HosdZhbSMHMkm3N+r4wGCkW986/HMAj4SpbIuvNF8rqS k0Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lFEuCRr4; 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 y11-20020a056a00190b00b005639db953adsi9557511pfi.68.2022.12.12.02.05.12; Mon, 12 Dec 2022 02:05:25 -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=lFEuCRr4; 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 S232067AbiLLKDT (ORCPT + 99 others); Mon, 12 Dec 2022 05:03:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231968AbiLLKCx (ORCPT ); Mon, 12 Dec 2022 05:02:53 -0500 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2667B49D for ; Mon, 12 Dec 2022 02:02:52 -0800 (PST) Received: by mail-lj1-x22a.google.com with SMTP id f20so11958469lja.4 for ; Mon, 12 Dec 2022 02:02:52 -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=Fclng8ESbq3XjgOkvuI1GIyaTCatPo7DiLR9f+XR1rI=; b=lFEuCRr4lG0reAnx33yGM1tiiFOPGai48iALv7go08uL71Q36vhplQcWQst/PcLTDM chcQ0SW4YDhUo4mmh9msV3dOpe71oxTDxpP/RvCdF4g9mUV63UZlcSCOU/5KmdiH4sNz WHB7vYJ7k9F28Zmf5haVAOIRbT7Ud3powDo4hrVDaoVKGjtKqgHG2uLRLB7CTLOq/1n2 McR+FKzHBISCi3xn82KoJBrP59sS9mG2giNJMBWIOvOqPHt6DUVJBj308LS9slBgCrSE Sw8MbLG24ZrjOAqQRXYWWogM6kgrcF16oF5aLEm6/2f1L+c/IRzqrkbBxhTitOpNNIkc YR1w== 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=Fclng8ESbq3XjgOkvuI1GIyaTCatPo7DiLR9f+XR1rI=; b=2+tKi69bUv5LKlO20wcZRDMO/UVIZcG8X1oNcOkWJCWjj8NenqKCTIdXkRv2AAW5UL iNETiAragbd7igPnI+iclSOIZhlt16LLRokMfcxpPp54wCCjrvuj5ZQxebeIiVQAvB2a ZF8DZ/d52vvd88ztUUC4PAOrJhytW7u0T0WXuTwA1qKynaay+vpDg9PmAWTDD3H+7hQx Z4gL39n7gvZSkoTHEd63n1eBy+yJ4Trkw0RBAqZoRMef0QxvpBgz+HkuLal/xm1IcA5m KLwr7ymEe20HNGrI1WmqOhhW3Tlqat/mf6NrmBZDY1sYZlSv1ZSMR87n6JCAW9caG6iR KA6A== X-Gm-Message-State: ANoB5plNPokWhN2oL9MrvhI3TXKFafZbloWICWbbRkUiaJtGohnwHlze dLBDEYEbR7ByvSMi1lW2cPNYLQ== X-Received: by 2002:a05:651c:1592:b0:277:8a76:90a4 with SMTP id h18-20020a05651c159200b002778a7690a4mr4306295ljq.0.1670839371158; Mon, 12 Dec 2022 02:02:51 -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 i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:50 -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 v2 5/6] arm64: dts: qcom: sdm845: move sound node out of soc Date: Mon, 12 Dec 2022 11:02:31 +0100 Message-Id: <20221212100232.138519-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212100232.138519-1-krzysztof.kozlowski@linaro.org> References: <20221212100232.138519-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?1752002226627186184?= X-GMAIL-MSGID: =?utf-8?q?1752002226627186184?= The sound node is not property of the 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 Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. Add Rb tag. --- 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 8eeb3aa261d5..5f1f7cb52c90 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -3964,9 +3964,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>; @@ -5341,6 +5338,9 @@ wifi: wifi@18800000 { }; }; + sound: sound { + }; + thermal-zones { cpu0-thermal { polling-delay-passive = <250>; From patchwork Mon Dec 12 10:02:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 32292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2152283wrr; Mon, 12 Dec 2022 02:09:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf5qkjhClcqKnL91BbsM1tpTZ/2v0T4KIJj9NnXHBC60Vby/cmj0y8ht35qFyyZBx7Yq5tGv X-Received: by 2002:a05:6a20:d90a:b0:a3:587b:56ac with SMTP id jd10-20020a056a20d90a00b000a3587b56acmr19085478pzb.52.1670839791281; Mon, 12 Dec 2022 02:09:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670839791; cv=none; d=google.com; s=arc-20160816; b=XzJz5WMkC0eIXKodMQ9/IKOrlFTvMhuR+02cxqLWsnttGJ9ElC+jVDHduBP3kycZqz Tpf6KzyQ9A3nWnbTvXv7z8kughZaVnZ+N3R1CJf6E4inLf5Qm/bYlrAkKojsCmzVC4iQ G4DfSGddt1rYqhZDnzU2y7FYwnMbn6ojhpuqgTqFyOzrsflzG4YZXzJS/dRuUGR0s1Kr VPwfUBL6gx6+CFfTDqBtK54Zp18ccWUOp1NRwsZ2YK2ZwIPFJePqxtbXqaeiqvqYjHSC j4wgsEfDU1ctCO9kfA25yz5mJlYD9s/ypOwO/puKP3IWKp0RWKj0gRZiV0WPYvYQ1kCi 6QJA== 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=cyA5j8UPbljPS/0gpmRfAGvM80LSRW/CSN7T+wq0jpI=; b=mUqW2/Hc3o6l+XQCnCTbjcnrZ1UgoZecO1+KemS8FnFeuDkAw7bROsQTaj295AIbnt 2v/8xKys44eGIeBqd9G0QYLjrlyHPDSouWgdM6Sb58JkSjepzfKARacoZaq9ae0s3DvI uNeNZAnscxfpvhQto4xnbmhmisfVnEueXx3p/vAEc+hP3Dt/w1p2/fcnt9MoKkktKX1k DFE6A6554Naol5LFKXj8hoJJWnJlABiGCS/LUIIXxekbHrFryQ6no8KojefLUnTkIUec D2bqlDzxqU5wrDKh8OjJBgIckt0alhGiKEVZL268qPUjszv0NdY7PGtFqo1muxgpbpox 7BHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wlwCJPGM; 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 y188-20020a6364c5000000b004779a46d07csi9213889pgb.183.2022.12.12.02.09.28; Mon, 12 Dec 2022 02:09:51 -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=wlwCJPGM; 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 S232075AbiLLKDZ (ORCPT + 99 others); Mon, 12 Dec 2022 05:03:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231994AbiLLKCz (ORCPT ); Mon, 12 Dec 2022 05:02:55 -0500 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8075FDF05 for ; Mon, 12 Dec 2022 02:02:54 -0800 (PST) Received: by mail-lj1-x22f.google.com with SMTP id s25so4694285lji.2 for ; Mon, 12 Dec 2022 02:02:54 -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=cyA5j8UPbljPS/0gpmRfAGvM80LSRW/CSN7T+wq0jpI=; b=wlwCJPGMJX/3fqDm2EwFukIHjoYLL77T+IyWq7UAWWeFG5IvdP+khMjXPwb42kaWDa eX7QGFkcSfwQw/ZF0hJeExffBvAFolfmrbAJ+GI4XS/cpkRdm+K/Cua+SW4Md2D2EHmM FFTR2UjqS8HPkrWVJWfKovIz3nWJlfzPDxzeEssei+lFOnOTd1hBNCYwIbLmDoGdQTLI VX46uHsuEexAlR+pCIxiWSVbJdALILZt04TtnMV6EcWAi12NGg+FDw0P0qbMNVGLSKZf ejTMjXe4R65hkkfd07pnasRH4raV9n6C1YkySnhAK1Nx48T/JLElCc/gSsyYkoEs5rCn y96Q== 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=cyA5j8UPbljPS/0gpmRfAGvM80LSRW/CSN7T+wq0jpI=; b=mvk1Mqx5siIPJ/WKos0kDgC/xllSVJUBGNT2wyI2+x8mCqQfkP6rAnUPTsO1ktTeSB 0tq/nXmkUb713LAbIpvotwdcciUSM4ON0wF4kaz+qWcve58XcplB9XzL+UKZPBc+U+Yc TuyUBrQ0wA/KO1WzVD7hmNC0sW2OFu8Bcs7dbV4OAgZY/juxa0TMgIF7Gp7h3QHYBWUV pk/WASwdNVLWmCMoWguICfIccnb7Viv/9QcZi/hT8ysHhhIZLPpsQPuQaH+FL+lOSShR xHOavOPkwdt6itOzeWoAmwoRkHyHQCKNtT70RnntVj4cX1lgtq01SYiKBlreo9xVLimy AcQA== X-Gm-Message-State: ANoB5plN6Uk3rh8BmIMcbFMz6GovCv5AKhkKU5FUQga6d6XY8nujw7gF vp8To/7A2J35O3TFYVDo2BMNhg== X-Received: by 2002:a2e:9a95:0:b0:27a:43d0:1d4c with SMTP id p21-20020a2e9a95000000b0027a43d01d4cmr1948422lji.35.1670839372747; Mon, 12 Dec 2022 02:02:52 -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 i124-20020a2e2282000000b0027712379ec8sm1145101lji.28.2022.12.12.02.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 02:02:52 -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 v2 6/6] arm64: dts: qcom: sm8250: move sound and codec nodes out of soc Date: Mon, 12 Dec 2022 11:02:32 +0100 Message-Id: <20221212100232.138519-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221212100232.138519-1-krzysztof.kozlowski@linaro.org> References: <20221212100232.138519-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?1752002504813387782?= X-GMAIL-MSGID: =?utf-8?q?1752002504813387782?= The sound and on-board WCD9380 codec nodes are not properties of the soc, but rather board as it describes the sound configuration. They also does not have unit addresses: sm8250-hdk.dtb: soc@0: sound: {} should not be valid under {'type': 'object'} Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- Changes since v1: 1. Add Rb tag. 2. Rephrase commit msg. --- 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 =