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: 13266172 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A458C77B7A for ; Sat, 3 Jun 2023 14:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=haBX8HyjiTaY9sVmSbiXQ75uBcGjwsM4qvDnZqMz/BQ=; b=bIqZT8Ptcndgxp BvGQ2zWKd/DpQA+53GIp2zztsdIRGnsM7ppaSSDaiK/6fwUAxBchjrIpeQwiaoJpqLbzhZ5695+Cn BPf3vsscvcJiaYMezmlTXdIi3u1BDPZEXuh/q+yBi/IVY0+zwHBk4JbXufj+kyUX0nvnr7aLEfRnx B5miImZC8ymjcjAlLLu4QO7hYqu4H4s2mNJH58fSj2E7h/vgYBgFRSZutdK/VhQorKNFsnjjd6O/O v9PQYLcV0v50TS/X7trAnQ1xLoEM+JYejaWg48taitvbsWrwoFP07DwClnfF+Vpn/180GsWfgjjk7 rh4/REjSJ05PL3UjOVDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q5S43-009uey-2p; Sat, 03 Jun 2023 14:17:07 +0000 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q5S3z-009ubw-1G for linux-arm-kernel@lists.infradead.org; Sat, 03 Jun 2023 14:17:05 +0000 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-97668583210so164420966b.1 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: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=Pp3+5GHCZybDPntmQ0LjVtnOCACnvonDdCUzArO9B4I8HX7QpY5ObzE4f3nlYgjxh9 vW8WYwjL1o6S3B1dA8qVGMg+vhY+1iV/qUldG1pvxZ0rXiLgAbpuAkSlSvLTRsjOHPjn J0yDE3xOjpMretrrUWaxQeZVg47Jo3GtKBwdTRuxt5sDreVxTWn5y7zoRjPw7hVQ+voR CHNMg2WLhT1d6TW+8J5Bw5hUEktddoKP9qt9NR7fksa7SXydMcIoVB+3UuHzMuoB62Bv +ZvUWzAmyvH0Bdx6Yd2M6KKhVQOmZ+cTzveMqLl0AnCtJ1nzJ/+OGLZpmrvZ5e2u3CrQ /lfQ== X-Gm-Message-State: AC+VfDxE2rvq1YkH9eCX1Z7/1LyXGSNQtfGgTYqp439WTc/UwuCxAHtj IrMA+rjapdRdX+mfr6qQvKC5MDebrSE= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230603_071703_429256_8B3A3DE6 X-CRM114-Status: GOOD ( 18.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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: 13266170 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 341D5C7EE24 for ; Sat, 3 Jun 2023 14:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DF2lQBpkQbDz02G30h+ngLXFLTTJi2hhryhxhSSiBBw=; b=mdDQbUXYKVIo0u Jro/rn+HoPUdXAKJ8Z1X9xVETnBK0Ttzl0C8ziS9pzW2O/VNkCu/phYSsyc/OioMiAy1dWATVy5gj PDuVak75uzNmjLIfLOfH301J+LWRHgyKp3PPjionOnlB6XVoAN93ETLsB7KK3ShpUuKJe+HayUUJx JQmeVS2b/ZrZttyzKKDiVQ9aCc0bhrlzcjuawXkwZiNvVEHpUZZKZ3huG48h7rn68V8MssZrMn4D2 /OBC4G8qS19Wx5Akn5YVmNYapgKBXRNDztXqcI9qiS1/jyhrwbyW+srrt/Y1GqhkVsaYG6F4f0PLc 6AidlFPuSGby71c3WXlQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q5S43-009ueq-13; Sat, 03 Jun 2023 14:17:07 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q5S3z-009ubu-1G for linux-arm-kernel@lists.infradead.org; Sat, 03 Jun 2023 14:17:04 +0000 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5149390b20aso4676953a12.3 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=T27rWH0+0/JEUTgO+5CVUMZle3P82kXpubSB6U96UcF4FbL9arLDgzw7doeHw6PmYA io77JnGhJE/WMlkyFjnSZk1KQBjTnBRSCflQJlWaUvSHk6jq2czd0DwMr/iMreex/J3R 1pwB0JoJQiMG3JgD1T1Kx6PXZBE4yqd6a7CT+mfviY1NzIN+5ojSzkpaeD0DzcWBRtUA eaf4+OtsV2vmIFbcOlQUlu+9q7jrG1Z+FdjWiQbJRFl2JTnDeXKNyUQ66VnZIhyQqCPs TRRBJKOtA1terwJsZq8QYW3ikoXbEtniMcJtOncymmF37zjyssPfMpNQyDFcpvSHKRaT Lf/Q== X-Gm-Message-State: AC+VfDwBLaSmCPdEW/FYtmIsLxyCz+W7+rw4xm5L+Cr+9/1iVBtxxz8R fXHdL/Vdkqb0NTOdAT6J8hk0t4x0ywg= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230603_071703_428437_3FFA50D3 X-CRM114-Status: GOOD ( 13.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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: 13266171 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EEA9C77B7A for ; Sat, 3 Jun 2023 14:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9y3+zoooLVI8zrZcjNyZDKG+xQDWh5hHF1rykuNRr0E=; b=Z+LzhXE/0K7f9V 3MxUKWwnt01xt17TePienR96qcD3x7LPUfxYgnXOSrlWeGmRK12Tx7gnLf4qYWPgkPR4ad5cfg0n3 XPOgEW0Q3E5/fv2x2pjq7f9BM8oBHN6xN16tSLH2wjNaEK8Q4JC+TCOn3p6g3bC8VDeFOLKQSCuxD DsalXHlZ9IopOZJh9N24Kwio8+uy8STai3YtvAkezFJcvRh8vwZVPKdZJOCH7wXaDWyEmbj7d6OFt kQ4W62dpLsCOZOrc0Ey5QXSSfrOBgUpYqfV0z01dPx0RQcEW1kipgcxj0hNQ6S5PQAvAeaWiG9PAt h5OmOpXkqzVHueNe1ScQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q5S41-009ueD-1x; Sat, 03 Jun 2023 14:17:05 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q5S3y-009ubv-1p for linux-arm-kernel@lists.infradead.org; Sat, 03 Jun 2023 14:17:03 +0000 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-51458e3af68so4424200a12.2 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=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=KrHhAu450GTWdVVLnnIi52+hOj7R2Ylhmj5XQPND0XW6u6YY+ZrWvezNixZ3uHrfM0 Z1im3BsJsUi6BvXmv22r94CziRibu5AeAU2YchsomJ2bavARl3TlCROKTlc1N6DPwBOu DsE9lMV8DX4G//TX27oQEEBHLieWuNkVg0xlTafaFvm1H4N8FqMwmYDRiwmu2HjLCfci 3LkbLXg3NTyDIJiRuwxOh37L5k8cPegPqqEYwG3X00a8LR1whi5XLV2uDIYd7unc4JYT aJ1OVyhnyBdUVevwp5VhrSLoIx1KyS4aaScOTTyJczXNx17YeBXSfkuncLKNR92Y/lVD 8osw== X-Gm-Message-State: AC+VfDzFIgSDt3a1l3cdAF3SgM8W8g2qmLNDu1oitpNlMmkzuIPIztkv Qc9iDkjKPccxY4UNDqLNIEPTary4zus= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230603_071702_605207_6955CE88 X-CRM114-Status: GOOD ( 14.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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; }; }; };