Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dt-bindings: phy: Convert marvell,comphy-cp110 to DT schema

Convert the Marvell CP110 combo PHY binding to DT schema format. It's a
straight forward conversion.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20250607212605.743176-1-robh@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Rob Herring (Arm) and committed by
Vinod Koul
50355ac7 08a9bc35

+155 -95
+154
Documentation/devicetree/bindings/phy/marvell,comphy-cp110.yaml
··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/phy/marvell,comphy-cp110.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Marvell MVEBU COMPHY Controller 8 + 9 + maintainers: 10 + - Miquel Raynal <miquel.raynal@bootlin.com> 11 + 12 + description: > 13 + COMPHY controllers can be found on the following Marvell MVEBU SoCs: 14 + 15 + * Armada 7k/8k (on the CP110) 16 + * Armada 3700 17 + 18 + It provides a number of shared PHYs used by various interfaces (network, SATA, 19 + USB, PCIe...). 20 + 21 + properties: 22 + compatible: 23 + enum: 24 + - marvell,comphy-cp110 25 + - marvell,comphy-a3700 26 + 27 + reg: 28 + minItems: 1 29 + items: 30 + - description: Generic COMPHY registers 31 + - description: Lane 1 (PCIe/GbE) registers (Armada 3700) 32 + - description: Lane 0 (USB3/GbE) registers (Armada 3700) 33 + - description: Lane 2 (SATA/USB3) registers (Armada 3700) 34 + 35 + reg-names: 36 + minItems: 1 37 + items: 38 + - const: comphy 39 + - const: lane1_pcie_gbe 40 + - const: lane0_usb3_gbe 41 + - const: lane2_sata_usb3 42 + 43 + '#address-cells': 44 + const: 1 45 + 46 + '#size-cells': 47 + const: 0 48 + 49 + clocks: 50 + maxItems: 3 51 + description: Reference clocks for CP110; MG clock, MG Core clock, AXI clock 52 + 53 + clock-names: 54 + items: 55 + - const: mg_clk 56 + - const: mg_core_clk 57 + - const: axi_clk 58 + 59 + marvell,system-controller: 60 + description: Phandle to the Marvell system controller (CP110 only) 61 + $ref: /schemas/types.yaml#/definitions/phandle 62 + 63 + patternProperties: 64 + '^phy@[0-2]$': 65 + description: A COMPHY lane child node 66 + type: object 67 + additionalProperties: false 68 + 69 + properties: 70 + reg: 71 + description: COMPHY lane number 72 + 73 + '#phy-cells': 74 + const: 1 75 + 76 + required: 77 + - reg 78 + - '#phy-cells' 79 + 80 + required: 81 + - compatible 82 + - reg 83 + 84 + additionalProperties: false 85 + 86 + allOf: 87 + - if: 88 + properties: 89 + compatible: 90 + const: marvell,comphy-a3700 91 + 92 + then: 93 + properties: 94 + clocks: false 95 + clock-names: false 96 + 97 + required: 98 + - reg-names 99 + 100 + else: 101 + required: 102 + - marvell,system-controller 103 + 104 + examples: 105 + - | 106 + phy@120000 { 107 + compatible = "marvell,comphy-cp110"; 108 + reg = <0x120000 0x6000>; 109 + clocks = <&clk 1 5>, <&clk 1 6>, <&clk 1 18>; 110 + clock-names = "mg_clk", "mg_core_clk", "axi_clk"; 111 + #address-cells = <1>; 112 + #size-cells = <0>; 113 + marvell,system-controller = <&syscon0>; 114 + 115 + phy@0 { 116 + reg = <0>; 117 + #phy-cells = <1>; 118 + }; 119 + 120 + phy@1 { 121 + reg = <1>; 122 + #phy-cells = <1>; 123 + }; 124 + }; 125 + 126 + - | 127 + phy@18300 { 128 + compatible = "marvell,comphy-a3700"; 129 + reg = <0x18300 0x300>, 130 + <0x1F000 0x400>, 131 + <0x5C000 0x400>, 132 + <0xe0178 0x8>; 133 + reg-names = "comphy", 134 + "lane1_pcie_gbe", 135 + "lane0_usb3_gbe", 136 + "lane2_sata_usb3"; 137 + #address-cells = <1>; 138 + #size-cells = <0>; 139 + 140 + comphy0: phy@0 { 141 + reg = <0>; 142 + #phy-cells = <1>; 143 + }; 144 + 145 + comphy1: phy@1 { 146 + reg = <1>; 147 + #phy-cells = <1>; 148 + }; 149 + 150 + comphy2: phy@2 { 151 + reg = <2>; 152 + #phy-cells = <1>; 153 + }; 154 + };
-94
Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt
··· 1 - MVEBU comphy drivers 2 - -------------------- 3 - 4 - COMPHY controllers can be found on the following Marvell MVEBU SoCs: 5 - * Armada 7k/8k (on the CP110) 6 - * Armada 3700 7 - It provides a number of shared PHYs used by various interfaces (network, SATA, 8 - USB, PCIe...). 9 - 10 - Required properties: 11 - 12 - - compatible: should be one of: 13 - * "marvell,comphy-cp110" for Armada 7k/8k 14 - * "marvell,comphy-a3700" for Armada 3700 15 - - reg: should contain the COMPHY register(s) location(s) and length(s). 16 - * 1 entry for Armada 7k/8k 17 - * 4 entries for Armada 3700 along with the corresponding reg-names 18 - properties, memory areas are: 19 - * Generic COMPHY registers 20 - * Lane 1 (PCIe/GbE) 21 - * Lane 0 (USB3/GbE) 22 - * Lane 2 (SATA/USB3) 23 - - marvell,system-controller: should contain a phandle to the system 24 - controller node (only for Armada 7k/8k) 25 - - #address-cells: should be 1. 26 - - #size-cells: should be 0. 27 - 28 - Optional properlties: 29 - 30 - - clocks: pointers to the reference clocks for this device (CP110 only), 31 - consequently: MG clock, MG Core clock, AXI clock. 32 - - clock-names: names of used clocks for CP110 only, must be : 33 - "mg_clk", "mg_core_clk" and "axi_clk". 34 - 35 - A sub-node is required for each comphy lane provided by the comphy. 36 - 37 - Required properties (child nodes): 38 - 39 - - reg: COMPHY lane number. 40 - - #phy-cells : from the generic PHY bindings, must be 1. Defines the 41 - input port to use for a given comphy lane. 42 - 43 - Examples: 44 - 45 - CP11X_LABEL(comphy): phy@120000 { 46 - compatible = "marvell,comphy-cp110"; 47 - reg = <0x120000 0x6000>; 48 - marvell,system-controller = <&CP11X_LABEL(syscon0)>; 49 - clocks = <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>, 50 - <&CP11X_LABEL(clk) 1 18>; 51 - clock-names = "mg_clk", "mg_core_clk", "axi_clk"; 52 - #address-cells = <1>; 53 - #size-cells = <0>; 54 - 55 - CP11X_LABEL(comphy0): phy@0 { 56 - reg = <0>; 57 - #phy-cells = <1>; 58 - }; 59 - 60 - CP11X_LABEL(comphy1): phy@1 { 61 - reg = <1>; 62 - #phy-cells = <1>; 63 - }; 64 - }; 65 - 66 - comphy: phy@18300 { 67 - compatible = "marvell,comphy-a3700"; 68 - reg = <0x18300 0x300>, 69 - <0x1F000 0x400>, 70 - <0x5C000 0x400>, 71 - <0xe0178 0x8>; 72 - reg-names = "comphy", 73 - "lane1_pcie_gbe", 74 - "lane0_usb3_gbe", 75 - "lane2_sata_usb3"; 76 - #address-cells = <1>; 77 - #size-cells = <0>; 78 - 79 - 80 - comphy0: phy@0 { 81 - reg = <0>; 82 - #phy-cells = <1>; 83 - }; 84 - 85 - comphy1: phy@1 { 86 - reg = <1>; 87 - #phy-cells = <1>; 88 - }; 89 - 90 - comphy2: phy@2 { 91 - reg = <2>; 92 - #phy-cells = <1>; 93 - }; 94 - };
+1 -1
MAINTAINERS
··· 14495 14495 M: Miquel Raynal <miquel.raynal@bootlin.com> 14496 14496 S: Maintained 14497 14497 F: Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml 14498 - F: Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt 14498 + F: Documentation/devicetree/bindings/phy/marvell,comphy-cp110.yaml 14499 14499 F: drivers/phy/marvell/phy-mvebu-a3700-comphy.c 14500 14500 F: drivers/phy/marvell/phy-mvebu-a3700-utmi.c 14501 14501