From patchwork Mon Jul 25 19:51:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12928331 X-Patchwork-Delegate: kuba@kernel.org 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 B87CEC433EF for ; Mon, 25 Jul 2022 19:51:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236407AbiGYTvf (ORCPT ); Mon, 25 Jul 2022 15:51:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230076AbiGYTve (ORCPT ); Mon, 25 Jul 2022 15:51:34 -0400 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 21EDB5FB3 for ; Mon, 25 Jul 2022 12:51:33 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id w18so3288973lje.1 for ; Mon, 25 Jul 2022 12:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2ps5/CCHuqY7+cZdChN5ZBwBuVuATjoZQbxBn5m9FSk=; b=HjrTErUgQQ6O5qzdgEIN2RutjLDFe1LgytUqZMmdNM4nDv/E+FNm4AVLMCsdUYFdH0 RNi4hBqdapWg0rVP/C1nGhVHAxdkJyX6cM3QqyDrlPkGkicdD2JPwd60gmvz7srKe2eG 5Hwjy/kzl1Yxabl13vPhBDVHC+Amgexhq68yqwsgFc+3kwTNq7C+zQ3qhN0MVIy8qTXM lnuPlTIiYj8kVFdnLUehA56qcQ71ibOLyRe1vDDUvdPNc9lX5ri9Ez1XWvhaYrHH9W45 4+Rg/MU1Tt4sfGx7odAqJWU4aLvJO0vw4rn7YBDFD9eKxrmOvmtco2BfjFnYWWdrDlN8 rNWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2ps5/CCHuqY7+cZdChN5ZBwBuVuATjoZQbxBn5m9FSk=; b=yVW0/ybYRT3u/1Ps/DwTEx5wLiWu22dR1qIermFi77xuHbUhc7AcdvrlFLkk+OnWOH po3wyG7mw6fMP2pcG8LbrQZSY7xPuRjf6RytnW28B9CnsxLK4s2MtkVZ8nPLR/Flvq+Z IHuGGuNeMsFLfn4lZkMvkol0lxAxRW9vWEoofhENTtFU9td/O1qvkHarc8kXQ2GDR2kN JllhJh5M4i6BMMCt9PqoRhu+y9bQoqqXpa86PFOm4fwSwWRdSFZnp67Wd91eCgSbI587 MMhvTEThRi16kW0B5Ze4rrgPv5/Y+wKLUXJeIKXfKi1jzUrmHnndl1PE5RUAlFSCCVnI 5gcg== X-Gm-Message-State: AJIora8kUHFh8O760Bu0NtKV7At9WupAz0rS0fSblSwGstpsCoQv7ZY1 JssvGeNhnYHn8mvSlRVp+OkdTA== X-Google-Smtp-Source: AGRyM1sYYBhch95RxeLVobgA3XR5XMMqveMrHinpaIfSvj6CqzsXX7nBefxB9ISmggR5ZGNwo3bVSQ== X-Received: by 2002:a05:651c:158c:b0:250:a23d:2701 with SMTP id h12-20020a05651c158c00b00250a23d2701mr5123421ljq.475.1658778691203; Mon, 25 Jul 2022 12:51:31 -0700 (PDT) Received: from krzk-bin.lan (78-26-46-173.network.trollfjord.no. [78.26.46.173]) by smtp.gmail.com with ESMTPSA id a20-20020a056512201400b004790a4ce3e5sm2824973lfb.278.2022.07.25.12.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 12:51:30 -0700 (PDT) From: Krzysztof Kozlowski To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Nicolas Ferre , Claudiu Beznea , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Harini Katakam , Radhey Shyam Pandey Subject: [PATCH 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx Date: Mon, 25 Jul 2022 21:51:26 +0200 Message-Id: <20220725195127.49765-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet controller. The Versal compatible was not released, so it can be changed. Zynq-7xxx and Ultrascale+ has to be kept in new and deprecated form. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Cc: Harini Katakam Cc: Radhey Shyam Pandey --- Documentation/devicetree/bindings/net/cdns,macb.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/cdns,macb.yaml b/Documentation/devicetree/bindings/net/cdns,macb.yaml index 762deccd3640..77d3b73718e4 100644 --- a/Documentation/devicetree/bindings/net/cdns,macb.yaml +++ b/Documentation/devicetree/bindings/net/cdns,macb.yaml @@ -20,10 +20,17 @@ properties: - items: - enum: - - cdns,versal-gem # Xilinx Versal - cdns,zynq-gem # Xilinx Zynq-7xxx SoC - cdns,zynqmp-gem # Xilinx Zynq Ultrascale+ MPSoC - const: cdns,gem # Generic + description: deprecated + + - items: + - enum: + - xlnx,versal-gem # Xilinx Versal + - xlnx,zynq-gem # Xilinx Zynq-7xxx SoC + - xlnx,zynqmp-gem # Xilinx Zynq Ultrascale+ MPSoC + - const: cdns,gem # Generic - items: - enum: @@ -183,7 +190,7 @@ examples: #address-cells = <2>; #size-cells = <2>; gem1: ethernet@ff0c0000 { - compatible = "cdns,zynqmp-gem", "cdns,gem"; + compatible = "xlnx,zynqmp-gem", "cdns,gem"; interrupt-parent = <&gic>; interrupts = <0 59 4>, <0 59 4>; reg = <0x0 0xff0c0000 0x0 0x1000>; From patchwork Mon Jul 25 19:51: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: 12928332 X-Patchwork-Delegate: kuba@kernel.org 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 56D42CCA48F for ; Mon, 25 Jul 2022 19:51:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236699AbiGYTvg (ORCPT ); Mon, 25 Jul 2022 15:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236651AbiGYTvf (ORCPT ); Mon, 25 Jul 2022 15:51:35 -0400 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 2EBBB642E for ; Mon, 25 Jul 2022 12:51:34 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id e11so14365713ljl.4 for ; Mon, 25 Jul 2022 12:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NSvCdh1JnXJV9BbG2iR0o84dBDKvxPiIeG8bGlvazDU=; b=xsjZBnC1h16SdVwOv69103yJ7hO97v8dLs2zdN2O4KxVzHXqRwfphYqI8u8uTVZqfS xKxFQO7E0Ja7DGUJo7FxUWTZcRzByKZiLn4rnejAsufbrpvmKkJetJJRi5i8mF8c4uHp m3q82dp3fRMepzhpdrKnF/I5KM7B3Kb7ZkzFQ4UlwKeNSjaJ8wZFtN+zywJjZor4Tov5 jxY6aY8JcVxI+pmKqqq2BC4eztpitVV2Skt0SoSexnEO9jgFwzKlB7NbHPak97zvesfA E536fifPlfED1t8jHicLmTmnw2wCwdJ/is5eg0QSgNd2xdRZLUOvbj3woL42nF02FE5S AYeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NSvCdh1JnXJV9BbG2iR0o84dBDKvxPiIeG8bGlvazDU=; b=OwR5AfRN706vOz5AIZ064CtQgIPUBDN7a26srmvknVw36d3eGi9z19ewGtQGlesWS2 BmCADeEMWXI3M2seY8/lKUEhVZRsjUdiuPJULgK8v5Op4qv2cyDwELQ7O+v2u0lfmFJh TyRn4XlndfHBUgjL8lndljUYoX444uK/401aKBGmt3H7hz8bbTa7BfYfFM+rLVqZoa2s msR9aTARVKp40yMkkMmaoB8wEhfWTMSdPQ5tTvxFUEhb7OuilBo7kwjHRG440Hr9N1tP I1OkBzJR1LZy/oE9ogS9pwYohXKO4TZMI8V1qUXXth+5WzYFeXRmhxlqad0wN8otc18e E4Vg== X-Gm-Message-State: AJIora+JQEwFP8t7hu5P7MAEgo96F7kL5r+G5fjnA7sC6vusjE8m/Ou9 27zV2+nNOa1Ic+IXhw03BJLckw== X-Google-Smtp-Source: AGRyM1spGbsSycgVACNNAANYiq5JFc/Ei6oPs14LVv5I2tM/XVAm8OoPyqzI/f+mAcLTXancVL6+IA== X-Received: by 2002:a2e:8046:0:b0:25d:e520:8b80 with SMTP id p6-20020a2e8046000000b0025de5208b80mr4998856ljg.319.1658778692457; Mon, 25 Jul 2022 12:51:32 -0700 (PDT) Received: from krzk-bin.lan (78-26-46-173.network.trollfjord.no. [78.26.46.173]) by smtp.gmail.com with ESMTPSA id a20-20020a056512201400b004790a4ce3e5sm2824973lfb.278.2022.07.25.12.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 12:51:32 -0700 (PDT) From: Krzysztof Kozlowski To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Nicolas Ferre , Claudiu Beznea , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Harini Katakam , Radhey Shyam Pandey Subject: [PATCH 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx Date: Mon, 25 Jul 2022 21:51:27 +0200 Message-Id: <20220725195127.49765-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220725195127.49765-1-krzysztof.kozlowski@linaro.org> References: <20220725195127.49765-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Use correct vendor for Xilinx versions of Cadence MACB/GEM Ethernet controller. The Versal compatible was not released, so it can be changed. Zynq-7xxx and Ultrascale+ has to be kept in new and deprecated form. Signed-off-by: Krzysztof Kozlowski --- Cc: Harini Katakam Cc: Radhey Shyam Pandey --- drivers/net/ethernet/cadence/macb_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 4cd4f57ca2aa..63d23e341dad 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4797,14 +4797,16 @@ static const struct of_device_id macb_dt_ids[] = { { .compatible = "atmel,sama5d3-macb", .data = &sama5d3macb_config }, { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config }, { .compatible = "cdns,at91rm9200-emac", .data = &emac_config }, - { .compatible = "cdns,emac", .data = &emac_config }, - { .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config}, + { .compatible = "cdns,emac", .data = &emac_config }, /* deprecated */ + { .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config}, /* deprecated */ { .compatible = "cdns,zynq-gem", .data = &zynq_config }, { .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config }, { .compatible = "microchip,mpfs-macb", .data = &mpfs_config }, { .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config }, { .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config }, - { .compatible = "cdns,versal-gem", .data = &versal_config}, + { .compatible = "xlnx,zynqmp-gem", .data = &zynqmp_config}, + { .compatible = "xlnx,zynq-gem", .data = &zynq_config }, + { .compatible = "xlnx,versal-gem", .data = &versal_config}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, macb_dt_ids);