From patchwork Tue Jul 26 07:08:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 593628 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 DBF6BC433EF for ; Tue, 26 Jul 2022 07:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237797AbiGZHIJ (ORCPT ); Tue, 26 Jul 2022 03:08:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232155AbiGZHII (ORCPT ); Tue, 26 Jul 2022 03:08:08 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65B862A738 for ; Tue, 26 Jul 2022 00:08:07 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id b21so8522174ljk.8 for ; Tue, 26 Jul 2022 00:08:07 -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=CQeBl6bdxDYeiutOoPw95UwPjf3Fy7w8iw/mWArASvw=; b=zN85OL0I7XcwDr5+NXdtzJE9Fh3X0ESA9e60K/bAmY6lQrfN2CIkjbxud/H/HRN2fw muTda+NOORh3cEyWpi5ozfGxPXzvtigjCWdz4AIk8MUlCHZkp7rNa9RgGg6nAPXnrJ5F 4yYZ+IoOWFP2YNiSz9lnmoiafKNxzZ2aCNd3mrgfI70ksFwdRwGRKVf6NmlJ6BzXalX9 MBGiQGnySWa8nbgtlLJti+8eFDBXfMPeKJMcwv9TOE7meEDePeDxl7AjeUMzaGUGNoxB vUlxM+fhzkgizMJIEpR4phP1vxNhJdRcAxRCS2kuz1jnutS92Uy5m/6bQSKZazfwBucD zhew== 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=CQeBl6bdxDYeiutOoPw95UwPjf3Fy7w8iw/mWArASvw=; b=inCXlCqovI2VC3qzmGoweh6QEQ6IJeZgCu0KvrwN1L0FQXE9B8EPhgo+dQRnavO7Mc tj4CfxuGSHKo+4KXBzyNlVq7YbiP7aDaUxQvqawwV9ohx4ZHupbrtdZ5fBFwdZOdtf3V 17LidDvduezWMody8bryh2TbT+ecwVQqBtuHF3TTdF9eQQK2A+bbVsFHH1naI44LxNbf ELXarwyjj7Nryovx3YYUvwGaVX5XQqtHtnVDjlqO65F7asPG3DQ++Q96tr7/gZWdq5SA h0QuYcRrEcVqytReH/YB5lCx9867kUri4LS+eAnyO8vfw12/OBmjctZbMtxvuJxqtSeB 80LQ== X-Gm-Message-State: AJIora8/FbNWDiIYB3bIW+WJ99BGZT12TvDJsW/fIma5g4K9ebXgxwMw rDrQkp3zkehHjz0w3JH9UcNROg== X-Google-Smtp-Source: AGRyM1s9JECEg8k5On7lZDQn848nND8BHmVl/cB0lI4TDayD/8sEB5lu+MN960QDnjoslc2ylg71sA== X-Received: by 2002:a05:651c:516:b0:25d:e010:fb97 with SMTP id o22-20020a05651c051600b0025de010fb97mr5315117ljp.445.1658819285763; Tue, 26 Jul 2022 00:08:05 -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 q23-20020a05651232b700b0047f6b4a53cdsm3045061lfe.172.2022.07.26.00.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 00:08:05 -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 , Rob Herring , Harini Katakam , Radhey Shyam Pandey Subject: [PATCH v2 1/2] dt-bindings: net: cdns,macb: use correct xlnx prefix for Xilinx Date: Tue, 26 Jul 2022 09:08:01 +0200 Message-Id: <20220726070802.26579-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.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 --- Changes since v1: 1. Correct deprecated:true. 2. Add Rb tag. 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..dfb2860ca771 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 + deprecated: true + + - 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 Tue Jul 26 07:08:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 593897 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 A511CC433EF for ; Tue, 26 Jul 2022 07:08:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237923AbiGZHIW (ORCPT ); Tue, 26 Jul 2022 03:08:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237836AbiGZHIL (ORCPT ); Tue, 26 Jul 2022 03:08:11 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7AEA2A73A for ; Tue, 26 Jul 2022 00:08:08 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id w15so13304734lft.11 for ; Tue, 26 Jul 2022 00:08:08 -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=FFwyDOKCVC1F9VQI2rdR+Z/dXO4JHgYAt2jRGYaDNmI=; b=tZSlYhxHE0gI5K7hs0ttQbbMB6ZlXe3Xx+DIuP1RWHVuBrQDYYZZaXE12MHDmLvcBi vHkDE99D0zQtdLgQoR29wTFjgLOhYe37ARsAgVIdQlcblakixFsRRSTgnh/TE3KgSHpo YwpyTZ3exDjYhl5woQG7LsFj4ME379EOy4KrWp8ZNIBCPcnutlnj+n32HwOJdUAGzNBz 3haNMF+c5JcsBTurOiWZUpLEXsSUOOAFNxe/zgaf5ZophRCmFOPnv9Omj5L7pzghPtRz 76uieNjOEhEv1/y+XZbNBwbbyPSO5Jky+5GSo8JF+OJmZObQ295EnEQ3ONsLmxx9md8X cHbw== 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=FFwyDOKCVC1F9VQI2rdR+Z/dXO4JHgYAt2jRGYaDNmI=; b=A2WlxzNefCBodxIxRoJJjg+ojDP3bgA1FDk0xOV0bHFmgvK4YEAKEStfCiXr+UTqoQ BfhHuIkJuq4Kt9cPiWiJhuM5driHJY/oGYqsvrKdh6wjRr+wDFQOzdnBPEesaLpz2yfn S1MflAEuJteYNV1Zi658zwi0bGa8UtwllcrPfKTHvi3Jy8MHgAWfgGyYU6v4MD9ObJUH UpUYU/bzsGnJcG4gYC8v8copqVDBvihR45h8ivhEHvGwEkdeD74+7w3KhMsCvIs0qlh+ W8dZgTsd8PBN6aAa6xn7Ps5SzF1wCrXpu64ljZLpfegepAxTnNZVSsgb2JuMd/myq0x2 OQwA== X-Gm-Message-State: AJIora8HZY0pBKbFdELKZBTtBH4Ni3laJhfZ3y5dDJ9z8EVSIkXgZ9kX Bf0dSatiwv5axGKHxYLhwqy8S7XtL0VQ/LHG X-Google-Smtp-Source: AGRyM1skiIiWDoUeGXogcpcCVH2w68yaERq/Kp0SalhDw9Qx7enT9uhYjsxj8/6rFS3XFevIF18QwA== X-Received: by 2002:a05:6512:1085:b0:48a:9d35:4b8 with SMTP id j5-20020a056512108500b0048a9d3504b8mr1485929lfg.3.1658819287140; Tue, 26 Jul 2022 00:08:07 -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 q23-20020a05651232b700b0047f6b4a53cdsm3045061lfe.172.2022.07.26.00.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jul 2022 00:08:06 -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 v2 2/2] net: cdns,macb: use correct xlnx prefix for Xilinx Date: Tue, 26 Jul 2022 09:08:02 +0200 Message-Id: <20220726070802.26579-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220726070802.26579-1-krzysztof.kozlowski@linaro.org> References: <20220726070802.26579-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.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 --- Changes since v1: 1. None 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..494fe961a49d 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4798,13 +4798,15 @@ static const struct of_device_id macb_dt_ids[] = { { .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,zynq-gem", .data = &zynq_config }, + { .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config}, /* deprecated */ + { .compatible = "cdns,zynq-gem", .data = &zynq_config }, /* deprecated */ { .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);