From patchwork Mon Jul 4 13:42:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 587238 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 6F67BC433EF for ; Mon, 4 Jul 2022 13:42:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234684AbiGDNm5 (ORCPT ); Mon, 4 Jul 2022 09:42:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234683AbiGDNmy (ORCPT ); Mon, 4 Jul 2022 09:42:54 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2077.outbound.protection.outlook.com [40.107.20.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8378610BA for ; Mon, 4 Jul 2022 06:42:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OG09VECdgNsf5ff/LUyn+J+58i5LWcd/zVA0Wkjr8J3ANJ4IiBxqaKoTCtbxUOMeDt/gg68pYSWTqBz3qmkeHqimx0NaIpI8O3RY16P5X9O2bkJQeCI7vdIk/WDVvUM5WWI0K/mtczPlzglZgVto/9phlwkjkPSKgma8Zf4CcpbU1opEMQKRCSigyWr2M4kiiW7na1cWrJHNc/J+1+khldeHMffHWZaAdVmcGXDV2GhyawzR9U8KWYRgRjgbz7bhF8ocyEPMU5CycDRL2qrhP3B1Ekqbnb+dW9hDmwjogTXfhRXM22ujt+AAuoWvL4BIKSh5Ac2f6YFbay5eYhCrbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7CdgqY2GUSOfcTZoX9EnWPtU8xHS6k7EAicMP1xcu30=; b=G4xnF005JJagTwnuqNdnIDfDoBetTpE/T6t2oZhD6c4LQH3piUPQ3LnYxKP63zcqgtUi6IKXUc+6DjjHLQXpJQvFaBmy/Hjd0rboKKA5IyFvsI86iWdQqZ9C+wMP3/D/bkds5wU0uPmP4/KwNWMKWCazmMRsOPZIlo+1t9Daa8638jPzi+VQtPG2b5E5VyRiqKAmU8HUAP2vP+T7RRFaMxFBh1cpxhzYT0F1QOaCKOtIW+DhTbugAtzeFqTDO54yoSD+xrNhV7UkErYoOU6n9HiPDpsoZ6s7OBZ4y9ldyivSYJ+7S55Xdqpxk3JxkTO/rIjbfXlQImFzgNyZoKizkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7CdgqY2GUSOfcTZoX9EnWPtU8xHS6k7EAicMP1xcu30=; b=Dh0rno2CLixfMSJ290z8W3xC7CQR50EBggc+AjxPTSW8vlu89twxyrajUQteGhZdRgQEB/EItlWBPtsY294ra9E1dhiEeRWa74iDt5J5jxGksl3rVfql9rKjVEe8/wz15onC3lDMw+fONoguTPUmSGW0O8aDexai44letfHSlDE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) by AM6PR04MB5141.eurprd04.prod.outlook.com (2603:10a6:20b:c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.20; Mon, 4 Jul 2022 13:42:50 +0000 Received: from GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4]) by GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4%5]) with mapi id 15.20.5373.018; Mon, 4 Jul 2022 13:42:50 +0000 From: Ioana Ciornei To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: robh+dt@kernel.org, linux@armlinux.org.uk, devicetree@vger.kernel.org, Ioana Ciornei Subject: [PATCH v2 net-next 1/4] dt-bindings: net: convert sff, sfp to dtschema Date: Mon, 4 Jul 2022 16:42:10 +0300 Message-Id: <20220704134213.13100-2-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704134213.13100-1-ioana.ciornei@nxp.com> References: <20220704134213.13100-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b7f67ad1-900d-4477-cb6a-08da5dc31602 X-MS-TrafficTypeDiagnostic: AM6PR04MB5141:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sd2on1dW5AD/1nZszfr1sEx1FXdaYUIChOdyw8vO41e2RTZbypUXIFSUh05VlCxMzIxW+446Xp1HwMpzt9n1UNXeGF+iEQvs2KTCzvW9koTXdYgfJBhJvlBvi6XmIf9/MS6AnVoBZLAqt8mJD7HyTp3hCR7GW8NOkqGzvRTAU2cPlU64KhhV0NxwbyV1l2BMCtRSBZRR1y9t1J+jpM5ksZr06tAoMZAm6SbxR2ZuXP/Cj6jBNZzFsCluM0T+kR4j9lU0jdSsiNO0JCdJDfQIpLTbrDVUe67/7SXjOYIJTxuuCUd6fY5/kyYWHIFt2IW1PM1YNpT0gZiRm6uYvCbia47SeTFC0WpzdVZNxs0VqMO5/NAR61mWO14b81iwey9WKhzmpFYuiJIK+W8brsCOmwMOXpb9tONwRx2pa3nBTB6o1KS3Hqljq4w1W90aSaN1UT5gJNxAhrvTa+MuH7hgDi4DElkVyeXuOiFbQhBgjyN7bESredZzUwBSdG9NT6qtvKP9YK4mRSOUE9vcA5rX3ucY0kqREcgvNe3nwnzuYgNWVL+0VWussEXir05ztaBdi8Ez4dPuMAJG0IEvrQ89b82ykon6atbD1+C2nUmXsnJQempZYCWX0Z5UoV/dUJM+LFQoME+5NbgYgggfCCycaYAP8/bB+u0cvg7X5fkPDaEOFAeEkmcDxIqqtocBOf5uSsrbVp79Gm4Phf8NLdqVc05B8E11VWu42+WaRhCsUsUjDgqfDZWkIT7YmZWIV/ZXyt7MWaiPdemP9HK/YxDA3PfRlLMau266AEf9VGadwhwYKfhMeNXOEfdos/AFqQeXivoX71DVpsNu+e54/jjdsX580AXAO4OGv6SxcVgvFAAB656HW3lSrsnnJwJRh049 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GV1PR04MB9055.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(396003)(39860400002)(366004)(376002)(346002)(136003)(186003)(52116002)(26005)(6666004)(2906002)(6506007)(1076003)(2616005)(41300700001)(6512007)(86362001)(38100700002)(83380400001)(38350700002)(6486002)(66946007)(36756003)(8676002)(66556008)(66476007)(44832011)(4326008)(5660300002)(316002)(8936002)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YOZKAzZG/fbeD0kYhw/VHmvGKUgZeBiYQhs14jyx7iuvaX+yuQ1Vuwex83NyJ2N6WEFVhzRtXk1KMZQXtsGsQVR5N/x+8drD7sVbA9UzOyBrWfoIp10uiVovwSC/HIVDQKlsOpMT9vDkWztXcee8I/Gew33TGHN2lpku3LPlNGxFlyKVcy+6HTDXUEyRVad9cqLrfEGq4CL/r1TpvVTfaUDLo+Z0UiruGQElo1hZzYyYU826OlF0rKikOT6+19aRW73THqU9nxnUKLw6ov0MYw7VXjM/UuTb4wQowzKAD85SXSTRhGpZ3+dPlyBJHIm7FhcZdtINKAKt60AA8jNEcgNJV35PYjL9vr1/jEYkADs7oqhdjZa5Gat0M5ffZSKs7aACo8HEWv3h7kGg884xP2nhHmv1DCrXbcWdvgI20XGf3zDRDHY+9mTk8nWoSoQ01t1WHnBKgvTztMbML6VScUDZU8QzgC6MVfHPBuddgWiQHpSLgyvnxfby6r3NWorOKQmkYnGNlvly3p0HHYlPhTClr7edDGR+6L9JsDTNrom5bNeAZyHoNcal3esHnfz/IfYW0mpWrrSJ3lz1YkC9fLfawZCzBlwz7MuKGSzVN21Y36gc3hSBvoUKTuW91HoyPFuLB5u684RWQYSpo0KpYO5RkvINF1X9/An1MByGUhjaN4eLbEjbwpwrfU/2s4MznRfiqYezmid7zM8MP2hgPatjvti7qgARZabzFNDzEtKc08SB6OwkvgflLorWNug93G1qZfex/qX68uof2NvrCBYle1Gz/r5458wd6+9eLWFqctQ+GeU+8bo4fE0qH2aT13htVqV+/mz8faRKvpI3n7XgsLDkHfQLB6ZvdADxp2DeXEz7uNTrNixXAZu1qY8EIvJm6Zl9kI+38uGsAeYsIkyQJwg1+SuuPOBRKlF3XLbuuZp/R4Tp7XcCFlTHZPn26ZfCYzedIv8JTgpFLg2butKovl9k56RTEiSttBHA3DtG24ejNzeGO7cCDExS3VR1h6/bcm03ZmiSumLR7lDcPMpy6kV5i5ODQkHHKC6IkpPdXsq8JDjsfFEvJpHYVnUrPnLn5TD7Eh6fCYs0aMdv3BhMo/jz9T7niGHj/0DqqXGuxQksKHHgG60Ozr8PiUU2hTGEvaQU1/kJ5GZz0gZaV6H7dMgI8tiiCbQcfz6NKI6HodOVISvEC6PwJKAO0ZEJCtx2Z9V3UK9A7MvLtUoHMC0nHiq3+y9EwHkGcS26N1RCJFM+DGRzwn8GebSZQhERVxlIHFJWna6UlP40+9atM5tsGu/zbhM1ob4ugpyHSrh/IMxPB3qVyUJeHbOGV2+T8jPPWCUg9HcXYE5NjuY5m7IBP846TMNUb13QS1wJbi4zMQdZaoM2rx/Z/462hQbkTfSr8LVOpKxdn70Z2Vd0EETeuDvQ9GvsB70M7KEJcU/MQHqML84h2H0kicxxHzKUZ9fg9rHkNmBmTZIT67eI99RzrOw3DiRWyg0EJVnwRLfjHYKD3xUKiVjy3PSVE/XXQNILAbxgN8+w9E2B9nND4+/pMTi9JlUXb/km5ELI+3LOxmJ5vqQbiLmOFRE88pie X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7f67ad1-900d-4477-cb6a-08da5dc31602 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9055.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 13:42:50.5163 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lJtv7XfF7Hh+gL3AsyCeKAOHdTFlvPXndTyy9sbZj5C1iHV0bC+Igzl+PASff6BDJefPqJu7eT/xjACtCVClww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5141 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert the sff,sfp.txt bindings to the DT schema format. Also add the new path to the list of maintained files. Signed-off-by: Ioana Ciornei --- Changes in v2: - used the -gpios suffix - restricted the use of some gpios if the compatible is sff,sff .../devicetree/bindings/net/sff,sfp.txt | 85 ----------- .../devicetree/bindings/net/sff,sfp.yaml | 143 ++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 144 insertions(+), 85 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.yaml diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt deleted file mode 100644 index 832139919f20..000000000000 --- a/Documentation/devicetree/bindings/net/sff,sfp.txt +++ /dev/null @@ -1,85 +0,0 @@ -Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP) -Transceiver - -Required properties: - -- compatible : must be one of - "sff,sfp" for SFP modules - "sff,sff" for soldered down SFF modules - -- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial - interface - -Optional Properties: - -- mod-def0-gpios : GPIO phandle and a specifier of the MOD-DEF0 (AKA Mod_ABS) - module presence input gpio signal, active (module absent) high. Must - not be present for SFF modules - -- los-gpios : GPIO phandle and a specifier of the Receiver Loss of Signal - Indication input gpio signal, active (signal lost) high - -- tx-fault-gpios : GPIO phandle and a specifier of the Module Transmitter - Fault input gpio signal, active (fault condition) high - -- tx-disable-gpios : GPIO phandle and a specifier of the Transmitter Disable - output gpio signal, active (Tx disable) high - -- rate-select0-gpios : GPIO phandle and a specifier of the Rx Signaling Rate - Select (AKA RS0) output gpio signal, low: low Rx rate, high: high Rx rate - Must not be present for SFF modules - -- rate-select1-gpios : GPIO phandle and a specifier of the Tx Signaling Rate - Select (AKA RS1) output gpio signal (SFP+ only), low: low Tx rate, high: - high Tx rate. Must not be present for SFF modules - -- maximum-power-milliwatt : Maximum module power consumption - Specifies the maximum power consumption allowable by a module in the - slot, in milli-Watts. Presently, modules can be up to 1W, 1.5W or 2W. - -Example #1: Direct serdes to SFP connection - -sfp_eth3: sfp-eth3 { - compatible = "sff,sfp"; - i2c-bus = <&sfp_1g_i2c>; - los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>; - mod-def0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>; - maximum-power-milliwatt = <1000>; - pinctrl-names = "default"; - pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>; - tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&cpm_gpio2 19 GPIO_ACTIVE_HIGH>; -}; - -&cps_emac3 { - phy-names = "comphy"; - phys = <&cps_comphy5 0>; - sfp = <&sfp_eth3>; -}; - -Example #2: Serdes to PHY to SFP connection - -sfp_eth0: sfp-eth0 { - compatible = "sff,sfp"; - i2c-bus = <&sfpp0_i2c>; - los-gpios = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>; - mod-def0-gpios = <&cps_gpio1 27 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&cps_sfpp0_pins>; - tx-disable-gpios = <&cps_gpio1 29 GPIO_ACTIVE_HIGH>; - tx-fault-gpios = <&cps_gpio1 26 GPIO_ACTIVE_HIGH>; -}; - -p0_phy: ethernet-phy@0 { - compatible = "ethernet-phy-ieee802.3-c45"; - pinctrl-names = "default"; - pinctrl-0 = <&cpm_phy0_pins &cps_phy0_pins>; - reg = <0>; - interrupt = <&cpm_gpio2 18 IRQ_TYPE_EDGE_FALLING>; - sfp = <&sfp_eth0>; -}; - -&cpm_eth0 { - phy = <&p0_phy>; - phy-mode = "10gbase-kr"; -}; diff --git a/Documentation/devicetree/bindings/net/sff,sfp.yaml b/Documentation/devicetree/bindings/net/sff,sfp.yaml new file mode 100644 index 000000000000..86f3ed2546d9 --- /dev/null +++ b/Documentation/devicetree/bindings/net/sff,sfp.yaml @@ -0,0 +1,143 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/net/sff,sfp.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP) + Transceiver + +maintainers: + - Russell King + +properties: + compatible: + enum: + - sff,sfp # for SFP modules + - sff,sff # for soldered down SFF modules + + i2c-bus: + $ref: /schemas/types.yaml#/definitions/phandle + description: + phandle of an I2C bus controller for the SFP two wire serial + + maximum-power-milliwatt: + maxItems: 1 + description: + Maximum module power consumption Specifies the maximum power consumption + allowable by a module in the slot, in milli-Watts. Presently, modules can + be up to 1W, 1.5W or 2W. + +patternProperties: + "mod-def0-gpios": + maxItems: 1 + description: + GPIO phandle and a specifier of the MOD-DEF0 (AKA Mod_ABS) module + presence input gpio signal, active (module absent) high. Must not be + present for SFF modules + + "los-gpios": + maxItems: 1 + description: + GPIO phandle and a specifier of the Receiver Loss of Signal Indication + input gpio signal, active (signal lost) high + + "tx-fault-gpios": + maxItems: 1 + description: + GPIO phandle and a specifier of the Module Transmitter Fault input gpio + signal, active (fault condition) high + + "tx-disable-gpios": + maxItems: 1 + description: + GPIO phandle and a specifier of the Transmitter Disable output gpio + signal, active (Tx disable) high + + "rate-select0-gpios": + maxItems: 1 + description: + GPIO phandle and a specifier of the Rx Signaling Rate Select (AKA RS0) + output gpio signal, low - low Rx rate, high - high Rx rate Must not be + present for SFF modules + + "rate-select1-gpios": + maxItems: 1 + description: + GPIO phandle and a specifier of the Tx Signaling Rate Select (AKA RS1) + output gpio signal (SFP+ only), low - low Tx rate, high - high Tx rate. Must + not be present for SFF modules + +allOf: + - if: + properties: + compatible: + contains: + const: sff,sff + then: + properties: + mod-def0-gpios: false + rate-select0-gpios: false + rate-select1-gpios: false + +required: + - compatible + - i2c-bus + +additionalProperties: false + +examples: + - | # Direct serdes to SFP connection + #include + + sfp_eth3: sfp-eth3 { + compatible = "sff,sfp"; + i2c-bus = <&sfp_1g_i2c>; + los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>; + maximum-power-milliwatt = <1000>; + pinctrl-names = "default"; + pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>; + tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cpm_gpio2 19 GPIO_ACTIVE_HIGH>; + }; + + cps_emac3 { + phy-names = "comphy"; + phys = <&cps_comphy5 0>; + sfp = <&sfp_eth3>; + }; + + - | # Serdes to PHY to SFP connection + #include + #include + + sfp_eth0: sfp-eth0 { + compatible = "sff,sfp"; + i2c-bus = <&sfpp0_i2c>; + los-gpios = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cps_gpio1 27 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&cps_sfpp0_pins>; + tx-disable-gpios = <&cps_gpio1 29 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cps_gpio1 26 GPIO_ACTIVE_HIGH>; + }; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + p0_phy: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c45"; + pinctrl-names = "default"; + pinctrl-0 = <&cpm_phy0_pins &cps_phy0_pins>; + reg = <0>; + interrupt = <&cpm_gpio2 18 IRQ_TYPE_EDGE_FALLING>; + sfp = <&sfp_eth0>; + }; + }; + + cpm_eth0 { + phy = <&p0_phy>; + phy-mode = "10gbase-kr"; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 28108e4fdb8f..8677878603fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18110,6 +18110,7 @@ SFF/SFP/SFP+ MODULE SUPPORT M: Russell King L: netdev@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/net/sff,sfp.yaml F: drivers/net/phy/phylink.c F: drivers/net/phy/sfp* F: include/linux/mdio/mdio-i2c.h From patchwork Mon Jul 4 13:46:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 587235 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 A9C79C43334 for ; Mon, 4 Jul 2022 13:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234154AbiGDNqb (ORCPT ); Mon, 4 Jul 2022 09:46:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231641AbiGDNq3 (ORCPT ); Mon, 4 Jul 2022 09:46:29 -0400 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150053.outbound.protection.outlook.com [40.107.15.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8249F2711; Mon, 4 Jul 2022 06:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dy/LZ+g5unv7tYK6JBQ4vIkSBwcuXjZmasnPw5GAJJfM9KRHttFhQ0KVJXVk/ifQQgbcshg+Koeh8y07aO3INq2NAvVcS9STksVVnkGy9S/VHtyr1aI/3ayL3nONJIIyAPIYF0M7zzF/vmcFamPO9XRburn7A62Qh57yEYiOPH0S9/RVqZFL9eqrUWtSZYssbJ5WZgh2CHn0x2ZVYOqAgX0uJPDFP5K3MXFLUBcEzfHcKXiQQDkEKQdoLAtRf4L4eYxkqYj1AOVitfW5j8iAm7981FkTQfE7pTZQBBsVnWFt6hzGkjp+sHYUuHYEIxSxYzV0EJjRK8HR5T9uNzFUaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cgU2rC+Vlb1slWks38dR15NVowO/dWr3lfWHeT1M35A=; b=Ll16JN5jDjgow0NTXqtY1iWwPHNyHISRhABtDKwRrI37wK4T3Rx7d8kpUDhP6kETUoMQGpWyyXx7hwibt8A5YeYMaJKjXvzyo0bdkayF7GvgROHVSOdFqI4+kkc3qjlcaDjKXdwF1lcVk5cjWvIvAVwPoX3GPeVZz5uvOguAVuoofx7XELDTOGW+ZKdETlGsW3dUiHCfyGJYhRUZbxH8TU0F9+FrXNfHgZJMl7GQJCmHDECM6QOhNCAqrjWVM0Vm43MMw1TQ1l4Atz+SPm0IGYxNKsECG+VbasjyeqitwGz0S61rxloIETjiZ0FcHh5gTpLFRWbzFBL9+yygaTX4Qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cgU2rC+Vlb1slWks38dR15NVowO/dWr3lfWHeT1M35A=; b=Ox2GKiSGIlNdl14ivJt6xoD227kBNi/XiO6w23mzFrmouckdSi3XbdD2iKsvb0APFyQlyL2KFHrMCSkrzd0ro0G9q1Bcn4RzCZeFCEiGoSMR5BwSeHftaoHVJevwe03SVRoqUsp0q9hyd9y811YkTDzjHdAWhZJFTbTeKu1QHWY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) by PA4PR04MB7887.eurprd04.prod.outlook.com (2603:10a6:102:c9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.20; Mon, 4 Jul 2022 13:46:26 +0000 Received: from GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4]) by GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4%5]) with mapi id 15.20.5373.018; Mon, 4 Jul 2022 13:46:26 +0000 From: Ioana Ciornei To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Cc: robh+dt@kernel.org, linux@armlinux.org.uk, devicetree@vger.kernel.org, Ioana Ciornei Subject: [PATCH v2 net-next 2/4] dt-bindings: net: sff, sfp: rename example dt nodes to be more generic Date: Mon, 4 Jul 2022 16:46:02 +0300 Message-Id: <20220704134604.13626-3-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704134604.13626-1-ioana.ciornei@nxp.com> References: <20220704134604.13626-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: AM0P190CA0010.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::20) To GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bee783eb-cafb-4b80-26a7-08da5dc39749 X-MS-TrafficTypeDiagnostic: PA4PR04MB7887:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sWdgXWmLs3yVkzvpflVs4VstNdS9ZTslcZ5U3eMD9ZgiQnO+7cL5OlA/dONhO9CuJKwpLWbYSCcQBJoE2KEKv/3xtasC9pU36653TXR6iW7Dr+JqnuTp3V8XAxhwSHO/+C0O/2qN7F5lttIyGFwzXtof10o+jpAZwTu0fpL45kWtF/ZnN5WqhJ1+4/6IMD1VrejP0zHT56r+nG8/XCSWJHRsl23UL8JEP4Cuw6csC93nN+PdJI3ZbOvR7dHo28WeVaMiMDLQ7IHSYx4MMWoOLfoTG79cAK4zTANnmCkCeD69z7WPvxlJcOUd6BVxTrTT8C4nUXE2OdbsN0aMkLbAFPXF9XGz5vTWXPYyhjPrX9oF0rYzc1TNokSBDK/m0i+6Fsb5yCq8oO88Boy88/svjcSQrWBWG8ZppJlyt2yAjLTQ5BGUL5k6+ew0FdlBMspiUFhs89BHHAzIAWDms9moR+rQKV8ffspICnchOGf/tgjV3+CFwqbnsH6/LmFDXwwtVjf7gsN4mqbVlNZesv3cfKnPasYpWdXWlFH0StSYtUl0aTWxAk1YFO0cEkdpnhhaEKlfV3M6a2cPOdI5FIu0+wt8VFBldeIUhVhClegRFHG5itw+g0/mtfivY25U+DS/YuOnJmABN0e5CWqcChQ0OjbUEiIhCAkVMQuZdbkv3yJ1OSvEg4orxfhj48Mes2xbiwKtns5CN3wjnshI4Bj4y1PzC0PwoC2fOz56tZ7ez56Mjg6Xw1o/imPB3zbqeKLfSw6JnjXNN3dR+VU7PlcInJRJ9+NoTxLA+yHwxK/rbIoDiEl5Y7wey60GscKb0tmROMpzCEsvGpuPAFeoNbr1mg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GV1PR04MB9055.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(366004)(136003)(396003)(39860400002)(346002)(1076003)(4326008)(66476007)(86362001)(66556008)(8676002)(8936002)(66946007)(6512007)(2616005)(38350700002)(38100700002)(316002)(52116002)(6666004)(41300700001)(6506007)(26005)(44832011)(186003)(478600001)(36756003)(2906002)(83380400001)(5660300002)(6486002)(41533002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KCSLhJ0TuGdjjWWwwyzqdFIGQ1oCAd0KaBEaVmR0AjwQWWdNLRe0ESYqdQkyKareqGoAj3q+hZUOxZlJ4RM/+b6nvp7b25Xr4gYnX8ykk8fw17fArw6lZl8tyBEvRjVBsJH0f9ewSsJZxD0nEhiZfs6MBgRJpWNYMhjlARxBroosEDxb4ya04I7+q3JtSo0EbYwIRj0yzsgjHvpx4lDiu709fxHO7WYtcKhmBwWbWxAzWbFR6n60VNx+JIeIVs71fcmb0EOLTndpV7PRA3/h+yUaY+f/Umx4KQJ08YZpGjdVNgJhiPl24NKpVGjaknX6jRG+DvUsUxrnsDrnZWPfy3Pr1n5tM/3QPSC1Tcbf5Tz6dsU+Niv7ikzXKa3+4LE+EdkjfYkkUFtB/wlgYlXQlxkQUwG3u9YRt9Ec+eYDeoebntocfuhi2Xa0JK/BdRNivcgXzLuHyS+XqKfIAVOYMq2yderVaX6hqApQ6yq6EJrTkPg5zwXBJHeVaAsJoLj34GRGfDsa9M0q/7qvICG52mLMnMHPy4cBElXWxAhEsOQOlabiSi7pT5wqTAdT/IRJng6Zy/pmpcO+UOPn+InGHR3sRIQVOECGNPT6DCEqF0FMiVMxhtI1RfPzx2pa2sPpz4Ygz56s37S17VLApI5INfFwGKLZeNXFH5reZY/AG2jh+r11qgMHDWT6j4x+RQ6Q5oXnamj/QMPa1G/0NZOJG5ExBLRPCqbpMl1Fm8Pd83o5B4bfUqi0WHLWd+YmpYnIfEEfJV7e15tTFpoeprXFDHIDMNjb2AG9cjanWIkshUwGsGjKO7RIN9uGHQ3p+RZEVxR3Cfr5fasGbdpHCEjVdCK542f3JHEuETtPpIyNBdo7+WKzOaUTqRTPSPZg6EDtomETMhCaM4bfiQ56F10v8fCXST7dolgF5SK2HH7nlcu+ib+luOkq2ciLUhbSQEV7ndO5OpgjFmKrtE2qzCKXWIKY4KAzDcSf0B/RTGiZsh8yXky662vA47aZZNZym/hmnxMav88+f1z8SDH42IALK2MNlFKrPD3duMzROn58qT2zuvCJIUrhENcv78jjvrp0c3D/oCbR2h2vzih8CHjJTwvhdirQeuB3ikW52Xan2NEjy0eMB3QVfjRpEoDVmLXP57+gUiUDVId/F8CIaJfPRsoBeDLXNxONZKzJLctw7pwW7JdqeI8QEabMY443VPKy5BR9zMMLh+3JCvB9sg8B7hZRwrUnCs55soosxA6IVbwejOsDHE+4NLgoMZsMHsn9MV7Xk2jLkntOhGrH42CMu/gaCXTjj3lT62Y+1jto+Gw4aAwbzrYEoTJUKM8ULk9Zkshk6K4Ygby8nT26FSvyO4IFboAYIL/z2g/6VvYOGunvlTqCG19NyPHz14X1feGRqh58W+KdODtMbuyXo3mQViESm4VCUCvY0jg6IpShso50onjrrQHICQMMuzNfhjxSipqb+GKYprPXae7SGQgCeoPIetVWt15LN5l4fK4ujYjWrDPyFdLMcg8Y6qyvotOnn1UunlPMBb/+OBKkTeeJAoj91ZLnH3BunsHnAf/JdQWFkfyI4pZYuAUy4TTpsCoc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bee783eb-cafb-4b80-26a7-08da5dc39749 X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9055.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 13:46:26.7786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MlFqO3zUISMpmS4BCrC/tzFIR9JRtGeA8StgMRW29if7bE3H3TRp8kR2GT3OVg5hfijMHg2rOpjrAgYIFTHngw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7887 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Rename the dt nodes shown in the sff,sfp.yaml examples so that they are generic and not really tied to a specific platform. Signed-off-by: Ioana Ciornei Acked-by: Rob Herring --- Changes in v2: - new patch .../devicetree/bindings/net/sff,sfp.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/net/sff,sfp.yaml b/Documentation/devicetree/bindings/net/sff,sfp.yaml index 86f3ed2546d9..e309395ea7e7 100644 --- a/Documentation/devicetree/bindings/net/sff,sfp.yaml +++ b/Documentation/devicetree/bindings/net/sff,sfp.yaml @@ -90,7 +90,7 @@ examples: - | # Direct serdes to SFP connection #include - sfp_eth3: sfp-eth3 { + sfp1: sfp { compatible = "sff,sfp"; i2c-bus = <&sfp_1g_i2c>; los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>; @@ -102,19 +102,19 @@ examples: tx-fault-gpios = <&cpm_gpio2 19 GPIO_ACTIVE_HIGH>; }; - cps_emac3 { + ethernet { phy-names = "comphy"; phys = <&cps_comphy5 0>; - sfp = <&sfp_eth3>; + sfp = <&sfp1>; }; - | # Serdes to PHY to SFP connection #include #include - sfp_eth0: sfp-eth0 { + sfp2: sfp { compatible = "sff,sfp"; - i2c-bus = <&sfpp0_i2c>; + i2c-bus = <&sfp_i2c>; los-gpios = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>; mod-def0-gpios = <&cps_gpio1 27 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; @@ -127,17 +127,17 @@ examples: #address-cells = <1>; #size-cells = <0>; - p0_phy: ethernet-phy@0 { + phy: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c45"; pinctrl-names = "default"; pinctrl-0 = <&cpm_phy0_pins &cps_phy0_pins>; reg = <0>; interrupt = <&cpm_gpio2 18 IRQ_TYPE_EDGE_FALLING>; - sfp = <&sfp_eth0>; + sfp = <&sfp2>; }; }; - cpm_eth0 { - phy = <&p0_phy>; + ethernet { + phy = <&phy>; phy-mode = "10gbase-kr"; }; From patchwork Mon Jul 4 13:42:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 587237 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 1E94CC433EF for ; Mon, 4 Jul 2022 13:43:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234771AbiGDNnB (ORCPT ); Mon, 4 Jul 2022 09:43:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234459AbiGDNm5 (ORCPT ); Mon, 4 Jul 2022 09:42:57 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60058.outbound.protection.outlook.com [40.107.6.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70C082180 for ; Mon, 4 Jul 2022 06:42:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BNYnk434BDHtv2JWKFCxP0onOvfdyT+mMBT20zuK9ezSsLmNrNTfP6gqCP4Op0hZPEPtffIdRrSnlf1GI2KKoXSDXWydzFuza5KukOX00BJf3JWJB5MAfdAka4HtGWxjZtQ8msIIWQJCRZOKVb3V5ypqbBpDKFkiRUzSi5kZN+W7PDPxjkr+F3bZMduAlrZxRXS2RatmMFjtAPLSi9msxyw/X0EZLxcOFSsrEfjt27SqfsQ/mYTdt6aMcW3cKzuIbmmA9g8b//4/UTTGftuKogkizR5/Yn7HDDENXbE3GcMob2ZvrmMpIPbRVeudk9Cz3EUbCJvGOH2cdiJR7y5XwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cyqQlN0jbBi7m8+P8myzBM1xD9tIwqm0x92RHu3ODJ4=; b=RAJhWmpbbTVywGP0UgKsTrlRWfhHWAOIzD3Mzx0/PHeCVkn9O4XZVJWhmkjuj5KhLfuqIsChi1JtNheo/qX/V05SyJ/+5boEacFps+6gowLH/d+y2o36mvpZ4ZWIOYP0AMrKB8HxXDTEqjkDWbxwehrfD/NbbkDMhX33l0nnAwydkfkMkyugNDFEnNaygxqZEiavPwM9eNw1WhrieqA/ykzP01yKFJ4EI436HQFUYoi2FjKBaoldsJDUUoRrNqMJ47gsfvHQb43Lm22azHsFAjBpTVmb+IUEOLaXKoRpFcdVn7zIMISNaTYGvWKQVyr6IR0ARpFdaCUw4YurR/gtcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cyqQlN0jbBi7m8+P8myzBM1xD9tIwqm0x92RHu3ODJ4=; b=NPbpP9I8poT/xHiZf+hRisiI/LReCrlytiDBjIG2ucLkkC00gh2O6AwollthRawZRU9p3DawfSgZvzykrXSEt3u4UmTjzL/u5QkbbPsAtkKE/2Su0LS+4MQafJhOs9gY/00P/JCi6es0NbAp8WA4CGk5wTz7Tw84ZvYTJrECDu8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) by VI1PR04MB5888.eurprd04.prod.outlook.com (2603:10a6:803:ec::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.19; Mon, 4 Jul 2022 13:42:53 +0000 Received: from GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4]) by GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4%5]) with mapi id 15.20.5373.018; Mon, 4 Jul 2022 13:42:52 +0000 From: Ioana Ciornei To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: robh+dt@kernel.org, linux@armlinux.org.uk, devicetree@vger.kernel.org, Ioana Ciornei Subject: [PATCH v2 net-next 3/4] arch: arm64: dts: lx2160a-clearfog-itx: rename the sfp GPIO properties Date: Mon, 4 Jul 2022 16:42:12 +0300 Message-Id: <20220704134213.13100-4-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704134213.13100-1-ioana.ciornei@nxp.com> References: <20220704134213.13100-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: FR3P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::7) To GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb616569-6977-4199-d2e1-08da5dc3179a X-MS-TrafficTypeDiagnostic: VI1PR04MB5888:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RbFzN2bdYRe/+dUCd1sMso2Q8NjpPsHHAYvZ9pT4c/RmytTZI07rmNwdOFw3IRxSPLJ7cCj30v3eRRPJ+iP9yw3yGc9dNhosxFTSYMUwsULHtGwc6jtIAAMmrbLHbZ4PTYtTgxI6BskpOP7jQfUfCS0rVC6QyR2xoR44J7rnmiw/tgcZ+cGM6iESSNafj+y/J6jvGmolgsELiKfJj2+3t9dUFO+0J9HEQ79h/3ksJlWSEjkv2M9R/TOfts9b1BTtG0ufPKUgnzyfcgzAPBOVBMngVENURO/ja/aghz/+LG4+Yp5bm+AJhF77gS+XSeoteKi6UrNpgTYMtwACwWoNLsibi80q3pJzWJgxA5YYGUJUFKiMG+Am4HrU7gAOKtjaw5f1sXfLSSUiPG37BhSfJNyyxkEdnCqC0+Kqn+qrtT5UyoD3f77GZhRMNQ9rJeDmDoBkfnoXyGbyVs27MiyeNf1IXWn0U3ieLEsLx+gKq+GhO5jZ/qfo97kHvYmRjoVpVQ9U3a3g0oZv+igW1+mdPPMTjQ3C2k8pwc4S9M0G4Zxg0fYB/y8RwBI1NcxOLpviZgLMM14KRR32CI2o+ypVsUZuv7qurJp4f85qTthgq/7bkfV4mKp2H6fEjZ4VFF0Hs1ax5hf0jQJHHLfMggh5QXM8eBPUCjrG77G0Au901hYddUJS3ScE6qOZS/Hvl2/PVcjRPv1p2oEhd3euFsgmv1hrqDkRrc4H0f1Spq71knwI9ZaTgRELe43Plzkjb5tM1o7tEU9eGUwXQN0sRy7ZLz0t8QxOrl2Tp3vltzDwHZhG5NjX7Fitnqi+5KmXTrdM X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GV1PR04MB9055.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(136003)(396003)(346002)(376002)(366004)(36756003)(316002)(38350700002)(4326008)(8676002)(66946007)(66476007)(44832011)(83380400001)(66556008)(38100700002)(41300700001)(478600001)(6512007)(8936002)(26005)(6666004)(6506007)(2616005)(1076003)(5660300002)(86362001)(6486002)(2906002)(52116002)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Nlf27VzwgYiZohwhbcRq71LS3zFpyIuO5rypTQ6vqENuCF7WoIM2hI87DTwKbtS2OZ7quZuFeq0ctBAWrm82X9nxCoUcSSmCmPCqMUdKyozqA8P5M1kt182PG7sNe2RRYUC8UmKLOu2o9ZvBExWSdcDaWsdOJjsmQKdJWNSD5bmMvdFIlqv9LNE0GJpaBJHpkatNbgEXBCaE/g6X38RVr3J7MPSgOwjB19Lm4J95+kugUrdkICiyZexXkCvJY6asSj8lNp4N/5I2UGm9WouNDAeZz4PvMlmblzPGHNzOtJbQ2y3HgR4hfxaySWUZ6Td9lEns4zhlhIHSUTz29OZGcbsUMZzTJ6GrkPl80tnUSXiLBxYaLoZhz+tI/OMiPpM3WrG+I4wfgWc2JyELtDARsVMIdTM575CF1L8Av7AeekQctAv2lXAnkiVdU0hekd03Dqi/6CkqPjBfUHL27VvXNKYtEAh3jk/2Ilrbyh5lSqP1wW/82os5p7WMH4iFSrrS2qkYEEg35034+cyHa7tjNKEXegPzzsZdvjl1uvJOkDz+NbNw4QGLDIap5R+36GJrgjhRvrBLnBxGJ8wLcmwefhMS9g0xdYnhRvxALtDIWk4sVR9isQF0XQOJbxbOkF1TgNv0ud/XDCJhzxeoqycYQKlWea3eaEBhWrW9t+TbihJ0nDDTQi5aE60fUQw8qK0xBBeLvP2YzQp3Wih2t8MRfQPzO/OprCkC9QYLq/5+Qlc642ivTBDySpjS7Ggm5H7TwNdUl387RD8cV0KgsxEJxzgiyvn+97dHMPdL6r9+6KDAZEUcVZEzfy27quF2Eq1SzaPDy2RJtlRD4MJqRkMhC0fYU4K0jTcKFh3Dkb0iYXuMfmFcGe1NBe9Bio/9HNghSQMj+lnSr73PNiQg1Bn7TVo42zUC27sVGRAq5ruppkxAJoU7KGM4lSvaRDiQB+zg39iPAQb+/S2yAUd7b8t/F2LjKt63+NVc6zyZNLC7amdWBnql+ehWhai1v+dj9OfhGmBM+OrdA7NhdWjezVmEHHcXUjSmzkr7Ao2cGfqiHz+2luPA+8DIl58+XCGvWKwdNqI2FOvZt0B5pRulAMpo9lYBieNuSVym3qjVF+adndg2B6jH54x9NhsxuVZ3oyCHmb85vepl0k/AW8ehqESYN/GBuyfdh7gaEtK+XQfJU6PXU+fEg+zDBtK+RHSNbtOSob5Oy+xXn7icSE8Ni9BYeMuT37E3xEPralbck8EbCu+g+58DwK/VlkjUEOIsksYhHUJzkz+QU8jzBT0w/dgzSXG6JQaqqFgwo7i2Z3evmZijHCa9I1fgyQdQYp1ArJcgNTk6SZCZiindAqYRd6YE5fTeA4XylnPhlRZbfcuM5HSfERPMybRyoNov1kvIEXspI5D/GbJrsORpzaEUJ7rOWyUl/Y6eu6I1+EVyWhfm77Lv0Q6YFDDYLNK6RLpTRS7OO5AIUZbujCU4/ihaGMEUtc15sz9ozJ3+iksJYeYpi4kiFdJkM4vvFJ9EDzbLWDroaMV0PZU1WUC2n7WuXtvQsp9+oIk1GsCF66mcBkLOSBkZ0ryVCYgESL6lXn3rQVoe X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb616569-6977-4199-d2e1-08da5dc3179a X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9055.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 13:42:52.4093 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1rjNswuxb3fqSqRslS4F5y3DhNeDUADGHpm11oSC2x6Tcx7T4gkWhVkGsKRDauQq6Llo8D34IrOiTxoOrZmCiw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5888 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Rename the 'mod-def0-gpio' property to 'mod-def0-gpios' so that we use the preferred -gpios suffix. Also, with this change the dtb_check will not complain when trying to verify the DTS against the sff,sfp.yaml binding. Signed-off-by: Ioana Ciornei --- Changes in v2: - new patch .../boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi index 41702e7386e3..a7dcbecc1f41 100644 --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-clearfog-itx.dtsi @@ -34,28 +34,28 @@ sfp0: sfp-0 { compatible = "sff,sfp"; i2c-bus = <&sfp0_i2c>; - mod-def0-gpio = <&gpio2 0 GPIO_ACTIVE_LOW>; + mod-def0-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; maximum-power-milliwatt = <2000>; }; sfp1: sfp-1 { compatible = "sff,sfp"; i2c-bus = <&sfp1_i2c>; - mod-def0-gpio = <&gpio2 9 GPIO_ACTIVE_LOW>; + mod-def0-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>; maximum-power-milliwatt = <2000>; }; sfp2: sfp-2 { compatible = "sff,sfp"; i2c-bus = <&sfp2_i2c>; - mod-def0-gpio = <&gpio2 10 GPIO_ACTIVE_LOW>; + mod-def0-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; maximum-power-milliwatt = <2000>; }; sfp3: sfp-3 { compatible = "sff,sfp"; i2c-bus = <&sfp3_i2c>; - mod-def0-gpio = <&gpio2 11 GPIO_ACTIVE_LOW>; + mod-def0-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; maximum-power-milliwatt = <2000>; }; }; From patchwork Mon Jul 4 13:46:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 587234 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 374C0C43334 for ; Mon, 4 Jul 2022 13:46:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234191AbiGDNqv (ORCPT ); Mon, 4 Jul 2022 09:46:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234210AbiGDNqs (ORCPT ); Mon, 4 Jul 2022 09:46:48 -0400 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150082.outbound.protection.outlook.com [40.107.15.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C57332BDA; Mon, 4 Jul 2022 06:46:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j4FIVl617dV07ICYAOC93OmAzNFzuBvQJ2TI7Cz0dnpDnciXuuYgsAL849yEISfq9pTjLtYF4Z7jPjjjMQ5UTLuGO/4eAmmQhAKTalGy/e4Jz19PGASHLzPvyeJ8yLC4gmJQ5ltS4s58+mjv9JH/WtiGgmA7+p7EurNPMi04K/GRRXKgxbmGrbLLdWuTYqilIe/oT1OrC5c8Y1SijKNFDsbEQ+eiBWQ06PBCcu+J/U/xHWutlLMmu1c6vGziA9ll0AvCifGHA6JSI7qdMbqwSrUGWYOR2GmTckzIt/RXZqmspu0g6bEOfygpCJgLFXimELJX8pGqKHeWVsezem0ccA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4lwsuakEZGJEzp76XIVLoPtD1TJHBnJFKeA6aTHHmSE=; b=jF/VEgPB6IqsJosAOH3eltus5e6LncS8LZIZdMfTd7BpxgUpvVawoSkxMqONxg0OiNaX0seWipfCTBUSKrbrjGU9xZGosuBhaXL9r0Cj1QMcAU+wLk5fKQR4Y/XIN3N0JtJeDrd7e6vwES5so19+fyqTRazI5bINQLHwYuIAJRwYmJ3VL1lWH4yRFxLy2VV8FLW7Av0NishwblNLa8o0qMMwJHZJJNZ9oXU9lF5lfE5SO0W4vrGdVTDz6JPVtdlS4ZrYHB7PniTSEh1d5LWjz32i1OyUTLLoY050o0/40o52Zg0Ww1INkYkJ+dOnnLtRuvM+LRSm8ZYiEcSBVKA5vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4lwsuakEZGJEzp76XIVLoPtD1TJHBnJFKeA6aTHHmSE=; b=kFUm2+yDU/jjQ3KRVEpH6itaDWYZSF8gjW6ILNMyDMVtIhVds0CGgVjK2vHql8eMVxQrlprZsm4amo3ikfJ9271F9x8Ir6i7fJXWcivXXzPl9TSjyCOI+fRTAQ/HNbS6w/Vo5UbEwNrgr+VCw/p80mRfxULZXI2TMP/eQJV7Moo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) by PA4PR04MB7887.eurprd04.prod.outlook.com (2603:10a6:102:c9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.20; Mon, 4 Jul 2022 13:46:29 +0000 Received: from GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4]) by GV1PR04MB9055.eurprd04.prod.outlook.com ([fe80::4c14:c403:a8a4:b4e4%5]) with mapi id 15.20.5373.018; Mon, 4 Jul 2022 13:46:29 +0000 From: Ioana Ciornei To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Cc: robh+dt@kernel.org, linux@armlinux.org.uk, devicetree@vger.kernel.org, Ioana Ciornei Subject: [PATCH v2 net-next 4/4] arch: arm64: dts: marvell: rename the sfp GPIO properties Date: Mon, 4 Jul 2022 16:46:04 +0300 Message-Id: <20220704134604.13626-5-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704134604.13626-1-ioana.ciornei@nxp.com> References: <20220704134604.13626-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: AM0P190CA0010.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::20) To GV1PR04MB9055.eurprd04.prod.outlook.com (2603:10a6:150:1e::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dee67a91-6323-40b7-84e8-08da5dc398cb X-MS-TrafficTypeDiagnostic: PA4PR04MB7887:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +ti13p5+uSNlYHBx1CiJ5KaqMJ+Zp5LdyTTZwNUm/WK+L9rBxqkWxLSqLQwHoMjbb69/fRvh+Px9ofQDyWEx0WS2txTcgLvfzBWSJsXckH1+7mKNGjr/voTyeRYnOctReb4a3k7qsFSkmB82zKPcbm696bbiFWReJXRvB4pux4KQpDEVoMmFEJU8REWJn1m/FM1wxpaAIGydpg8hUWMotvscjIJyEcLOg262lOCmf1mxDFTD2oWyNHs/YBADty/CbYlZ8emMnBAIYU+RlQdk9PSI8UEeUlNpTAIEbdwLvsRsH+qTopp12Ukkerv3CbgCfInGw0M0s3Z+lz4QYUcC/MuQvq8OmS6LCmAwT4uEi3s6YZ3+s1Pqbkot5k+L+NZ6rhTyUOOSvHY9X15uoCEGEdV/smS+88/eSTWeKG9OqhC1RIn+gAOiUuhCYNRkcghLHUfKPWhVEW3Xl4zMHR00xPcRXAptqfvsRQTAK2OIJwpy7ns8rnzt6gO5STIZLxVQPbOfvFM4oF3hsPn5weTBdp2WZZ9vISMhn/qx9NWYaadGi6LlSJg8KnAzdb7uFG3/tQBYm37FhOD7x52T7QAnKd3x+zxWmJNoRbJExKKZauZdgDfl8EvED5c929WNdstdedl79WZNtl5AK2AFgimqFvJvC5E1ZeitEzgmAxC4tM+W2H98WxfFrX1SmHyoaysMGKveVivJw2cyB+V5gUpS7fGzuuxTHV2FrqNMFc7HgV5oFVUDomGXTAPXWxhl1SOe9vuFUYKVa/IAgtF45CpMI7qSFXSvq9EctoMMlaZ+VWjMdLmtipC02pyvJkcGI7eM X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GV1PR04MB9055.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(366004)(136003)(396003)(39860400002)(346002)(1076003)(4326008)(66476007)(86362001)(66556008)(8676002)(8936002)(66946007)(6512007)(2616005)(38350700002)(38100700002)(316002)(52116002)(6666004)(41300700001)(6506007)(26005)(44832011)(186003)(478600001)(36756003)(2906002)(83380400001)(5660300002)(30864003)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AyoalOzcheMpdXuk7yeIfRcF2g5HD/8XM34+3qj/RM1+m73IqgGP/vBYtb21qBsraW0k5E/D2UGwEXFQZdkTj3UXy/+DGtifkj7zkXxPeu7ajM4+x5uVyK9cgdSwQ+k11/ozn3iyyOWQJ6csp6jdExjAqXW6x3N4jjHmUUXcRN6xqp2mlVGLm0unNzUw05jyYCYSO2H1WWDchO5tio3DFugjjrsiYii36Dsq6qCvC8H2i2c8V8EatEl/vsq7jXHZRe+sie+PSnyMqQWh8YZlzt9XfqjvIQ1uKTrtylDMxjwQowlxoSw35E4EKg9cCQH7p6f42sAR+4WyC/a59KGE1nTSDBwa7xyaN26sWtBcann8YAExIFwgjjC4ZEArooZsO4hN250dZL5j/8yLbJCqHHksg3uWhQy9UFvct3U5UqB4zP/DLHgZ85d7k53H8fsv9ooWMepJt9hM4irlHhEjJQi5AqD0qRE3h/PhJpA4sTQNG3Z6oCsAQ4ZT/DZZ5Hd1zwSrmS5uFEh4kDaucFeobLk5/WIXO+6Famj6LYiXbuU+swvlwMqjkCJhWJHUo8gY8rXKPLTRG9qqd0knpv++ojXwfBWt8IuxgmDodtWnAS/UzYJf4GnNzBXaPGNh7ys6o5VvlPd+QXkxqSnQTX8zQPzivjBcTLwT1/NHbLCyQc1je51LlpqKIgnXKhoK22ze+ln/lpTd/7+gBDY3s081M6HvC7RshnNdm/mDU++rsJmw0RY8Ip1B5Jz3P/fTqhQJcThthUkVKg7XDl1DotdCHN1Nvaof/9KlJEHnz0BgINRC5gfpl5ujye1jIwnZTt0mW4wBqxgQbJ+2KWWoU/6ddoZ2SeOeVQShddOafA2wR/CXydEaJHC/u1j9whFG9U3LYWp6jcRZgkXGNJZWcwvkho/LKkJbeYGIjsF8mcJPRW5P+C7ONmL3P6+Q065cpGmlaBHozi8aF3p2hGBufmF8DHMZwhu+umrC0kdgtyUKYiPVIHuM7b903J6RNpsrofNzp964yfbnkRqn444bbvmB123YUGg0kr/AWdvOGqqaZp19lKFw3srqwQ/xZadH2/2XPHtWhCf0RRAYsiTyv2DOBppui1WYtiHzFnzzSMQhi7LtL9CMapsLkI3FyB1cipcOlyHEEyphwPqlgGcI6aui4wsvhT+m83G56Y8isK1Q4gByxnBzcdAYBm0Tvif5Z7ztrzVkQcDjbes69ZVzZ2eiPH/f5qz/j+zHH1x54iVe4WcNFLWEK0kiApCFkVlbl64Hr93OUHrfWpXFImZvErXFYzlOJHNi/vAFrQuEZkjCrHQzNqWXYODvv4LMnxTiJObaf0yYeS6DXBa74FJwM0/kSN10RCelPsewfYmHyDiLcoJEhOWjlzx+hXCkvKJ0gJRWTtcSxZrJ5ZLMEgaKnPomsrhXDLkFRuAzTz8LT75zvqcDsPBvKHQ5DhIfogfrSN18tc2yrFvriKFZI3mnqWBPVHYb3CTUCZ4/cTt4V46J7nIDhpG7EWIQ2n7lO+8EdIuq+HTHEhV5a2py6+44yF60mJbU507a+0mN6m4JfrivbQSwkToIxy5q7A8OIFCj62H3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dee67a91-6323-40b7-84e8-08da5dc398cb X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9055.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2022 13:46:29.2639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1IV031A2QM0iIq88MULxYDEESYVZJke9oXE4lcoHhpLqV2ST3bJRc4goa1hpVvJY2DWXJrswof9X0WdkB6VnNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7887 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Rename the GPIO related sfp properties to include the preffered -gpios suffix. Also, with this change the dtb_check will no longer complain when trying to verify the DTS against the sff,sfp.yaml binding. Signed-off-by: Ioana Ciornei --- Changes in v2: - new patch .../dts/marvell/armada-3720-turris-mox.dts | 10 ++++---- .../boot/dts/marvell/armada-3720-uDPU.dts | 16 ++++++------- .../boot/dts/marvell/armada-7040-mochabin.dts | 16 ++++++------- .../marvell/armada-8040-clearfog-gt-8k.dts | 4 ++-- .../boot/dts/marvell/armada-8040-mcbin.dtsi | 24 +++++++++---------- .../dts/marvell/armada-8040-puzzle-m801.dts | 16 ++++++------- arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 6 ++--- arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 8 +++---- arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 8 +++---- arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 8 +++---- 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index caf9c8529fca..cbf75ddd6857 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -100,11 +100,11 @@ sfp: sfp { compatible = "sff,sfp"; i2c-bus = <&i2c0>; - los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>; - rate-select0-gpio = <&moxtet_sfp 5 GPIO_ACTIVE_HIGH>; + los-gpios = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&moxtet_sfp 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&moxtet_sfp 4 GPIO_ACTIVE_HIGH>; + rate-select0-gpios = <&moxtet_sfp 5 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; /* enabled by U-Boot if SFP module is present */ diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts index a35317d24d6c..b20c8e7d923b 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts @@ -65,20 +65,20 @@ sfp_eth0: sfp-eth0 { compatible = "sff,sfp"; i2c-bus = <&i2c0>; - los-gpio = <&gpiosb 2 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&gpiosb 3 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&gpiosb 4 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>; + los-gpios = <&gpiosb 2 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&gpiosb 4 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&gpiosb 5 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; sfp_eth1: sfp-eth1 { compatible = "sff,sfp"; i2c-bus = <&i2c1>; - los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>; + los-gpios = <&gpiosb 7 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&gpiosb 8 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&gpiosb 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&gpiosb 10 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts index 39a8e5e99d79..5f6ed735e31a 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts @@ -34,20 +34,20 @@ sfp_eth0: sfp-eth0 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c1>; - los-gpio = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfp_gpio 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfp_gpio 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfp_gpio 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfp_gpio 1 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&sfp_gpio 0 GPIO_ACTIVE_HIGH>; }; /* SFP 1G */ sfp_eth2: sfp-eth2 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c0>; - los-gpio = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfp_gpio 6 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfp_gpio 7 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfp_gpio 6 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfp_gpio 5 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&sfp_gpio 4 GPIO_ACTIVE_HIGH>; }; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts index 871f84b4a6ed..079c2745070a 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts @@ -64,8 +64,8 @@ sfp_cp0_eth0: sfp-cp0-eth0 { compatible = "sff,sfp"; i2c-bus = <&cp0_i2c1>; - mod-def0-gpio = <&cp0_gpio2 17 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp0_gpio2 17 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp0_sfp_present_pins &cp1_sfp_tx_disable_pins>; maximum-power-milliwatt = <2000>; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index 779cf167c33e..33c179838e24 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@ -65,10 +65,10 @@ /* CON15,16 - CPM lane 4 */ compatible = "sff,sfp"; i2c-bus = <&sfpp0_i2c>; - los-gpio = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 29 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp0_pins>; maximum-power-milliwatt = <2000>; @@ -78,10 +78,10 @@ /* CON17,18 - CPS lane 4 */ compatible = "sff,sfp"; i2c-bus = <&sfpp1_i2c>; - los-gpio = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 10 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 10 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>; maximum-power-milliwatt = <2000>; @@ -91,10 +91,10 @@ /* CON13,14 - CPS lane 5 */ compatible = "sff,sfp"; i2c-bus = <&sfp_1g_i2c>; - los-gpio = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp0_gpio2 21 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 24 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp0_gpio2 21 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 24 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>; maximum-power-milliwatt = <2000>; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts index 74bed79e4f5e..72e9b0f671a9 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts @@ -67,20 +67,20 @@ sfp_cp0_eth0: sfp-cp0-eth0 { compatible = "sff,sfp"; i2c-bus = <&sfpplus0_i2c>; - los-gpio = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfpplus_gpio 11 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfpplus_gpio 10 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfpplus_gpio 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&sfpplus_gpio 8 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; sfp_cp1_eth0: sfp-cp1-eth0 { compatible = "sff,sfp"; i2c-bus = <&sfpplus1_i2c>; - los-gpio = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; + los-gpios = <&sfpplus_gpio 3 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&sfpplus_gpio 2 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&sfpplus_gpio 1 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&sfpplus_gpio 0 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi index 1acd746284dc..8e4ec243fb8f 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi @@ -78,9 +78,9 @@ compatible = "sff,sfp"; i2c-bus = <&cp0_i2c1>; mod-def0-gpios = <&expander0 3 GPIO_ACTIVE_LOW>; - los-gpio = <&expander0 15 GPIO_ACTIVE_HIGH>; - tx-disable-gpio = <&expander0 2 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>; + los-gpios = <&expander0 15 GPIO_ACTIVE_HIGH>; + tx-disable-gpios = <&expander0 2 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp0_gpio1 24 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi index 7e20987253a3..85d7ce13e70a 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi @@ -90,10 +90,10 @@ cp0_sfp_eth0: sfp-eth@0 { compatible = "sff,sfp"; i2c-bus = <&cp0_sfpp0_i2c>; - los-gpio = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp0_module_expander1 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp0_module_expander1 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp0_module_expander1 8 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp0_module_expander1 10 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp0_module_expander1 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp0_module_expander1 8 GPIO_ACTIVE_HIGH>; /* * SFP cages are unconnected on early PCBs because of an the I2C * lanes not being connected. Prevent the port for being diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi index b7fc241a228c..ff8422fae31b 100644 --- a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi @@ -37,10 +37,10 @@ cp1_sfp_eth1: sfp-eth1 { compatible = "sff,sfp"; i2c-bus = <&cp1_i2c0>; - los-gpio = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp1_gpio1 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp1_gpio1 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp1_gpio1 11 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp1_gpio1 10 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp1_gpio1 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp1_gpio1 8 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&cp1_sfp_pins>; /* diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi index 3f1795fb4fe7..512a4fa2861e 100644 --- a/arch/arm64/boot/dts/marvell/cn9132-db.dtsi +++ b/arch/arm64/boot/dts/marvell/cn9132-db.dtsi @@ -57,10 +57,10 @@ cp2_sfp_eth0: sfp-eth0 { compatible = "sff,sfp"; i2c-bus = <&cp2_sfpp0_i2c>; - los-gpio = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp2_module_expander1 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp2_module_expander1 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp2_module_expander1 8 GPIO_ACTIVE_HIGH>; + los-gpios = <&cp2_module_expander1 11 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp2_module_expander1 10 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp2_module_expander1 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp2_module_expander1 8 GPIO_ACTIVE_HIGH>; /* * SFP cages are unconnected on early PCBs because of an the I2C * lanes not being connected. Prevent the port for being