From patchwork Mon May 1 21:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 89182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp193314vqo; Mon, 1 May 2023 14:36:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5saQwEPVi9FW44lQbWi0sCJDJIz48HktS9MIPgVIhFWcxE9Y4tfx3YFG4GSm4nioWSEVEt X-Received: by 2002:a05:6a00:1493:b0:63d:3411:f9e3 with SMTP id v19-20020a056a00149300b0063d3411f9e3mr23053793pfu.19.1682976977445; Mon, 01 May 2023 14:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682976977; cv=none; d=google.com; s=arc-20160816; b=ckF52XNFCudB+vgVrIHT4mM1zTVpEB+mh23nyoI/Fkgo+ZMIlo8LQSxTgdQ7IdSaEl IQfNkEEWhICcHzssrVZ/ddXkKAYvskqGz//CCw8ZvE4/OB4GR30VS2Ntcl0AnaGCTrbc eOsBcsklgDOXQb9/v6AnI0CWeW9CwG1aMiCCXoYgXPZBx90JKNmgIacbtA+LWOj7PdqD hQ8LSs+2tuMCrZpdn1aqQtTCOFLAZQQurcsuV0YxKoQi0jhmbdc5A/YyzJGGiQBgTWF7 ovug8FEDGzePzqL2D86ZN0sQY6UsMZ6vXDVQBsOmR7IP56gd37LuPTbnNEi+K+tVxUIe mZ5Q== 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=mDamfEXI3whq2cw/x9Hd2+R2GXvUBBZU4UUvZz4CPZQ=; b=C5NxvMRfiiQ8gM6d0jx0OEJX59Wk8kzcwWWxL3hftlWRmIpRLBEx74dmUzQYQ9vA6Q RctfqRoiJzjdRLOk2xRRuHbOX/Yvtewoyv/ZaDNrY1q90ucqwWtNKe2/YDOW5Ui5tXGA mtG/Cn9QpbWdEw9E3+NFxQHcWQtSnU5/WzCSl76xOlU4t0AAFK95/BxI+1tyduaL3IfJ gc3u/kKq8x+YTRIh+SCx1ymDhSk3S/laFCUY4SrLPvphHckBGLy4tBQvtaWhReS3jsOS u/xYV+rkyBUMrYaOQJFbQz+HzuuLPvqkgKDFMcRCnIIDAmlYU+teMBizSWMvcHWUp07h z3fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KmK34DoZ; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s6-20020a656446000000b0052c40c2a985si383073pgv.647.2023.05.01.14.36.04; Mon, 01 May 2023 14:36:17 -0700 (PDT) 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=@redhat.com header.s=mimecast20190719 header.b=KmK34DoZ; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232785AbjEAV0f (ORCPT + 99 others); Mon, 1 May 2023 17:26:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232989AbjEAV01 (ORCPT ); Mon, 1 May 2023 17:26:27 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39B6526B2 for ; Mon, 1 May 2023 14:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682976336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mDamfEXI3whq2cw/x9Hd2+R2GXvUBBZU4UUvZz4CPZQ=; b=KmK34DoZgicG6LK/GFd3p8VyUSo328aINdi6FCD1RvtQF8lcnUNKe5KXKiAEUSLZRTSWLr XOuQPAvpl5UvyKa9erEV9wKVj9ocwPKr0I4wXINCLYnNN++1gwQ8Ald2WZX4I4SMehTWtY rDOfBGqZv8GGp53TZLXFO9Ex75fblbU= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-PJO1CC7AOnWrGEwZey9nGA-1; Mon, 01 May 2023 17:25:35 -0400 X-MC-Unique: PJO1CC7AOnWrGEwZey9nGA-1 Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-38e0523ba37so1983604b6e.1 for ; Mon, 01 May 2023 14:25:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682976334; x=1685568334; 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=mDamfEXI3whq2cw/x9Hd2+R2GXvUBBZU4UUvZz4CPZQ=; b=hR8S2ZOmIPdLOpLWRM+tHr6G/cHRjtDFOHhg96ME+FTPNPlKoC4GXlmQ+8aNKRcrNu cVEfyxMhJ2mekfqtQ884j9Sh6B/+1bVl/ZsgJE2z/CfZGOVap+3dtpD01EFPhVyj+ojr tL1P777d5DmPP//+JzbH87dwW3IVq2kfPdUdSL9heTlpAm3HRcFaX1DQ2n/IMdxjmpPs Z29JajKEq42JW+sUUYdw3imT7jixptqnGtlgZibP8MFeHugodLgt8F54m+LybT++TDJx k5n3lVuwZRTkpfpEP6gw8Oj93aEiphiVU+x9Zq6+z7q2JqG2aE7qsgASNe3abdUPY3p3 N26A== X-Gm-Message-State: AC+VfDzQ2Mo/vANDzMl6yuBjmZRwqHcDqLczmXtbvMNWDhYOm2TWcMc1 0C5NBKSDtjZpro9NmJVtFWL/7u81H0B1xR/YOHgGsMeEnYxaGNoRG24ZUcJsdTvidE00psON8/G N1Xq+37H9jfptEoYqYdIN1UwVHmrHBSu53xS+/fGcCZx5HaST/hRiN9c4iCJ7VwMzT7ZlNWgV2A UGH8HSoKW/ X-Received: by 2002:a05:6808:4345:b0:38e:50:415 with SMTP id dx5-20020a056808434500b0038e00500415mr7011956oib.44.1682976334463; Mon, 01 May 2023 14:25:34 -0700 (PDT) X-Received: by 2002:a05:6808:4345:b0:38e:50:415 with SMTP id dx5-20020a056808434500b0038e00500415mr7011943oib.44.1682976334174; Mon, 01 May 2023 14:25:34 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::22]) by smtp.gmail.com with ESMTPSA id q5-20020acac005000000b0038756901d1esm11911385oif.35.2023.05.01.14.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 14:25:33 -0700 (PDT) From: Andrew Halaney To: linux-kernel@vger.kernel.org Cc: agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Andrew Halaney Subject: [PATCH v4 4/4] arm64: dts: qcom: sa8155p-adp: Move mtl nodes into ethernet node Date: Mon, 1 May 2023 16:24:46 -0500 Message-Id: <20230501212446.2570364-5-ahalaney@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230501212446.2570364-1-ahalaney@redhat.com> References: <20230501212446.2570364-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1764729267203895470?= X-GMAIL-MSGID: =?utf-8?q?1764729267203895470?= The mtl nodes aren't evaluated unless they're under the node with the compatible. Move them so they're now evaluated in case future patchsets modify them incorrectly. An example of this can be seen in the link. Link: https://lore.kernel.org/linux-arm-msm/20230414145844.wyg6pt623pzqwh5l@halaney-x13s/ Signed-off-by: Andrew Halaney --- Changes since v3: * None Changes since v2: * New patch (me, after realizing this on another platform) arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts index b65e0203d783..02d04ce877c9 100644 --- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts @@ -47,29 +47,6 @@ vreg_s4a_1p8: smps4 { vin-supply = <&vreg_3p3>; }; - - mtl_rx_setup: rx-queues-config { - snps,rx-queues-to-use = <1>; - snps,rx-sched-sp; - - queue0 { - snps,dcb-algorithm; - snps,map-to-dma-channel = <0x0>; - snps,route-up; - snps,priority = <0x1>; - }; - }; - - mtl_tx_setup: tx-queues-config { - snps,tx-queues-to-use = <1>; - snps,tx-sched-wrr; - - queue0 { - snps,weight = <0x10>; - snps,dcb-algorithm; - snps,priority = <0x0>; - }; - }; }; &apps_rsc { @@ -365,6 +342,29 @@ rgmii_phy: phy@7 { device_type = "ethernet-phy"; }; }; + + mtl_rx_setup: rx-queues-config { + snps,rx-queues-to-use = <1>; + snps,rx-sched-sp; + + queue0 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x0>; + snps,route-up; + snps,priority = <0x1>; + }; + }; + + mtl_tx_setup: tx-queues-config { + snps,tx-queues-to-use = <1>; + snps,tx-sched-wrr; + + queue0 { + snps,weight = <0x10>; + snps,dcb-algorithm; + snps,priority = <0x0>; + }; + }; }; &qupv3_id_1 {