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: 675986 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 12C5BC77B7E for ; Fri, 21 Apr 2023 20:58:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233221AbjDUU6I (ORCPT ); Fri, 21 Apr 2023 16:58:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbjDUU55 (ORCPT ); Fri, 21 Apr 2023 16:57:57 -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 A0C76E74 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=1682110630; 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=bQOTqZloz1HSoIx+jB8Aj5uMCYJPSQ+Mo+6ZZ3HI/oMoT6ZYwbsEkgqq+fJ56xomI4mmmk OnjcNlgFKyhvv2TIdF+/qUf0iFlEfkJ3YBUT4Twf26bo3P3Kiywo7pCw9lI5C9qcCvpVQg jgXocHYeI2X5wLV2iqnmXLBLNG+qmAU= Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-HzaBswq9OAShzRRB5N8jPQ-1; Fri, 21 Apr 2023 16:57:09 -0400 X-MC-Unique: HzaBswq9OAShzRRB5N8jPQ-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-54f6dd3b329so33740517b3.0 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=JE3CQZK0HuBX0XvWM0VCJAvjET43ZRZ4fWvyH1DZsYZaXdfHV8tlwAIGj9R4LjpE34 5E7GiFYnZq5Gg/evGRtlFn+YFdiJSqySXXv1g8PtyHf7ZLwbbFMK3zdbvWscIl5kJYlX unejiBNLEafSBtIbLzOJh57LBlmUESmf9wYSVFAKVrapPmDoQgUZx88xfuXoaduB6fRS kZMHvX4LleGWNvBQwQI/pbXUhb4lx889HveQOj0g4LCnuMhHL26byffi8ix0fALlA94M 3Enr29xlUjKQS9T5kdpPY0G6p439WhkVtaPm9TYkKpeUW661SpqS4Z4BMw+kcFMosTXK OGwQ== X-Gm-Message-State: AAQBX9fcBD7+0cyC94EaRuCA1VHQ/syg0lw/kDXTaJrT3vrnhRoOpT7D J9Mq07bMEsBPl0Dld9z5UKQmnIsX4C7BsNOBcrpdFLEEEyzMk17h6zStVv7/vrnD9XphOIqA4oM gjpVQMaZiyubxFmk2TyJzZA== X-Received: by 2002:a0d:e80e:0:b0:552:9fae:d0b with SMTP id r14-20020a0de80e000000b005529fae0d0bmr2961325ywe.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: devicetree@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 {