From patchwork Wed Aug 31 16:01:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 601554 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 F027DC3DA6B for ; Wed, 31 Aug 2022 16:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229710AbiHaQBo (ORCPT ); Wed, 31 Aug 2022 12:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231146AbiHaQBf (ORCPT ); Wed, 31 Aug 2022 12:01:35 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06956AB422; Wed, 31 Aug 2022 09:01:32 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id s11so18963334edd.13; Wed, 31 Aug 2022 09:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=jTX8ciu6MM6kgsSC213n8sDxvwY7rre4HofaV+9C3Tw=; b=D58ojdePdXla0PutIXEtK2KoSd7YzyWkO7OU9M8mpMr2HK/UyAXGrh3WQYbTUIFMoh LsIiOgH97zEUuxmutMd+jUZTxayGsn8e+RVk3+2yCb4hgRG/AvHFwUxcFmu5gpi8XT4E BrjV8SSxl7Gqc/tkd/jYOBMTIKnwfy2iwcZH9NfR35v+S9V6rIacaQQqduTFmET1HJNe pUWfRJ7HvWmqnmrZ2zVa5TcnPAgOAVg8V+lx6/SUpwDML4fX8mWsqD59W5SzX4m7dBgF FLNRNPMIs9/DZK6Tx/PJt13STT6t/xkqqyCMr6gdOXx4Lz0WqC2TptBGBJcA2n4a6+cH gcaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=jTX8ciu6MM6kgsSC213n8sDxvwY7rre4HofaV+9C3Tw=; b=0OGwY5xSLKO3GppLpf2kcX6X3HEbuE+AXb1pH8NnjYDiMFkEi+/w2krzmP1EjebFFy If7Mg5195aOLPMQZguQ4XLtFPhx9n4XYJhjSjc++oiYJTiRl6FT4vdbfbiZC9aP9JyoI fLWVkZIbIFDfzWQ+G3gCNTe/s2kHTLqNMLBwX0deRw34VoNKFJ18ZzMVqHZcmzw0B1NO YLBVjSz3W1du8mNRvu41YDpFPq10hj2UF15UZw00RnW7yeCR/y7JzgLf+3d4w/l/VPLy WJfzjjkOtRXLunimPjHM/tRLLT+e4H3eBj0tRfMgAqdqh6PGsP7ncUt5e70o1NuqhVZd Q5ug== X-Gm-Message-State: ACgBeo1yTbPBvKpmkFdZ2N2VXBOcxeo47KFP1QnprvHMbm9uU7eEYTMZ m9zaIno2Kj3txX9tMmEAVDEN1u6m7ts= X-Google-Smtp-Source: AA6agR6q5o4JKOXL+5ezK2ZEW9QodxCl2btvVUaDRDOLyaPHsj1w2IWXS+22BDWupvAbUY7pkFH75g== X-Received: by 2002:a05:6402:4517:b0:443:7fe1:2d60 with SMTP id ez23-20020a056402451700b004437fe12d60mr25340103edb.133.1661961690054; Wed, 31 Aug 2022 09:01:30 -0700 (PDT) Received: from localhost.localdomain ([188.27.184.197]) by smtp.gmail.com with ESMTPSA id b5-20020a17090630c500b0073dde7c1767sm7277537ejb.175.2022.08.31.09.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Aug 2022 09:01:29 -0700 (PDT) From: Vladimir Oltean To: devicetree@vger.kernel.org Cc: netdev@vger.kernel.org, Shawn Guo , Li Yang , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Michael Walle , Vladimir Oltean Subject: [PATCH v2 devicetree 1/3] arm64: dts: ls1028a: move DSA CPU port property to the common SoC dtsi Date: Wed, 31 Aug 2022 19:01:22 +0300 Message-Id: <20220831160124.914453-2-olteanv@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220831160124.914453-1-olteanv@gmail.com> References: <20220831160124.914453-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Vladimir Oltean Since the CPU port 4 of the switch is hardwired inside the SoC to go to the enetc port 2, this shouldn't be something that the board files need to set (but whether that CPU port is used or not is another discussion). So move the DSA "ethernet" property to the common dtsi. Signed-off-by: Vladimir Oltean Acked-by: Michael Walle --- v1->v2: keep 'status' property last .../boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 1 - arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 1 - arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 1 - arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts index 6b575efd84a7..52ef2e8e5492 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts @@ -104,7 +104,6 @@ &mscc_felix_port3 { }; &mscc_felix_port4 { - ethernet = <&enetc_port2>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts index 330e34f933a3..37c20cb6c152 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts @@ -60,6 +60,5 @@ &mscc_felix_port1 { }; &mscc_felix_port4 { - ethernet = <&enetc_port2>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts index e0cd1516d05b..7285bdcf2302 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts @@ -278,7 +278,6 @@ &mscc_felix_port3 { }; &mscc_felix_port4 { - ethernet = <&enetc_port2>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 5627dd7734f3..1215fcdf70fa 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -1156,6 +1156,7 @@ mscc_felix_port3: port@3 { mscc_felix_port4: port@4 { reg = <4>; phy-mode = "internal"; + ethernet = <&enetc_port2>; status = "disabled"; fixed-link { From patchwork Wed Aug 31 16:01:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 601553 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 44591ECAAD1 for ; Wed, 31 Aug 2022 16:01:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231331AbiHaQBq (ORCPT ); Wed, 31 Aug 2022 12:01:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231290AbiHaQBn (ORCPT ); Wed, 31 Aug 2022 12:01:43 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80A38AE9CA; Wed, 31 Aug 2022 09:01:36 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id a36so15187505edf.5; Wed, 31 Aug 2022 09:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=EmNOHW8dOBfji1wkjcTQmmq1Mj0tjVV6eLhD3GgRB/g=; b=iPzGBtmsyIlRowO01qTXhasG0NLWdlzZwl/O3IlBP3urBRqmLeHlHQUduHBqbN8eaz IFCcNdL5ccd6/YBh5OykW9i1vXKvhwh2kSqjAzExcad5bYMzLp8Dq6apPeHQmj+WAAPg uZc1knE24OFoP2zfsEiWGxdV4qKioFaCqC/UI2OXh3xhW3xyTtqbIfrMiFcdL05NI24n x+oD4RwT5biLqIx8PQh/w+/Z9DwWZOh3Pm2gDg6dXcdOdt9oDruOcVBYvyYXQvsvIHMt Z10YmakIfVehoTPiJBvbK97UwOFjbkEop6dTgWUx7kso/mwhsESEG+8PcWEWrVMlu+f6 p0VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=EmNOHW8dOBfji1wkjcTQmmq1Mj0tjVV6eLhD3GgRB/g=; b=CSHwQ50HvjlAXH3UqEOzSNel3aJstofxqZ4TFT2Kr9oYdTVijvX70d+qJGJVJOsn3U KuwjW01fsM3Av9mXKE1mDVAdFbqljhQsQwyZHF/WgzYr2XBU15USY5h/pBlRczINr4wr wjM8fS/Pc4TUKfO7F0FW9EN94wMVKcTPpcwTB4FWrDQc7A8Fx9mvmXsiPB70VNUNmgKG T6FMnbmj7J80W1pbmuRuZrvQgpyb1ruYFBQ7HxrGudqGrGI+LE1qlvAz+4zKvrz25BK4 F/xNTbhIZyao5qp4ozJ6Pw+8cPruGMgMXD7A2Hii+mSKem2BNbYCSPfrkWJJvPczoJzG slgg== X-Gm-Message-State: ACgBeo0rsRV+dEFyPHjjm0MIQRZ+oSRl5Jt3vfbWvAgkeCHnMr3P9tfC AkcS95h3y8P+2wNoN2pR0VafOmpKTic= X-Google-Smtp-Source: AA6agR7/mG+nWnFFyl//A8+WrZ8yAr1i9FETVTqXy2AMVt9YUhAeyE8y0SOWAJQjm5QcsfsWpYrtlw== X-Received: by 2002:aa7:c3c2:0:b0:447:7d68:7187 with SMTP id l2-20020aa7c3c2000000b004477d687187mr24775177edr.400.1661961694515; Wed, 31 Aug 2022 09:01:34 -0700 (PDT) Received: from localhost.localdomain ([188.27.184.197]) by smtp.gmail.com with ESMTPSA id b5-20020a17090630c500b0073dde7c1767sm7277537ejb.175.2022.08.31.09.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Aug 2022 09:01:33 -0700 (PDT) From: Vladimir Oltean To: devicetree@vger.kernel.org Cc: netdev@vger.kernel.org, Shawn Guo , Li Yang , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Michael Walle , Vladimir Oltean Subject: [PATCH v2 devicetree 3/3] arm64: dts: ls1028a: enable swp5 and eno3 for all boards Date: Wed, 31 Aug 2022 19:01:24 +0300 Message-Id: <20220831160124.914453-4-olteanv@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220831160124.914453-1-olteanv@gmail.com> References: <20220831160124.914453-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Vladimir Oltean In order for the LS1028A based boards to benefit from support for multiple CPU ports, the second DSA master and its associated CPU port must be enabled in the device trees. This does not change the default CPU port from the current port 4. Signed-off-by: Vladimir Oltean Acked-by: Michael Walle --- v1->v2: none .../dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts | 8 ++++++++ .../boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts | 8 ++++++++ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts index 52ef2e8e5492..73eb6061c73e 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-kbox-a-230-ls.dts @@ -59,6 +59,10 @@ &enetc_port2 { status = "okay"; }; +&enetc_port3 { + status = "okay"; +}; + &i2c3 { eeprom@57 { compatible = "atmel,24c32"; @@ -107,6 +111,10 @@ &mscc_felix_port4 { status = "okay"; }; +&mscc_felix_port5 { + status = "okay"; +}; + &sata { status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts index 37c20cb6c152..113b1df74bf8 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var2.dts @@ -39,6 +39,10 @@ &enetc_port2 { status = "okay"; }; +&enetc_port3 { + status = "okay"; +}; + &mscc_felix { status = "okay"; }; @@ -62,3 +66,7 @@ &mscc_felix_port1 { &mscc_felix_port4 { status = "okay"; }; + +&mscc_felix_port5 { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts index 7285bdcf2302..e33725c60169 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts @@ -151,6 +151,10 @@ &enetc_port2 { status = "okay"; }; +&enetc_port3 { + status = "okay"; +}; + &esdhc { sd-uhs-sdr104; sd-uhs-sdr50; @@ -281,6 +285,10 @@ &mscc_felix_port4 { status = "okay"; }; +&mscc_felix_port5 { + status = "okay"; +}; + &optee { status = "okay"; };