Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp3414102ioo; Mon, 30 May 2022 01:13:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkwa5zdIFwhTrGfVXAhD67Wv0Rso2DjLhwxeyUJEUhSw4NYVEvI2P6iNityyIiEhYuv6Rx X-Received: by 2002:a17:902:e54c:b0:162:5c8e:2acd with SMTP id n12-20020a170902e54c00b001625c8e2acdmr28521213plf.30.1653898395219; Mon, 30 May 2022 01:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653898395; cv=none; d=google.com; s=arc-20160816; b=D7UuqUs4ATc9CiPsPSyCtb8a0V6xqdj8wDmMZFoPvVUgfJRy9BWuOoIDzSv41e++Di a+zn6Q45mCscX86qhMHmvCvl1iQ/97YGj09bjl46iU2wDyO8F+3H/3um/2zTCtT4HDuF jsGAWmlq/BBunIcW32UZqB9hS5qT04NDAhP4AtFsnau3xQNFdLiRFdq1/U9UPXenAEGK eyy8kSvSj+gal3UnP+77JXDazBZOjn3VUbVFCkoE/R2cY2uMsIPCUMMHuITUrzmhUq82 yafFS51tzysKqSl+X9S87xffT5/eZ75gCFTLJTfL0aPyLlLnQHspB7ztsUJ0CkPIMuS8 qxcA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Iy/F7uqP/QJ+JhJfiMPaLwgsjVlSR1sJFsXemWM3y5M=; b=XgRqJ1bH4wbi+q67ETi1OFbUIw7Lu2jRby/lqHu7PWZHv6iL/+TWnS0OLvEtU0EI0L UvK3Uth+o4w2+lC9Hehd9CFbPaX05sIgZDR+FWkPR3aXZeNcWABlcjNBmk45IZX1DZrs doch+BQW/SlicrVdqOsrp/8IFHjuhOK3Z9i+FucBrMXfnPMi5uXVbfZjgYJBq4wwZoVe zSXcO9CS6K3wkRhaAe1Cn9Gioapy2IfapZdEuSzsfDMAWsPjsqTcMJQI9wCTQGYYcj4Y K2JhsCaqmwYmKyOmUwloZk4qnwexdJiiFnV/JzmUdi+Eughbv7kqbPnBcZNNmL2GlxWE dpZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="UD/IIWn1"; 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=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e193-20020a6369ca000000b003c67a501c74si15866723pgc.636.2022.05.30.01.13.02; Mon, 30 May 2022 01:13:15 -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=@linaro.org header.s=google header.b="UD/IIWn1"; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229953AbiE2LK2 (ORCPT + 99 others); Sun, 29 May 2022 07:10:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbiE2LK1 (ORCPT ); Sun, 29 May 2022 07:10:27 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5A617A460 for ; Sun, 29 May 2022 04:10:25 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id y13so16138172eje.2 for ; Sun, 29 May 2022 04:10:25 -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=Iy/F7uqP/QJ+JhJfiMPaLwgsjVlSR1sJFsXemWM3y5M=; b=UD/IIWn1gRH+c3m2RcFFnI/6dzrWKsaPfaKlE/5FHsXq+P6MmJf9bjE6eR0BGNdQGV isYY9q4ss901WSypLH0hEZQLxNVVK//qZ2VPw/JkwgPm2DnCTjlniBj8FrS37QJJ8xVz lkCY9mz9loP0fSJxFYoHVBIXTobXxk7el8bfQ0gWnFstc+g+FBXcOn9qT259CYURBMLQ 9eSkks2nCNBbAll+7pyuWPgy5tgZh9745/mrKz4swOGQ0JBdRUY0VdF/iQnnBvr/b+J3 UzP5zVo8783Ktqsx0MGXb79w1ulcJekQuSxG5afNW7fP6AU0wThoBIOnf8nabOJUebR5 tS3A== 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=Iy/F7uqP/QJ+JhJfiMPaLwgsjVlSR1sJFsXemWM3y5M=; b=51+o5VgoGVpwtGQazh15F/QlbwBtIQhxmCSAHpmvyZlqobu6dJqAYpY8vB1QlUydZV UfvVPrBSaluT1l8M2avBg+18l2ufgx8zSmwOmMMa5gOToTi64PLWPG5XLLAAeTRPH/u6 GqvI9Qr90Hn/3b01cuDHZDMy1t44MR5UjZU1Sv1qG4X/84byExBkUsXozqEBFviQX/fW JZuAklkCvooU0r2l4BggMZbbCHrzo54dk2hcTcvoeMHbGVv1BW+C/zisqy40PM4HyFrW qg83c7YmDcNE+ssMwWFN6WjKnVGWfzNmHX0T6Owb7mLehRJhErWW/280p2vaE6rSfbH2 8kcQ== X-Gm-Message-State: AOAM533cn9TAEJSMSuBKXdXPb7Rie4eV/Jg/+aDyHkLdhBMDlHkrmT+O 7c+Ty7nV8xY8m0W9QU1Z03GDOA== X-Received: by 2002:a17:907:6294:b0:6e1:ea4:74a3 with SMTP id nd20-20020a170907629400b006e10ea474a3mr44381372ejc.168.1653822624272; Sun, 29 May 2022 04:10:24 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id d3-20020a1709063ec300b006fee2bdf6c6sm3073996ejj.169.2022.05.29.04.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 04:10:23 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Joel Stanley , Andrew Jeffery , Samuel Mendoza-Jonas , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] net/ncsi: use proper "mellanox" DT vendor prefix Date: Sun, 29 May 2022 13:10:16 +0200 Message-Id: <20220529111017.181766-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 "mlx" Devicetree vendor prefix is not documented and instead "mellanox" should be used. Signed-off-by: Krzysztof Kozlowski --- net/ncsi/ncsi-manage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index 78814417d753..80713febfac6 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -1803,7 +1803,8 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev, pdev = to_platform_device(dev->dev.parent); if (pdev) { np = pdev->dev.of_node; - if (np && of_get_property(np, "mlx,multi-host", NULL)) + if (np && (of_get_property(np, "mellanox,multi-host", NULL) || + of_get_property(np, "mlx,multi-host", NULL))) ndp->mlx_multi_host = true; } -- 2.34.1