From patchwork Sat Jun 3 14:16:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 689121 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 8A14FC7EE2C for ; Sat, 3 Jun 2023 14:17:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230142AbjFCORB (ORCPT ); Sat, 3 Jun 2023 10:17:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbjFCORA (ORCPT ); Sat, 3 Jun 2023 10:17:00 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D11A194 for ; Sat, 3 Jun 2023 07:16:53 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-9741caaf9d4so456834266b.0 for ; Sat, 03 Jun 2023 07:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685801811; x=1688393811; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wN8gwd6nUNym8bOF4GRy9fU5N1hUADVXnhxOBBUdhGY=; b=hDFBK0tGri9HLEG42Qe30NkJotpLV0lgbC2/QYygLsbTp+OSHNvCTo55kYr58xdRO+ PAf70b//dRtq+GE99HNDfs97lXXHFTlfKRtwHJrSya4Wyn5jVczX7SYPMo/ZYaRc3UKB 4jyNxslgttLePV3rStcdzH7AN286DiP17xHqQcl9vuNxDqxE+VV/9F/qmL7Vg57Tdm5P 3yrpcJ67zv5Y3Jncgv0rSMkkJTG5lzkkVF/vZgAOUZMgtOpEEWjhGwpg8myf2DRNEYNW CQHPYRqNbNnnmVBUIFCLpzwxzCJJQ7tXonFePvUu5VIH2WRIXPi0ESCLISV5019TSuyb EdDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801811; x=1688393811; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wN8gwd6nUNym8bOF4GRy9fU5N1hUADVXnhxOBBUdhGY=; b=Mh2lIRxHGNwyT991flG5M4z++BCcxwVXgVNPPzgekdCee7vQhBaELU6IF/nDoxYqtq hc6mYxjlZUY9u64G3bc/G146KCVr5yWYPJcO4BgKbIpNXwJP8QTB34zrppdHkStGU/x6 Q5i4iOF3Ms9gTMIZKvJEx0GpQqKUSCpxTNvdpCgap8dXo2lY+6hD8Hj5TuS8Qgq4Daif zT1Fn3GTotg/kcU/JsswXxbArmsbXTPVHasS4mrkgDpB51CEAhSZ8rJ3F/Nu/Z5cv+rL rzcnu5s7rSJ9MECzxiLNo9n/6Rw6bpIiLD/Bth7dBaRDLnBJh/yvfNPXv3HnSoJkHU33 I4aQ== X-Gm-Message-State: AC+VfDz2iu02Tki7Pk/USivBDa5GBKYBRZE3tHn5JEef1lBITmuxEvic luYYlwwNEJv0+gVvwQ6TU74= X-Google-Smtp-Source: ACHHUZ4hufg9VQnqNwTvKTMzDRR1yjcHeLHRPccapyRHSG5e2ipm+Bv+12I5Vb/pykU/wgfq9Y5nIw== X-Received: by 2002:a17:907:36cd:b0:974:4457:b6f with SMTP id bj13-20020a17090736cd00b0097444570b6fmr1842064ejc.23.1685801811549; Sat, 03 Jun 2023 07:16:51 -0700 (PDT) Received: from shift.daheim (p5b0d7f08.dip0.t-ipconnect.de. [91.13.127.8]) by smtp.gmail.com with ESMTPSA id b13-20020a056402138d00b0050c0b9d31a7sm1829759edv.22.2023.06.03.07.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:16:51 -0700 (PDT) Received: from chuck by shift.daheim with local (Exim 4.96) (envelope-from ) id 1q5S3m-001osT-1c; Sat, 03 Jun 2023 16:16:50 +0200 From: Christian Lamparter To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Cc: Florian Fainelli , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH v1 1/3] ARM: MR26: MR32: remove bogus nand-ecc-algo property Date: Sat, 3 Jun 2023 16:16:48 +0200 Message-Id: <869354dba00f01d4e6bde897a44180ad1658389c.1685801691.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org | bcm53015-meraki-mr26.dtb: nand-controller@18028000: | nand@0:nand-ecc-algo:0: 'hw' is not one of ['hamming', 'bch', 'rs'] | From schema: Documentation/[...]/nand-controller.yaml | bcm53016-meraki-mr32.dtb: nand-controller@18028000: | nand@0:nand-ecc-algo:0: 'hw' is not one of ['hamming', 'bch', 'rs'] | From schema: Documentation/[...]/nand-controller.yaml original ECC values for these old Merakis are sadly not provided by the vendor. It looks like Meraki just stuck with what Broadcom's SDK was doing... which left it up to their proprietary nand driver. It's clear at least that they used the hardware's ecc engine, so update the device-tree file accordingly to specify the nand-controller as the ecc-engine. this patch also removes the partition index numbers from the MR32's partition node-names and does some whitespace removal in order to fit the comment about the partition oddities into the 100 characters per limit. Fixes: 935327a73553 ("ARM: dts: BCM5301X: Add DT for Meraki MR26") Fixes: ec88a9c344d9 ("ARM: BCM5301X: Add DT for Meraki MR32") Reported-by: Rafał Miłecki (via mail) Signed-off-by: Christian Lamparter mr32 --- arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 68 +++++++++-------- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 88 ++++++++++++---------- 2 files changed, 86 insertions(+), 70 deletions(-) diff --git a/arch/arm/boot/dts/bcm53015-meraki-mr26.dts b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts index a2eee9a1e5a7..9ea4ffc1bb71 100644 --- a/arch/arm/boot/dts/bcm53015-meraki-mr26.dts +++ b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts @@ -9,7 +9,6 @@ /dts-v1/; #include "bcm4708.dtsi" -#include "bcm5301x-nand-cs0-bch8.dtsi" #include / { @@ -73,41 +72,50 @@ &gmac3 { status = "disabled"; }; -&nandcs { - nand-ecc-algo = "hw"; +&nand_controller { + nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + #address-cells = <1>; + #size-cells = <1>; - partitions { - compatible = "fixed-partitions"; - #address-cells = <0x1>; - #size-cells = <0x1>; + nand-ecc-engine = <&nand_controller>; + nand-ecc-strength = <8>; + nand-ecc-step-size = <512>; - partition@0 { - label = "u-boot"; - reg = <0x0 0x200000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <0x1>; + #size-cells = <0x1>; - partition@200000 { - label = "u-boot-env"; - reg = <0x200000 0x200000>; - /* empty */ - }; + partition@0 { + label = "u-boot"; + reg = <0x0 0x200000>; + read-only; + }; - partition@400000 { - label = "u-boot-backup"; - reg = <0x400000 0x200000>; - /* empty */ - }; + partition@200000 { + label = "u-boot-env"; + reg = <0x200000 0x200000>; + /* empty */ + }; - partition@600000 { - label = "u-boot-env-backup"; - reg = <0x600000 0x200000>; - /* empty */ - }; + partition@400000 { + label = "u-boot-backup"; + reg = <0x400000 0x200000>; + /* empty */ + }; - partition@800000 { - label = "ubi"; - reg = <0x800000 0x7780000>; + partition@600000 { + label = "u-boot-env-backup"; + reg = <0x600000 0x200000>; + /* empty */ + }; + + partition@800000 { + label = "ubi"; + reg = <0x800000 0x7780000>; + }; }; }; }; diff --git a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts index b6a066f949ad..bca39b30ace8 100644 --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts @@ -9,7 +9,6 @@ /dts-v1/; #include "bcm4708.dtsi" -#include "bcm5301x-nand-cs0-bch8.dtsi" #include / { @@ -124,49 +123,58 @@ &pwm { pinctrl-0 = <&pinmux_pwm>; }; -&nandcs { - nand-ecc-algo = "hw"; - - partitions { - /* - * The partition autodetection does not work for this device. - * It will only detect the "nvram" partition with an incorrect size. - * [ 1.721667] 1 bcm47xxpart partitions found on MTD device brcmnand.0 - * [ 1.727962] Creating 1 MTD partitions on "brcmnand.0": - * [ 1.733117] 0x000000400000-0x000008000000 : "nvram" - */ - - compatible = "fixed-partitions"; - #address-cells = <0x1>; - #size-cells = <0x1>; - - partition0@0 { - label = "u-boot"; - reg = <0x0 0x100000>; - read-only; - }; +&nand_controller { + nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + #address-cells = <1>; + #size-cells = <1>; - partition1@100000 { - label = "bootkernel1"; - reg = <0x100000 0x300000>; - read-only; - }; + nand-ecc-engine = <&nand_controller>; + nand-ecc-strength = <8>; + nand-ecc-step-size = <512>; + + partitions { + /* + * The partition autodetection does not work for this device. + * It will only detect the "nvram" partition with an incorrect size. + * [ 1.721667] 1 bcm47xxpart partitions found on MTD device brcmnand.0 + * [ 1.727962] Creating 1 MTD partitions on "brcmnand.0": + * [ 1.733117] 0x000000400000-0x000008000000 : "nvram" + */ + + compatible = "fixed-partitions"; + #address-cells = <0x1>; + #size-cells = <0x1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x100000>; + read-only; + }; - partition2@400000 { - label = "nvram"; - reg = <0x400000 0x100000>; - read-only; - }; + partition@100000 { + label = "bootkernel1"; + reg = <0x100000 0x300000>; + read-only; + }; - partition3@500000 { - label = "bootkernel2"; - reg = <0x500000 0x300000>; - read-only; - }; + partition@400000 { + label = "nvram"; + reg = <0x400000 0x100000>; + read-only; + }; - partition4@800000 { - label = "ubi"; - reg = <0x800000 0x7780000>; + partition@500000 { + label = "bootkernel2"; + reg = <0x500000 0x300000>; + read-only; + }; + + partition@800000 { + label = "ubi"; + reg = <0x800000 0x7780000>; + }; }; }; }; From patchwork Sat Jun 3 14:16:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 688841 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 939B4C77B7A for ; Sat, 3 Jun 2023 14:17:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbjFCORA (ORCPT ); Sat, 3 Jun 2023 10:17:00 -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 S229518AbjFCOQ6 (ORCPT ); Sat, 3 Jun 2023 10:16:58 -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 0F5C8132 for ; Sat, 3 Jun 2023 07:16:53 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5149429c944so4711432a12.0 for ; Sat, 03 Jun 2023 07:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685801811; x=1688393811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0DuN3B2LHcvuyeOBQFxhqHb1y+/3rfI7vxY3GV4q50s=; b=pyqX5QaoYeFKEDQ1fiXJf5ZHrruPzMn20N3+hZ/Ni1NJYn16m0OFjyzBrQQivATsck sEOM9kp3fDU6MyxFXyhPh8n28RTCC9VxvQNVXpbn6iHh0YkOP+hnMxrCUw+ZvHQEoOYG MNYIyt3CzaTJUmSoua2ZiYEdAT8QQcl/QXPi+s9ABQCXe8aIIVorcZyj8J72D1Kp5SXV KQDfpoCkXVoTAPNyHBUO6UOFDf0i+ZNBwPNqd7vOuxdaVmrEWTjXXSiqF5lq0QfMcT2Q 6uu9xRU83Q8tMX/j7j7dFkNtqgRDpS85m8Dme9Q8FpmKMosvtw1eWtbInC8SJpT49QvH ZdVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801811; x=1688393811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0DuN3B2LHcvuyeOBQFxhqHb1y+/3rfI7vxY3GV4q50s=; b=HLJEp49SIdkzJtM/Xh8Y7VqiJIsRMrmk3U50+rfv7Ex40pmPwqbnO/C83TkyG23/ac cCqa9n/+VvD2PmPtlOk26D2V/8bYR6Ei3gwP2l+iK8+omGx1RcoUJSnSlwCndnSYlixJ jcnbbX6eofyJEOUS5pAkjyRIrkJlgrea7YPYfiC6elKdZ/eoAscY7cb4uCy0oTv+xX7d GLES8dN0qNag+ZJMo+26VII9gCdcnVbKz3+vKP8IBWeImxoVJ+/zBvmsBOjRuNoYDuPW iT8qz1GtfJ5zM5sz9Y34cFx9eX16eGbmjFpXtk/Mm5mirDtdNZaagjZDWd1Ijqnd328/ sRYw== X-Gm-Message-State: AC+VfDwaWg4VJWmlmajHo8RtMAhotl8F9gTbPexhJ8xlZUiva2ERyh7y PJGA6GoSViGs409sRCHP0FQ= X-Google-Smtp-Source: ACHHUZ65+5VW+x5obrGeuCUTvPoKnJehYp5FQH0UpkRRaAmT6pe22h+zlscAb1/4unduIbbMzrKt+A== X-Received: by 2002:aa7:da48:0:b0:514:a5f3:be61 with SMTP id w8-20020aa7da48000000b00514a5f3be61mr3996009eds.31.1685801811320; Sat, 03 Jun 2023 07:16:51 -0700 (PDT) Received: from shift.daheim (p5b0d7f08.dip0.t-ipconnect.de. [91.13.127.8]) by smtp.gmail.com with ESMTPSA id d13-20020a05640208cd00b0051643d71ce9sm1288204edz.26.2023.06.03.07.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:16:51 -0700 (PDT) Received: from chuck by shift.daheim with local (Exim 4.96) (envelope-from ) id 1q5S3m-001osW-1g; Sat, 03 Jun 2023 16:16:50 +0200 From: Christian Lamparter To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Cc: Florian Fainelli , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH v1 2/3] ARM: MR26: fix dt schema violations Date: Sat, 3 Jun 2023 16:16:49 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <869354dba00f01d4e6bde897a44180ad1658389c.1685801691.git.chunkeey@gmail.com> References: <869354dba00f01d4e6bde897a44180ad1658389c.1685801691.git.chunkeey@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org fixes the "duplex-full" typo, adds phy-modes for the internal switch and the PHY-chip. This also includs adding pause support for the internal cpu port. Furthermore, both erronous unit properties in the gpio-keys node are removed (#size-cells, #address-cells don't belong here). | ports:port@5:fixed-link: 'oneOf' conditional failed, one must be fixed: | 'anyOf' conditional failed, one must be fixed: | {'speed': [[1000]], 'duplex-full': True} is not of type 'array' | 'duplex-full' does not match any of the regexes | ports:port@5: 'phy-mode' is a required property | keys: '#address-cells', '#size-cells' do not match any of the regexes: | [...] From schema: gpio-keys.yaml Fixes: 935327a73553 ("ARM: dts: BCM5301X: Add DT for Meraki MR26") Signed-off-by: Christian Lamparter --- arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm53015-meraki-mr26.dts b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts index 9ea4ffc1bb71..9acadf393dd9 100644 --- a/arch/arm/boot/dts/bcm53015-meraki-mr26.dts +++ b/arch/arm/boot/dts/bcm53015-meraki-mr26.dts @@ -38,8 +38,6 @@ led-1 { keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; key-restart { label = "Reset"; @@ -127,16 +125,19 @@ ports { port@0 { reg = <0>; label = "poe"; + phy-mode = "rgmii"; }; port@5 { reg = <5>; label = "cpu"; ethernet = <&gmac0>; + phy-mode = "internal"; fixed-link { speed = <1000>; - duplex-full; + full-duplex; + pause; }; }; }; From patchwork Sat Jun 3 14:16:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 689122 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 A7BA3C7EE24 for ; Sat, 3 Jun 2023 14:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230121AbjFCOQ7 (ORCPT ); Sat, 3 Jun 2023 10:16:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbjFCOQ6 (ORCPT ); Sat, 3 Jun 2023 10:16:58 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2522A133 for ; Sat, 3 Jun 2023 07:16:53 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5149c51fd5bso4456180a12.0 for ; Sat, 03 Jun 2023 07:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685801811; x=1688393811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O54gSo+fwIZHpUPtsacTlq8N4OyPd5rKpC6/rcb62mk=; b=jftqAIeO9/e/T5dFo8TeLbAje15pg3JVWxxGAGO/up+9Apj6dQLTykDeQhrgyiiJU3 C0tG4D5kUqLp62amF5C3nnA5yaEvWJEaJv3qv5FKhGJc+7ZAeem69xNw1nVdtFrxN94g jgna6H9ZUoKVSXcJLa8duySAk28/WRAaX9qsGTpYBkrKPcJUvEyLtGDdSD5MfBYY2Wo6 nFdApzSf+x+ZgMBrsBXyFrxmj0Ms9rTqIaX88l544jl0Lt/Pb7pMhFUs7HFAKQhbWmZ1 cS2aJuU6764gCaBy0vkl35FUMyf+vxv8coTW3vcPh3KcziF4CC+V3gS0u+Aa7F07kpKW 9pZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685801811; x=1688393811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O54gSo+fwIZHpUPtsacTlq8N4OyPd5rKpC6/rcb62mk=; b=YeDFJx01q0+i1hYFgDJjvGOm3oF1Ym0NpNLPcWfL8VxQXN5o/1ImpPg7kAFo0nAumz FPaA9tr1smXqqqtoV0iVgNwfEiYkMKPjrYCyStreG0eh/LUYEvbJ4CX/+pySOKwUChsA 58iTZsvZY9FS7AIZlZJw5ZPGBFFbv7dvor2ar2kgVDGAskilnP2lVvIZJMyIKQIOl5Qi Q6wSAF2NO1QXcmpVlnO7ISHHImi5v6y55j2rm+XB1q7I5Jk7oClX6rFNIg87Y2RIVGYL O/h9Omx8qRxbXG7ERw0IgY0ssl2WpanIqaLYzc3Jw/pegkdmdu2QMFhGgO6RD+B4zdRq 3zQw== X-Gm-Message-State: AC+VfDwSHDNsKBHuO0hX1e+rCInGWDmlNLRhuv1wBZ4KozMDc6oet4VA QCcFSNdHdYpXOvK2wu9OBNU= X-Google-Smtp-Source: ACHHUZ7O5+bzZmIbUuXuY51BZS4e5mKKjwMt3gsJra08cWTcdYXFAeeRPDmcKScHQEM5phGCw7CRYQ== X-Received: by 2002:aa7:cb54:0:b0:504:8014:1554 with SMTP id w20-20020aa7cb54000000b0050480141554mr4493966edt.28.1685801811428; Sat, 03 Jun 2023 07:16:51 -0700 (PDT) Received: from shift.daheim (p5b0d7f08.dip0.t-ipconnect.de. [91.13.127.8]) by smtp.gmail.com with ESMTPSA id d6-20020a056402000600b0050690bc07a3sm1832740edu.18.2023.06.03.07.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 07:16:51 -0700 (PDT) Received: from chuck by shift.daheim with local (Exim 4.96) (envelope-from ) id 1q5S3m-001osZ-1j; Sat, 03 Jun 2023 16:16:50 +0200 From: Christian Lamparter To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Cc: Florian Fainelli , Hauke Mehrtens , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley Subject: [PATCH v1 3/3] ARM: MR32: fix dt schema violations Date: Sat, 3 Jun 2023 16:16:50 +0200 Message-Id: <7db1786220cb6948bbddcecda17147908d25f91c.1685801691.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <869354dba00f01d4e6bde897a44180ad1658389c.1685801691.git.chunkeey@gmail.com> References: <869354dba00f01d4e6bde897a44180ad1658389c.1685801691.git.chunkeey@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org fixes the "duplex-full" typo, adds phy-modes for the internal switch and the attached PHY-chip. This also includs adding pause support for the internal cpu port. | ports:port@5:fixed-link: 'oneOf' conditional failed, | {'speed': [[1000]], 'duplex-full': True} is not of type 'array' | 'duplex-full' does not match any of the regexes: 'pinctrl-[0-9]+' | ports:port@5: 'phy-mode' is a required property | ports:port@5: Unevaluated properties are not allowed Fixes: ec88a9c344d9 ("ARM: BCM5301X: Add DT for Meraki MR32") Signed-off-by: Christian Lamparter --- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts index bca39b30ace8..e0ad79fac7f4 100644 --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts @@ -186,16 +186,19 @@ ports { port@0 { reg = <0>; label = "poe"; + phy-mode = "rgmii"; }; port@5 { reg = <5>; label = "cpu"; ethernet = <&gmac0>; + phy-mode = "internal"; fixed-link { speed = <1000>; - duplex-full; + full-duplex; + pause; }; }; };