From patchwork Fri Apr 21 20:55:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 13220675 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24676C77B76 for ; Fri, 21 Apr 2023 20:58:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233239AbjDUU57 (ORCPT ); Fri, 21 Apr 2023 16:57:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233259AbjDUU5x (ORCPT ); Fri, 21 Apr 2023 16:57:53 -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 D75EC10CC for ; Fri, 21 Apr 2023 13:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682110631; 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=GHdC3CO7d7h9QJ4WwIQBRA4b+ojZKpdU+4dGZcHHyn8=; b=eNhQ1nwu47euN4OrU8fCxy88LZ8TT/dc71LGIPKoiYk41NxLPrprKvZ2Qyu6jXnbxHZ/x3 wFjNPyyzrvUejx5IbdU9JBb/ldfCYkyWF97g7xAS/xsXu6NAdBBTW0sdV3m8wTpiL+ww6b Y/GwnFXX9OgqSvdbmfZ6zG8oMqDhSnQ= Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-449-zIedwAYmNom1722r_YqRew-1; Fri, 21 Apr 2023 16:57:09 -0400 X-MC-Unique: zIedwAYmNom1722r_YqRew-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-555f6759323so29692127b3.2 for ; Fri, 21 Apr 2023 13:57:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682110629; x=1684702629; 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=GHdC3CO7d7h9QJ4WwIQBRA4b+ojZKpdU+4dGZcHHyn8=; b=LhJ/JPALp4TkxFxa/cLey0p0xObUhFFjE3OXPLZxYdxikk3Fv/4hfCn7uQSMgNhM7g xbGeWzZloyFQ1aoZhUqgd/ZQoVXU4YeWgwCXot4eRbuMmcDedVaXSJu5Szas01TXZxfo 6cukKkj4fJHTfO8UjU5iWhhNOJIhwh4Z74C141ygvGMGALaksaDl/TqMQL6894GZkQVX NZCaX+BCYGIL3aCIs7e20/nbmHvugZp+ghES3DSA4mB3/2+H1rUs6jFr5Bygicn9LCLM 0a54rEtsYXYl9QQ4UFGHmjzt/QDgm0keBmdxgdS0rjj9v36l2QZIWAYTZo/JDIci/1yZ efYg== X-Gm-Message-State: AAQBX9faXFRZ+1408WDs/LRTcheyB4r234pyTbIE94Pk8vVob4g8mLMu UoRWyHnUABGx+WgWOzGmL78EuCHtKsg6ZE3lSu+EbCzO+HH/6Dc7B8aCVe3UhS8DCenuJsXEmwS OmezOVT4EO8EuuCu/KgOhM8yWgQ== X-Received: by 2002:a0d:e80e:0:b0:552:9fae:d0b with SMTP id r14-20020a0de80e000000b005529fae0d0bmr2961326ywe.16.1682110629207; Fri, 21 Apr 2023 13:57:09 -0700 (PDT) X-Google-Smtp-Source: AKy350YhmtU533lQoik67y8f8UrJHdl4W7EW+ZwOU08LNuM8hqNta/4muproajIhj5BU+Xb9HkSvqw== X-Received: by 2002:a0d:e80e:0:b0:552:9fae:d0b with SMTP id r14-20020a0de80e000000b005529fae0d0bmr2961319ywe.16.1682110628977; Fri, 21 Apr 2023 13:57:08 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::22]) by smtp.gmail.com with ESMTPSA id x67-20020a0dd546000000b0054c0be459dbsm1179999ywd.39.2023.04.21.13.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 13:57:08 -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 v3 4/4] arm64: dts: qcom: sa8155p-adp: Move mtl nodes into ethernet node Date: Fri, 21 Apr 2023 15:55:12 -0500 Message-Id: <20230421205512.339850-4-ahalaney@redhat.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230421205512.339850-1-ahalaney@redhat.com> References: <20230421205512.339850-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 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 {