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: 593336 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 3612ACCA48D for ; Mon, 25 Jul 2022 19:51:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236681AbiGYTvg (ORCPT ); Mon, 25 Jul 2022 15:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236574AbiGYTvf (ORCPT ); Mon, 25 Jul 2022 15:51:35 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EB3563B0 for ; Mon, 25 Jul 2022 12:51:34 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id p22so4545596lji.10 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=RYfvqiNioHhWwhsXoKxIUSkdUul9rRYdXbBkl7Tv3M+y3xfzVZsc3hmdHoelpZU9U3 GMGXozx65QUo4UrhasnZx+GugxKNqS6UvxEjjef+Frh0rVK305t7nexNL4x5sVCitLHq cGa1IDkoT7se7chtE5oA3orOJAnRFUJmpnVSRzNFEpHruwiToHsr0iNN3YyR87Kc3yBw YQz7IFWEHjwiACju1GCTb9or5C5M22GWeN9NEwe2WgGNx6g72a+gPC/+cHrlQyXK1Iyv V8cqOtLYSI+MoUMlUCKoPoDO2dVXl6/YU3X0Y5fxZKf6MbRTwC8RhMInlI+c5ikHCjoq HjyA== X-Gm-Message-State: AJIora9FTPLy1ZlR8F7mCXvqvp+PZ2qROHvX5y/nIrrzRrckICnANKJ2 w1+hEbLDO1ZgPsWVld7ooneSMg== 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: 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 --- 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);