From patchwork Tue Apr 11 20:20:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 82181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2835230vqo; Tue, 11 Apr 2023 13:25:32 -0700 (PDT) X-Google-Smtp-Source: AKy350ZCYQJXxxgo5c37DV0ty46jbI8VuiQ3D4tJ55qNbf3vh/od4W3FJFQwTfJdNjcy6cYEgWs1 X-Received: by 2002:a05:6a20:19a6:b0:da:d73b:926a with SMTP id bz38-20020a056a2019a600b000dad73b926amr55052pzb.30.1681244732440; Tue, 11 Apr 2023 13:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681244732; cv=none; d=google.com; s=arc-20160816; b=eiEmk5aVcynPH7MLPzdiNGrYIbs8J2el2hGKlrlv4inudn5esPzvz16vcVTEDyU0CD KeeqctWlROlbe6WosjzneANNePQ5THECZ4638496o2anS8ZV4g6B/hGoKJMsdnMVMm3m J/VM5OK09G/otrupwejkFr8JDkgpnThYs8WGqxGw9nuD7QJn+Qiir9XC0Ij+E/JsgmoQ C6HjoIgxtW2pXCrZ5b3YfX6weiQTUkRDQpV7hPVx3SoIsCiakWF6FE3dPkqHfaoqBaD8 5hDFL5M4SRtmJ+5ZOd+xPpsTFdsmdFC2iusrcnjqDLjf5lKUsOWLQ+Fi0BCFTpg46vAe S4Rw== 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=bAO/yBZf8skBWnF2ClvjjOWitw4YoPtRAkhOVp1lGw0=; b=H64UiNqV3kCWXF0F08aWou8ZooiiAYanGyCJJS0+6shJJJiRrYw2EqWggifLi3RYcV SMzyILVrpLBsc72NAYv6kht7aIjrTvMKApiS77Cd8kLtHDtjUjpbp8bmYbkgMk1WbBIN geryyTaveoArQXks+uWK4FeOE1chbCIolbHfkmXSyTckPPf2UPf39Tc2ZS9/LrH46wje 7XGJrZfOerPGvziVNhYZjEuNKFrJ2ZXexYAXIfBlLtsl4ElGpgaNAecVjCZ04L+mC5up yfdB374+edu/WlKAWYks7fg0mqJHwZRrYaYkGxNssEffqox8331mg7lHk3fKCURRfyuo Sq5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PqXcA0h1; 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 i30-20020a63585e000000b0051393805cd1si14138552pgm.461.2023.04.11.13.25.12; Tue, 11 Apr 2023 13:25:32 -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=PqXcA0h1; 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 S229900AbjDKUVd (ORCPT + 99 others); Tue, 11 Apr 2023 16:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229813AbjDKUVZ (ORCPT ); Tue, 11 Apr 2023 16:21:25 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB0F1BD1 for ; Tue, 11 Apr 2023 13:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681244431; 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=bAO/yBZf8skBWnF2ClvjjOWitw4YoPtRAkhOVp1lGw0=; b=PqXcA0h18UtPg8yOoPHw7mvT8mxtudkiGE3XaimD+7OQ6ntbY3QG/eBON4Ji3mMwEPu/bP Ur2UE2ZtZaUHVJHvgxJYac86X31m3VToioLtSb+E9PWKO1glx18JCnk5O7IIL6uNEkp5cB 2HvZAA6OIe8Reu9ux64OUWCTSKJL+TM= Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-NgwvUKtON-K9CUJ9F4-EKQ-1; Tue, 11 Apr 2023 16:20:30 -0400 X-MC-Unique: NgwvUKtON-K9CUJ9F4-EKQ-1 Received: by mail-oo1-f70.google.com with SMTP id o10-20020a4a958a000000b00541a5227788so3809558ooi.21 for ; Tue, 11 Apr 2023 13:20:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681244429; 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=bAO/yBZf8skBWnF2ClvjjOWitw4YoPtRAkhOVp1lGw0=; b=NQokqm7cvkuwSLpp1CczMpKwrUu9o6cprAitGFLqc5U5ggEIubZxHq0cACoiE59NCO /wh6OVC+0C5YFjVvMFZGFrqAvX7Z7Wik9ry5Pnbol0wqnZEeMCbp3hRE88c1r4DNg6uC vs3akjrVXs04bynBiG5+xAecISZIU61xgdwWqqAKTC9F+Xr1oqCS65DzERNiFSedKjN9 /cPD7/O119230X/aC5f3pBjOxcdfZB1FAGDcbnmThkGLvHmhZRcTM3NECQ5/Aal+Sj+N qnOBTepxrJOQTbqgKYSDJszkJx2EN8WgtAp3GPdJNyXON6fNWoi2RUFE6Euxu2pl3SDM uW3Q== X-Gm-Message-State: AAQBX9fxIU1ON2tOp4kPJqkklGsmTgqssKiCmVj/TwZ9qnlHyG/QlUOO BPZorgOz51WYWGwc6GsfIAiwZsejFGBgKFb9KtA4prvHOFembYpCRGH5GppOp3rU3sNOSJrTEuJ DxNJc8i1LcUctkyyjOf/scurV5M3wMd/v8TLI5GooYkohNHieOpN0IvAk80daqSsbu5jOlZI8Xe o9IVUa+B+0 X-Received: by 2002:a05:6808:4049:b0:389:545c:a95f with SMTP id cz9-20020a056808404900b00389545ca95fmr6886882oib.42.1681244429578; Tue, 11 Apr 2023 13:20:29 -0700 (PDT) X-Received: by 2002:a05:6808:4049:b0:389:545c:a95f with SMTP id cz9-20020a056808404900b00389545ca95fmr6886857oib.42.1681244429281; Tue, 11 Apr 2023 13:20:29 -0700 (PDT) Received: from halaney-x13s.attlocal.net (104-53-165-62.lightspeed.stlsmo.sbcglobal.net. [104.53.165.62]) by smtp.gmail.com with ESMTPSA id a6-20020a056808120600b003874631e249sm5976710oil.36.2023.04.11.13.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 13:20:28 -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, mturquette@baylibre.com, sboyd@kernel.org, richardcochran@gmail.com, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, netdev@vger.kernel.org, bmasney@redhat.com, echanude@redhat.com, ncai@quicinc.com, jsuraj@qti.qualcomm.com, hisunil@quicinc.com, Andrew Halaney Subject: [PATCH v4 1/3] clk: qcom: gcc-sc8280xp: Add EMAC GDSCs Date: Tue, 11 Apr 2023 15:20:07 -0500 Message-Id: <20230411202009.460650-2-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411202009.460650-1-ahalaney@redhat.com> References: <20230411202009.460650-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 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 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?1762912876638872949?= X-GMAIL-MSGID: =?utf-8?q?1762912876638872949?= Add the EMAC GDSCs to allow the EMAC hardware to be enabled. Acked-by: Stephen Boyd Reviewed-by: Konrad Dybcio Signed-off-by: Andrew Halaney --- Changes since v3: * None Changes since v2: * Add Konrad's Reviewed-by Changes since v1: * Add Stephen's Acked-by * Explicitly tested on x13s laptop with no noticeable side effect (Konrad) drivers/clk/qcom/gcc-sc8280xp.c | 18 ++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/drivers/clk/qcom/gcc-sc8280xp.c b/drivers/clk/qcom/gcc-sc8280xp.c index b3198784e1c3..04a99dbaa57e 100644 --- a/drivers/clk/qcom/gcc-sc8280xp.c +++ b/drivers/clk/qcom/gcc-sc8280xp.c @@ -6873,6 +6873,22 @@ static struct gdsc usb30_sec_gdsc = { .pwrsts = PWRSTS_RET_ON, }; +static struct gdsc emac_0_gdsc = { + .gdscr = 0xaa004, + .pd = { + .name = "emac_0_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, +}; + +static struct gdsc emac_1_gdsc = { + .gdscr = 0xba004, + .pd = { + .name = "emac_1_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, +}; + static struct clk_regmap *gcc_sc8280xp_clocks[] = { [GCC_AGGRE_NOC_PCIE0_TUNNEL_AXI_CLK] = &gcc_aggre_noc_pcie0_tunnel_axi_clk.clkr, [GCC_AGGRE_NOC_PCIE1_TUNNEL_AXI_CLK] = &gcc_aggre_noc_pcie1_tunnel_axi_clk.clkr, @@ -7351,6 +7367,8 @@ static struct gdsc *gcc_sc8280xp_gdscs[] = { [USB30_MP_GDSC] = &usb30_mp_gdsc, [USB30_PRIM_GDSC] = &usb30_prim_gdsc, [USB30_SEC_GDSC] = &usb30_sec_gdsc, + [EMAC_0_GDSC] = &emac_0_gdsc, + [EMAC_1_GDSC] = &emac_1_gdsc, }; static const struct clk_rcg_dfs_data gcc_dfs_clocks[] = { diff --git a/include/dt-bindings/clock/qcom,gcc-sc8280xp.h b/include/dt-bindings/clock/qcom,gcc-sc8280xp.h index cb2fb638825c..721105ea4fad 100644 --- a/include/dt-bindings/clock/qcom,gcc-sc8280xp.h +++ b/include/dt-bindings/clock/qcom,gcc-sc8280xp.h @@ -492,5 +492,7 @@ #define USB30_MP_GDSC 9 #define USB30_PRIM_GDSC 10 #define USB30_SEC_GDSC 11 +#define EMAC_0_GDSC 12 +#define EMAC_1_GDSC 13 #endif From patchwork Tue Apr 11 20:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 82184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2844511vqo; Tue, 11 Apr 2023 13:45:26 -0700 (PDT) X-Google-Smtp-Source: AKy350aaCbzP/SlkF6WiGjuOR5UwHM2LcsLCIWK9M2g5o8x34NZquwqS4l5rDdO5xp1hnd3Eelqk X-Received: by 2002:a17:906:139b:b0:94a:6c9c:77ba with SMTP id f27-20020a170906139b00b0094a6c9c77bamr4007107ejc.58.1681245926699; Tue, 11 Apr 2023 13:45:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681245926; cv=none; d=google.com; s=arc-20160816; b=LkYpnt1lFL1agDDi7OafGm7jmST7CcvwogWixxHHKxv+nzVd6y8FbSCFJEgj/jWqtU qO7xHtKobeECxdAJbEeOTQtrhSQhKQJ1DwTaeGJ0jfrTQOtsh00A76Za33zEtPcs9jp3 3L/yZywiwFPpF1U0fBMAlBDRw1SZ3qYXJmddxzJ67RbPosKtqbnMeE/gVMc9UQCiaLDq xyYbBRsnZGnHSzDRrkgozro+WduNuXRIi3YNu3YkNNNYrn9mbc284bl66dAnMbswusaI 7zJccAEx+qKFex3YcvrXCl+2CynkEIbv+LdNS1rhF85SbOKuprkf7cDp5F+bH55P1S8Z oH7A== 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=duEXMDyF/EtgpxnHO/bBxdC6yz9S9tmp+T6Qy1WmeS4=; b=VPHpiQDUAjT4W5ZPQGoyQh6O7XjUTwxzKgVmMxcmbNrrVV+KSwaSFDwmQiD4MwcDLx 8ue9xe4nrpv+tgJqtknoyl9SEHzv6jyavduaZ4mkoJmjNgi/i8z+EBNcLbrqRDIzPFfZ TLye1jjAYOwUMK8S2JZGdQ6cTTKRp7mtTgyFCRsN05kaHGSmRgFlxiBVmXDW0HHUMOyr nO4t4HxZfM6dVaOYlmbpoZNrGjCspjZ/h60d2AhOb2fqBajvtCEQVIaYRhwgC76oPmTS YgimOnOm/SmMTBZauAGBYrK7QjDrpRcoDb7YbivsTJFNKgvvTQs61NIc+nIu2OwJsCp6 HElg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="TFf6n/vQ"; 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 a1-20020a17090680c100b0092bfe79e330si525144ejx.331.2023.04.11.13.45.02; Tue, 11 Apr 2023 13:45:26 -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="TFf6n/vQ"; 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 S229836AbjDKUVg (ORCPT + 99 others); Tue, 11 Apr 2023 16:21:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229819AbjDKUVZ (ORCPT ); Tue, 11 Apr 2023 16:21:25 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3260B30E8 for ; Tue, 11 Apr 2023 13:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681244436; 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=duEXMDyF/EtgpxnHO/bBxdC6yz9S9tmp+T6Qy1WmeS4=; b=TFf6n/vQaaGCKGMUhgleuC28LLIwho1QNG4x3bnC8V8z+IHBqcPOEfqUUNGiCHlVQOY/li itaCgd/GXGdSvbqOlaD+lVZM8IW0/+rFB7anGk3Or+rr/c5BGAMP6aWlm+w78zUwwWtLmw GpJhdYVDwSk2vrCWMMO/lL7lJrNiY0g= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-578-ofdlDo5mMQuLY_Hihd03hQ-1; Tue, 11 Apr 2023 16:20:35 -0400 X-MC-Unique: ofdlDo5mMQuLY_Hihd03hQ-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-1840884e926so7028021fac.15 for ; Tue, 11 Apr 2023 13:20:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681244434; 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=duEXMDyF/EtgpxnHO/bBxdC6yz9S9tmp+T6Qy1WmeS4=; b=VKK7IGrAUYUL4I5RpDsHZ7DowpXaGyzxZWm9qAgJusQrJA3kBJxOdiLvm8FtjaG9b0 iSa56SHxwFaNGnvOMuQN8Vl4xIKKsHcrJht6Qkx2x3BqQHtH+2EqKo3vNsYzin3Fvx6S +ubefnmJgG5INwHwuTJyqoPU1fQOZnJxK+RG8DtUDc9uv2jh7s3o1iYP90wHSXwD3/Rr zX3UHi7i7JzU79UxHmpZ5DbpEDZfZ7ctvaf4ixcMZy1/6asKvMRHk9VlvzqFlKOXQE8k 3S6srYcV8qtNDzrg158r1wBaKj0NThHdUdJc0MxuRSEspBUHuUqrh5xeGVI8ga6ec0wK a8lw== X-Gm-Message-State: AAQBX9e26xgoIVZm6onyN3cOStMSb0fDdJw4n6HgY4Fk30b+qJtL3+9N xsjwOp4/akJq9mAY4y/3eEBZYrf2//T6mT87NipatKkzW3pWrd+avgzy1WTJ8jpJ5sZRE+V9z/g m2fAgKW1phHK/r5tEtAe0sAaE4EHAa0FkV10LuJ19axr3NCyGB+SWoa/2tIAr4Rdj9SjIrAXr0D Dlb7sj0SPD X-Received: by 2002:aca:6747:0:b0:389:9288:10d2 with SMTP id b7-20020aca6747000000b00389928810d2mr76537oiy.16.1681244434273; Tue, 11 Apr 2023 13:20:34 -0700 (PDT) X-Received: by 2002:aca:6747:0:b0:389:9288:10d2 with SMTP id b7-20020aca6747000000b00389928810d2mr76514oiy.16.1681244433884; Tue, 11 Apr 2023 13:20:33 -0700 (PDT) Received: from halaney-x13s.attlocal.net (104-53-165-62.lightspeed.stlsmo.sbcglobal.net. [104.53.165.62]) by smtp.gmail.com with ESMTPSA id a6-20020a056808120600b003874631e249sm5976710oil.36.2023.04.11.13.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 13:20: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, mturquette@baylibre.com, sboyd@kernel.org, richardcochran@gmail.com, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, netdev@vger.kernel.org, bmasney@redhat.com, echanude@redhat.com, ncai@quicinc.com, jsuraj@qti.qualcomm.com, hisunil@quicinc.com, Andrew Halaney Subject: [PATCH v4 2/3] arm64: dts: qcom: sc8280xp: Add ethernet nodes Date: Tue, 11 Apr 2023 15:20:08 -0500 Message-Id: <20230411202009.460650-3-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411202009.460650-1-ahalaney@redhat.com> References: <20230411202009.460650-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 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 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?1762914129041039217?= X-GMAIL-MSGID: =?utf-8?q?1762914129041039217?= This platform has 2 MACs integrated in it, go ahead and describe them. Reviewed-by: Konrad Dybcio Signed-off-by: Andrew Halaney --- Changes since v3: * Order soc node via unit address (Konrad) * Add Reviewed-by (Konrad) Changes since v2: * Fix spacing (Konrad) Changes since v1: * None arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 59 ++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 42bfa9fa5b96..fdac7f0b05ee 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -761,6 +761,35 @@ soc: soc@0 { ranges = <0 0 0 0 0x10 0>; dma-ranges = <0 0 0 0 0x10 0>; + ethernet0: ethernet@20000 { + compatible = "qcom,sc8280xp-ethqos"; + reg = <0x0 0x00020000 0x0 0x10000>, + <0x0 0x00036000 0x0 0x100>; + reg-names = "stmmaceth", "rgmii"; + + clocks = <&gcc GCC_EMAC0_AXI_CLK>, + <&gcc GCC_EMAC0_SLV_AHB_CLK>, + <&gcc GCC_EMAC0_PTP_CLK>, + <&gcc GCC_EMAC0_RGMII_CLK>; + clock-names = "stmmaceth", + "pclk", + "ptp_ref", + "rgmii"; + + interrupts = , + ; + interrupt-names = "macirq", "eth_lpi"; + iommus = <&apps_smmu 0x4c0 0xf>; + power-domains = <&gcc EMAC_0_GDSC>; + + snps,tso; + snps,pbl = <32>; + rx-fifo-depth = <4096>; + tx-fifo-depth = <4096>; + + status = "disabled"; + }; + gcc: clock-controller@100000 { compatible = "qcom,gcc-sc8280xp"; reg = <0x0 0x00100000 0x0 0x1f0000>; @@ -4681,6 +4710,36 @@ dispcc1: clock-controller@22100000 { status = "disabled"; }; + + ethernet1: ethernet@23000000 { + compatible = "qcom,sc8280xp-ethqos"; + reg = <0x0 0x23000000 0x0 0x10000>, + <0x0 0x23016000 0x0 0x100>; + reg-names = "stmmaceth", "rgmii"; + + clocks = <&gcc GCC_EMAC1_AXI_CLK>, + <&gcc GCC_EMAC1_SLV_AHB_CLK>, + <&gcc GCC_EMAC1_PTP_CLK>, + <&gcc GCC_EMAC1_RGMII_CLK>; + clock-names = "stmmaceth", + "pclk", + "ptp_ref", + "rgmii"; + + interrupts = , + ; + interrupt-names = "macirq", "eth_lpi"; + + iommus = <&apps_smmu 0x40 0xf>; + power-domains = <&gcc EMAC_1_GDSC>; + + snps,tso; + snps,pbl = <32>; + rx-fifo-depth = <4096>; + tx-fifo-depth = <4096>; + + status = "disabled"; + }; }; sound: sound { From patchwork Tue Apr 11 20:20:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 82182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2835812vqo; Tue, 11 Apr 2023 13:26:44 -0700 (PDT) X-Google-Smtp-Source: AKy350Z7QUHP4smEIZwHlKu3YmUBvZ7YkexcptqPSFuPjp4X5PBClPArW/ZnAovYilDHwHdlPfnT X-Received: by 2002:a05:6a20:4c19:b0:d4:fd7e:c8b0 with SMTP id fm25-20020a056a204c1900b000d4fd7ec8b0mr11116418pzb.7.1681244804521; Tue, 11 Apr 2023 13:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681244804; cv=none; d=google.com; s=arc-20160816; b=eollgF/p9/g0QjOECfSadowZSknHGh17MOgOVLbZgZbpPa32vAkRMFMbquOFK/HrWM 4Bzx26D+3ymm85efi7r2LxdlYTtNFstTcsrZeN9o+Jc3NaWh+xJpjGKRDvAylLC3TMcv UsajbS4ps+Bgai9CoeRMqRKHnj6J+R5IsiHvd4F+hdhLJ0R6mwmPD0zP5cSTUIgdlAky qDNeJceCp6pnNwx+jxPoMNiD26hPsg3eVng8aPxpuo4bzyzWgqRDFiVBnKx2qgnq5uc8 k4/jZZrphTf5CTm5NxH/3S1+gK2bxp7giq6T4MZvD+5O/XcFtV5puH1GJV/oJRYuNNt8 Yl6w== 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=9CbNbfXQG0WclGD5BV599nJw4B75FNHTW0PN9HLKZOY=; b=V3uKvJ4APjTJt8sx/qNAr0030owN+kDtho1bTwm3zixNFY5MkY8AgawVzXBMXo5DJK sKhiH9Xk7fSVpIHAvxMZK4msv/Jo1H7GUjEvXHoVa5RmfgkOz398MLyZyBmv04JHJFQx I/DXsrCNwNeIw6/CW8Z42kZZYOGzkTI8NcsnVzrw5ysON2ALF4ZJI1oMMj6XvwcKUHbs sfSNEvwD3RYtMSvZZex8xcUEVb2zWWpecXXsWYVEJIO8O+xiO0Q6c2v8KY0A0jUhx2ru 9fbhb1cmVHNgLfCvjuuyghBNlzr0+WNYy5gbpGxRAzxL3i4Sc8EgTcfv+jghPATXmnuR PvGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RgGlHOeE; 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 y15-20020a63494f000000b00514156b3cbfsi14078725pgk.875.2023.04.11.13.26.31; Tue, 11 Apr 2023 13:26:44 -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=RgGlHOeE; 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 S229831AbjDKUWK (ORCPT + 99 others); Tue, 11 Apr 2023 16:22:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbjDKUWH (ORCPT ); Tue, 11 Apr 2023 16:22:07 -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 DCBB5449C for ; Tue, 11 Apr 2023 13:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681244442; 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=9CbNbfXQG0WclGD5BV599nJw4B75FNHTW0PN9HLKZOY=; b=RgGlHOeEqZWvXgdIh3ZqjJadQeZ6/F2e9Tyr3dZvOXyxkGH0Zcyoh4mkAut/sqYuEcgE99 cY3G5MOZhCwMoNzBCWTJtP+RCt6yEoPk7CcLk3kqABnpVnmuqQ+j8K80GjB2fFDjKNYNa8 ZKpK5TEJETkdWbg+jd91gQC3tkTHrqE= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-pzg-rotSP4mGxA7cJqiPPw-1; Tue, 11 Apr 2023 16:20:40 -0400 X-MC-Unique: pzg-rotSP4mGxA7cJqiPPw-1 Received: by mail-oi1-f198.google.com with SMTP id s14-20020a05680810ce00b003872286998bso584679ois.23 for ; Tue, 11 Apr 2023 13:20:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681244438; 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=9CbNbfXQG0WclGD5BV599nJw4B75FNHTW0PN9HLKZOY=; b=nHLtwd8YEN3Z5/b2e/wqmQe08+rC8bgx8TH6baRwspAi/mM12RZyB38gPVWUiRRoCL wm+NccrkSNDXeaGfp4hyGGp4b3Mm0ESzpmTgo2JETthMgYl3nTnqEQXWy2dwNLBvbARl ZfRnajx7cWOG7KYJAVvGa0Om5i8qIaDe7qJqAK5bSsyWtubkpZbbuX9dJ+y1q/BCROQR 26Nkdd47nib/z8IEzWiAXw6TRO3u4vp56EMAwCqZUmDPBMI3jRTLNJGx98I/yEDS8R9F TyfZ0F8rChhQd9Q8HDidOucMfd2VE5XzfCSFEwuR0hw8aiAWPiFq1f7u/74z/un+CkZt hvyw== X-Gm-Message-State: AAQBX9c0X5PrilIZispJwf0dN9lUU0/egs8pYE5cQVSIdiUNKjbRaNed Cci6Wwe/fxYzqtBrYyy25rwxx/kd2Ly1sm3gcR9pldJ4230gRh8FT0FHTWT+qctEfrbJtOC7z+0 Y+enNssl1xFaVDcyDcMBvrTsg+GQIUhDAzLxo+/ld+kSl8YPo+sx6FDBG+OeyxZwosy+y6p6cA7 jC8rxiXXhW X-Received: by 2002:a05:6808:128e:b0:386:9886:534d with SMTP id a14-20020a056808128e00b003869886534dmr5040853oiw.12.1681244437879; Tue, 11 Apr 2023 13:20:37 -0700 (PDT) X-Received: by 2002:a05:6808:128e:b0:386:9886:534d with SMTP id a14-20020a056808128e00b003869886534dmr5040828oiw.12.1681244437189; Tue, 11 Apr 2023 13:20:37 -0700 (PDT) Received: from halaney-x13s.attlocal.net (104-53-165-62.lightspeed.stlsmo.sbcglobal.net. [104.53.165.62]) by smtp.gmail.com with ESMTPSA id a6-20020a056808120600b003874631e249sm5976710oil.36.2023.04.11.13.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 13:20:36 -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, mturquette@baylibre.com, sboyd@kernel.org, richardcochran@gmail.com, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, netdev@vger.kernel.org, bmasney@redhat.com, echanude@redhat.com, ncai@quicinc.com, jsuraj@qti.qualcomm.com, hisunil@quicinc.com, Andrew Halaney Subject: [PATCH v4 3/3] arm64: dts: qcom: sa8540p-ride: Add ethernet nodes Date: Tue, 11 Apr 2023 15:20:09 -0500 Message-Id: <20230411202009.460650-4-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411202009.460650-1-ahalaney@redhat.com> References: <20230411202009.460650-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 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 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?1762912951866132001?= X-GMAIL-MSGID: =?utf-8?q?1762912951866132001?= Enable both the MACs found on the board. ethernet0 and ethernet1 both ultimately go to a series of on board switches which aren't managed by this processor. ethernet0 is connected to a Marvell 88EA1512 phy via RGMII. That goes to the series of switches via SGMII on the "media" side of the phy. RGMII_SGMII mode is enabled via devicetree register descriptions. The switch on the "media" side has auto-negotiation disabled, so configuration from userspace similar to: ethtool -s eth0 autoneg off speed 1000 duplex full is necessary to get traffic flowing on that interface. ethernet1 is in a mac2mac/fixed-link configuration going to the same series of switches directly via RGMII. Signed-off-by: Andrew Halaney --- Changes since v3: * Compatible goes first in node (Krzysztof) Changes since v1 and v2: * None arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 180 ++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts index 40db5aa0803c..caad955969bc 100644 --- a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts +++ b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts @@ -28,6 +28,65 @@ aliases { chosen { stdout-path = "serial0:115200n8"; }; + + 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>; + }; + + queue1 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x1>; + snps,route-ptp; + }; + + queue2 { + snps,avb-algorithm; + snps,map-to-dma-channel = <0x2>; + snps,route-avcp; + }; + + queue3 { + snps,avb-algorithm; + snps,map-to-dma-channel = <0x3>; + snps,priority = <0xc>; + }; + }; + + mtl_tx_setup: tx-queues-config { + snps,tx-queues-to-use = <1>; + snps,tx-sched-sp; + + queue0 { + snps,dcb-algorithm; + }; + + queue1 { + snps,dcb-algorithm; + }; + + queue2 { + snps,avb-algorithm; + snps,send_slope = <0x1000>; + snps,idle_slope = <0x1000>; + snps,high_credit = <0x3e800>; + snps,low_credit = <0xffc18000>; + }; + + queue3 { + snps,avb-algorithm; + snps,send_slope = <0x1000>; + snps,idle_slope = <0x1000>; + snps,high_credit = <0x3e800>; + snps,low_credit = <0xffc18000>; + }; + }; }; &apps_rsc { @@ -151,6 +210,67 @@ vreg_l8g: ldo8 { }; }; +ðernet0 { + snps,mtl-rx-config = <&mtl_rx_setup>; + snps,mtl-tx-config = <&mtl_tx_setup>; + + max-speed = <1000>; + phy-handle = <&rgmii_phy>; + phy-mode = "rgmii-txid"; + + pinctrl-names = "default"; + pinctrl-0 = <ðernet0_default>; + + status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <0x1>; + #size-cells = <0x0>; + + /* Marvell 88EA1512 */ + rgmii_phy: phy@8 { + reg = <0x8>; + + interrupt-parent = <&tlmm>; + interrupts-extended = <&tlmm 127 IRQ_TYPE_EDGE_FALLING>; + + reset-gpios = <&pmm8540c_gpios 1 GPIO_ACTIVE_LOW>; + reset-assert-us = <11000>; + reset-deassert-us = <70000>; + + device_type = "ethernet-phy"; + + /* Set to RGMII_SGMII mode and soft reset. Turn off auto-negotiation + * from userspace to talk to the switch on the SGMII side of things + */ + marvell,reg-init = + /* Set MODE[2:0] to RGMII_SGMII */ + <0x12 0x14 0xfff8 0x4>, + /* Soft reset required after changing MODE[2:0] */ + <0x12 0x14 0x7fff 0x8000>; + }; + }; +}; + +ðernet1 { + snps,mtl-rx-config = <&mtl_rx_setup>; + snps,mtl-tx-config = <&mtl_tx_setup>; + + max-speed = <1000>; + phy-mode = "rgmii-txid"; + + pinctrl-names = "default"; + pinctrl-0 = <ðernet1_default>; + + status = "okay"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_default>; @@ -316,6 +436,66 @@ &xo_board_clk { /* PINCTRL */ &tlmm { + ethernet0_default: ethernet0-default-state { + mdc-pins { + pins = "gpio175"; + function = "rgmii_0"; + drive-strength = <16>; + bias-pull-up; + }; + + mdio-pins { + pins = "gpio176"; + function = "rgmii_0"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-tx-pins { + pins = "gpio183", "gpio184", "gpio185", "gpio186", "gpio187", "gpio188"; + function = "rgmii_0"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-rx-pins { + pins = "gpio177", "gpio178", "gpio179", "gpio180", "gpio181", "gpio182"; + function = "rgmii_0"; + drive-strength = <16>; + bias-disable; + }; + }; + + ethernet1_default: ethernet1-default-state { + mdc-pins { + pins = "gpio97"; + function = "rgmii_1"; + drive-strength = <16>; + bias-pull-up; + }; + + mdio-pins { + pins = "gpio98"; + function = "rgmii_1"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-tx-pins { + pins = "gpio105", "gpio106", "gpio107", "gpio108", "gpio109", "gpio110"; + function = "rgmii_1"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-rx-pins { + pins = "gpio99", "gpio100", "gpio101", "gpio102", "gpio103", "gpio104"; + function = "rgmii_1"; + drive-strength = <16>; + bias-disable; + }; + }; + i2c0_default: i2c0-default-state { /* To USB7002T-I/KDXVA0 USB hub (SIP1 only) */ pins = "gpio135", "gpio136";