| Message ID | 1598534932-18693-8-git-send-email-sjakhade@cadence.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | PHY: Prepare Cadence Torrent PHY driver to support multilink configurations | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/dt-meta-schema | success |
On Thu, Aug 27, 2020 at 03:28:52PM +0200, Swapnil Jakhade wrote: > Torrent PHY can be used in different multi-link multi-protocol > configurations including protocols other than DisplayPort also, > such as PCIe, USB, SGMII, QSGMII etc. Update the bindings to have > support for these configurations. > > Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com> > --- > .../bindings/phy/phy-cadence-torrent.yaml | 76 ++++++++++++++----- > 1 file changed, 58 insertions(+), 18 deletions(-) > > diff --git a/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml b/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml > index a7ee19d27c19..1b9e1231f8d8 100644 > --- a/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml > +++ b/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml > @@ -4,11 +4,13 @@ > $id: "http://devicetree.org/schemas/phy/phy-cadence-torrent.yaml#" > $schema: "http://devicetree.org/meta-schemas/core.yaml#" > > -title: Cadence Torrent SD0801 PHY binding for DisplayPort > +title: Cadence Torrent SD0801 PHY binding > > description: > This binding describes the Cadence SD0801 PHY (also known as Torrent PHY) > - hardware included with the Cadence MHDP DisplayPort controller. > + hardware included with the Cadence MHDP DisplayPort controller. Torrent > + PHY also supports multilink multiprotocol combinations including protocols > + such as PCIe, USB, SGMII, QSGMII etc. > > maintainers: > - Swapnil Jakhade <sjakhade@cadence.com> > @@ -49,13 +51,14 @@ properties: > - const: dptx_phy > > resets: > - maxItems: 1 > - description: > - Torrent PHY reset. > - See Documentation/devicetree/bindings/reset/reset.txt > + minItems: 1 > + maxItems: 2 > + items: > + - description: Torrent PHY reset. > + - description: Torrent APB reset. This is optional. > > patternProperties: > - '^phy@[0-7]+$': > + '^link@[0-7]+$': No, nodes with #phy-cell should be named 'phy'. Also, the '+' is wrong unless unit-addresses are in octal. > type: object > description: > Each group of PHY lanes with a single master lane should be represented as a sub-node. > @@ -78,13 +81,13 @@ patternProperties: > Specifies the type of PHY for which the group of PHY lanes is used. > Refer include/dt-bindings/phy/phy.h. Constants from the header should be used. > $ref: /schemas/types.yaml#/definitions/uint32 > - enum: [1, 2, 3, 4, 5, 6] > + enum: [1, 2, 3, 4, 5, 6, 7, 8, 9] Probably better to change this to: minimum: 1 maximum: 9 > > cdns,num-lanes: > description: > - Number of DisplayPort lanes. > + Number of lanes. > $ref: /schemas/types.yaml#/definitions/uint32 > - enum: [1, 2, 4] > + enum: [1, 2, 3, 4] > default: 4 > > cdns,ssc-mode: > @@ -108,6 +111,7 @@ patternProperties: > - resets > - "#phy-cells" > - cdns,phy-type > + - cdns,num-lanes > > additionalProperties: false > > @@ -141,14 +145,50 @@ examples: > clock-names = "refclk"; > #address-cells = <1>; > #size-cells = <0>; > - phy@0 { > - reg = <0>; > - resets = <&phyrst 1>, <&phyrst 2>, > - <&phyrst 3>, <&phyrst 4>; > - #phy-cells = <0>; > - cdns,phy-type = <PHY_TYPE_DP>; > - cdns,num-lanes = <4>; > - cdns,max-bit-rate = <8100>; > + link@0 { > + reg = <0>; > + resets = <&phyrst 1>, <&phyrst 2>, > + <&phyrst 3>, <&phyrst 4>; > + #phy-cells = <0>; > + cdns,phy-type = <PHY_TYPE_DP>; > + cdns,num-lanes = <4>; > + cdns,max-bit-rate = <8100>; > + }; > + }; > + }; > + - | > + #include <dt-bindings/phy/phy.h> > + #include <dt-bindings/phy/phy-cadence-torrent.h> > + > + bus { > + #address-cells = <2>; > + #size-cells = <2>; > + > + torrent-phy@f0fb500000 { > + compatible = "cdns,torrent-phy"; > + reg = <0xf0 0xfb500000 0x0 0x00100000>; > + reg-names = "torrent_phy"; > + resets = <&phyrst 0>, <&phyrst 1>; > + clocks = <&ref_clk>; > + clock-names = "refclk"; > + #address-cells = <1>; > + #size-cells = <0>; > + link@0 { > + reg = <0>; > + resets = <&phyrst 2>, <&phyrst 3>; > + #phy-cells = <0>; > + cdns,phy-type = <PHY_TYPE_PCIE>; > + cdns,num-lanes = <2>; > + cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>; > + }; > + > + link@2 { > + reg = <2>; > + resets = <&phyrst 4>; > + #phy-cells = <0>; > + cdns,phy-type = <PHY_TYPE_SGMII>; > + cdns,num-lanes = <1>; > + cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>; > }; > }; > }; > -- > 2.26.1 >
diff --git a/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml b/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml index a7ee19d27c19..1b9e1231f8d8 100644 --- a/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml +++ b/Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml @@ -4,11 +4,13 @@ $id: "http://devicetree.org/schemas/phy/phy-cadence-torrent.yaml#" $schema: "http://devicetree.org/meta-schemas/core.yaml#" -title: Cadence Torrent SD0801 PHY binding for DisplayPort +title: Cadence Torrent SD0801 PHY binding description: This binding describes the Cadence SD0801 PHY (also known as Torrent PHY) - hardware included with the Cadence MHDP DisplayPort controller. + hardware included with the Cadence MHDP DisplayPort controller. Torrent + PHY also supports multilink multiprotocol combinations including protocols + such as PCIe, USB, SGMII, QSGMII etc. maintainers: - Swapnil Jakhade <sjakhade@cadence.com> @@ -49,13 +51,14 @@ properties: - const: dptx_phy resets: - maxItems: 1 - description: - Torrent PHY reset. - See Documentation/devicetree/bindings/reset/reset.txt + minItems: 1 + maxItems: 2 + items: + - description: Torrent PHY reset. + - description: Torrent APB reset. This is optional. patternProperties: - '^phy@[0-7]+$': + '^link@[0-7]+$': type: object description: Each group of PHY lanes with a single master lane should be represented as a sub-node. @@ -78,13 +81,13 @@ patternProperties: Specifies the type of PHY for which the group of PHY lanes is used. Refer include/dt-bindings/phy/phy.h. Constants from the header should be used. $ref: /schemas/types.yaml#/definitions/uint32 - enum: [1, 2, 3, 4, 5, 6] + enum: [1, 2, 3, 4, 5, 6, 7, 8, 9] cdns,num-lanes: description: - Number of DisplayPort lanes. + Number of lanes. $ref: /schemas/types.yaml#/definitions/uint32 - enum: [1, 2, 4] + enum: [1, 2, 3, 4] default: 4 cdns,ssc-mode: @@ -108,6 +111,7 @@ patternProperties: - resets - "#phy-cells" - cdns,phy-type + - cdns,num-lanes additionalProperties: false @@ -141,14 +145,50 @@ examples: clock-names = "refclk"; #address-cells = <1>; #size-cells = <0>; - phy@0 { - reg = <0>; - resets = <&phyrst 1>, <&phyrst 2>, - <&phyrst 3>, <&phyrst 4>; - #phy-cells = <0>; - cdns,phy-type = <PHY_TYPE_DP>; - cdns,num-lanes = <4>; - cdns,max-bit-rate = <8100>; + link@0 { + reg = <0>; + resets = <&phyrst 1>, <&phyrst 2>, + <&phyrst 3>, <&phyrst 4>; + #phy-cells = <0>; + cdns,phy-type = <PHY_TYPE_DP>; + cdns,num-lanes = <4>; + cdns,max-bit-rate = <8100>; + }; + }; + }; + - | + #include <dt-bindings/phy/phy.h> + #include <dt-bindings/phy/phy-cadence-torrent.h> + + bus { + #address-cells = <2>; + #size-cells = <2>; + + torrent-phy@f0fb500000 { + compatible = "cdns,torrent-phy"; + reg = <0xf0 0xfb500000 0x0 0x00100000>; + reg-names = "torrent_phy"; + resets = <&phyrst 0>, <&phyrst 1>; + clocks = <&ref_clk>; + clock-names = "refclk"; + #address-cells = <1>; + #size-cells = <0>; + link@0 { + reg = <0>; + resets = <&phyrst 2>, <&phyrst 3>; + #phy-cells = <0>; + cdns,phy-type = <PHY_TYPE_PCIE>; + cdns,num-lanes = <2>; + cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>; + }; + + link@2 { + reg = <2>; + resets = <&phyrst 4>; + #phy-cells = <0>; + cdns,phy-type = <PHY_TYPE_SGMII>; + cdns,num-lanes = <1>; + cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>; }; }; };
Torrent PHY can be used in different multi-link multi-protocol configurations including protocols other than DisplayPort also, such as PCIe, USB, SGMII, QSGMII etc. Update the bindings to have support for these configurations. Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com> --- .../bindings/phy/phy-cadence-torrent.yaml | 76 ++++++++++++++----- 1 file changed, 58 insertions(+), 18 deletions(-)