From patchwork Sun May 29 11:10:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12864158 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 E5CCBC433F5 for ; Sun, 29 May 2022 11:10:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229954AbiE2LK2 (ORCPT ); Sun, 29 May 2022 07:10:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229937AbiE2LK1 (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 CE09F7A463 for ; Sun, 29 May 2022 04:10:25 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id m20so16006143ejj.10 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=W1F4AuhQowOtZHQZCU6aHmphNkhLyOdF26E216ehNUV+qRHoA1aOeX+/bUMx4TYGNL uD3zv0M1NFfr2qyjYedfQO3GnzjcRpN5uaPLeew2aY331j4OrDO7W9qAFtGEo83bvNih aH04iJagiNDQA0oM65FMzmZJOu7fXecfqzV+L77srIF3gjVz8AtQGSyNxPI+06V2YY1w ziGaoIftG+Fm5mQW0oWL8StZqRhArKi5id+uozyXTmyd18gdWzC9jqBgz2hV3N28im// E5BoSnAztFjSlOw28XJaUW/e5zAHiT9aJLZ5H9tT0IaT1QnikJMlfUhQ7qPr2rTBsZwi EnBg== X-Gm-Message-State: AOAM532hoOcpxf9zrHfMgyD/8SR4b9etAzSYI9ByWiDodE0UNlbLP338 EGKm8l9KDaLim/96kJL9fteYuQ== X-Google-Smtp-Source: ABdhPJyJ1wAI1x+8OgmzP9eOjOPL/AP7OqXQtjePyQU8l4VkCQrTwGs/pAVpjCfcxOmFsJgEdcL+Lw== 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 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@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; } From patchwork Sun May 29 11:10:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12864159 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 A6A2CC433FE for ; Sun, 29 May 2022 11:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229958AbiE2LKa (ORCPT ); Sun, 29 May 2022 07:10:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229943AbiE2LK1 (ORCPT ); Sun, 29 May 2022 07:10:27 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 142E37A467 for ; Sun, 29 May 2022 04:10:27 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id y13so16138214eje.2 for ; Sun, 29 May 2022 04:10:26 -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=bs5DBrDYP0sNBpBiG9sxUl5vLBFzr14O34yIMD/h0nA=; b=qaOhJnDyEs6kctcS3mIPnzusmrpIIwicdocaEDl31DjnAwK97kNHZNUzdvP1LUYR3e NBkwEO4oM9OJypv+WKnT2k3VxCRzjHhCU4D6iERnxvX4ziadVonmv1NTYGXbVk6gRvCX pzepUVp/dyKcAR/9dEZeqJRb8VQLXZtJ2z4D5dWzCBq0Xgl/sP6gLteEBKMN0qa/veT2 aFoc3OPkSXiEZUP/pWO+YvzZef7NNh8GagxM53ils7KTOm5i6XrGcGV4+OwlJ0AJ/6n3 GIuF4NLiPLv9qD1O2HdzgtQjai/tfpVg17iq8FA4TbtV20webywr+GDLRfD4BdLfNXgN y83g== 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=bs5DBrDYP0sNBpBiG9sxUl5vLBFzr14O34yIMD/h0nA=; b=mvYgO62gGp53TiBD1wb/zjy9+TOf6bIbUbGfhnIImopCXVXHn6m35c5eTEcpVYF4Fr VvOy7Y4WvfwdMzd4egptU6LfZDDaZXtYW+VDjAahqoRkLetnvAUPrCFqyqlTccLodEym ybG6JeGV07cjse0+Dqm3hMMZTTS1b3HMx7/dbCM1p9XeTbevzl9/9Y7+8e00MIqeTWMT bfRSorB9WA3zYn5ElZ+AApQHE0StR2vh6AybPIleNBKGMLFO/fqwK+UjjP2rauzLrAZ/ A/9EVfhgiGNIDH0AkYIc0aC51QOJA5hxbIY9ZnQ0cbRGYhQTgeECggBBVRcZEy6ktWzu Yd8Q== X-Gm-Message-State: AOAM531Ua3/xIyIsrfTgjPkD0YnxAji0bBaanM/t+7mpynZzJW9lZFl1 KE51KPhRajWf2G1sDRDOhoiR5w== X-Google-Smtp-Source: ABdhPJx+u4MF8iq6avvPhns6VVqIcAsvksAUbgN+Qkn99OG8kj9/FnVxPTJNPlV7SjkKxfcImdWG5Q== X-Received: by 2002:a17:907:9626:b0:6fe:bae9:70bc with SMTP id gb38-20020a170907962600b006febae970bcmr35066248ejc.150.1653822625432; Sun, 29 May 2022 04:10:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 04:10:24 -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 2/2] ARM: dts: aspeed: yosemitev2: use proper "mellanox" DT vendor prefix Date: Sun, 29 May 2022 13:10:17 +0200 Message-Id: <20220529111017.181766-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220529111017.181766-1-krzysztof.kozlowski@linaro.org> References: <20220529111017.181766-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org "mlx" Devicetree vendor prefix is not documented and instead "mellanox" should be used: aspeed-bmc-facebook-yosemitev2.dtb: ethernet@1e660000: 'mlx,multi-host' does not match any of the regexes Signed-off-by: Krzysztof Kozlowski --- The change depends on net/ncsi change. --- arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts index 8864e9c312a8..26217bc652e7 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts @@ -95,7 +95,7 @@ &mac0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_rmii1_default>; use-ncsi; - mlx,multi-host; + mellanox,multi-host; }; &adc {