| Message ID | 20181018210933.113592-2-evgreen@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | arm64: dts: qcom: sdm845: Add UFS DT nodes | expand |
Hi, On Thu, Oct 18, 2018 at 2:09 PM Evan Green <evgreen@chromium.org> wrote: > > This change adds register regions for the second lane of dual-lane nodes. > This additional specification is needed so that the driver can stop > reaching beyond the tx and rx register allocations to get at the > second lane registers in a dual-lane PHY. > > While in there, document #clock-cells as optional for PHYs that don't > provide a pipe clock. Also, document the pcs_misc register region, which > was being quietly supplied and used. > > Signed-off-by: Evan Green <evgreen@chromium.org> > > --- > This applies atop linux-next 20181018 with the addition of Doug's > changes [1] and [2]. > > [1] https://lore.kernel.org/lkml/20181012213632.252346-1-dianders@chromium.org/ > [2] https://lore.kernel.org/lkml/20181012213926.253765-1-dianders@chromium.org/ > > .../devicetree/bindings/phy/qcom-qmp-phy.txt | 73 +++++++++++++++++++--- > 1 file changed, 65 insertions(+), 8 deletions(-) This all makes sense to me and seems like the right compromise to make The only current SoC that uses tx2/rx2 is SDM845 and the support of that SoC is in its infancy in mainline. Thus I don't mind that we say that all 5 registers are "required" even though there is an existing device tree out there that don't include tx2/rx2 for USB. Currently patch #2 in this series still makes old device trees "work" (as well as they used to) but I'm all for that being very temporary code and that officially tx2/rx2 are not optional. Reviewed-by: Douglas Anderson <dianders@chromium.org>
On Thu, Oct 18, 2018 at 02:09:29PM -0700, Evan Green wrote: > This change adds register regions for the second lane of dual-lane nodes. > This additional specification is needed so that the driver can stop > reaching beyond the tx and rx register allocations to get at the > second lane registers in a dual-lane PHY. > > While in there, document #clock-cells as optional for PHYs that don't > provide a pipe clock. Also, document the pcs_misc register region, which > was being quietly supplied and used. > > Signed-off-by: Evan Green <evgreen@chromium.org> > > --- > This applies atop linux-next 20181018 with the addition of Doug's > changes [1] and [2]. > > [1] https://lore.kernel.org/lkml/20181012213632.252346-1-dianders@chromium.org/ > [2] https://lore.kernel.org/lkml/20181012213926.253765-1-dianders@chromium.org/ > > .../devicetree/bindings/phy/qcom-qmp-phy.txt | 73 +++++++++++++++++++--- > 1 file changed, 65 insertions(+), 8 deletions(-) One nit below, otherwise: Reviewed-by: Rob Herring <robh@kernel.org> > > diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > index fbc198d5dd39..297a7c753fc8 100644 > --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > @@ -25,7 +25,7 @@ Required properties: > - For all others: > - The reg-names property shouldn't be defined. > > - - #clock-cells: must be 1 > + - #clock-cells: must be 1 (PCIe and USB3 PHYs only) > - Phy pll outputs a bunch of clocks for Tx, Rx and Pipe > interface (for pipe based PHYs). These clock are then gate-controlled > by gcc. > @@ -82,23 +82,26 @@ Required nodes: > - Each device node of QMP phy is required to have as many child nodes as > the number of lanes the PHY has. > > -Required properties for child node: > +Required properties for child nodes of PCIe PHYs (one child per lane): > - reg: list of offset and length pairs of register sets for PHY blocks - > - - index 0: tx > - - index 1: rx > - - index 2: pcs > - - index 3: pcs_misc (optional) > + tx, rx, pcs, and pcs_misc (optional). > + - #phy-cells: must be 0 > > +Required properties for a single "lanes" child node of non-PCIe PHYs: > + - reg: list of offset and length pairs of register sets for PHY blocks > + For 1-lane devices: > + tx, rx, pcs, and (optionally) pcs_misc > + For 2-lane devices: > + tx0, rx0, pcs, tx1, rx1, and (optionally) pcs_misc > - #phy-cells: must be 0 > > -Required properties child node of pcie and usb3 qmp phys: > +Required properties for child node of PCIe and USB3 qmp phys: > - clocks: a list of phandles and clock-specifier pairs, > one for each entry in clock-names. > - clock-names: Must contain following: > "pipe<lane-number>" for pipe clock specific to each lane. > - clock-output-names: Name of the PHY clock that will be the parent for > the above pipe clock. > - > For "qcom,ipq8074-qmp-pcie-phy": > - "pcie20_phy0_pipe_clk" Pipe Clock parent > (or) > @@ -150,3 +153,57 @@ Example: > ... > ... > }; > + > + phy@88eb000 { > + compatible = "qcom,sdm845-qmp-usb3-uni-phy"; > + reg = <0x88eb000 0x18c>; > + status = "disabled"; Don't show status in examples. > + #clock-cells = <1>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>, > + <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, > + <&gcc GCC_USB3_SEC_CLKREF_CLK>, > + <&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>; > + clock-names = "aux", "cfg_ahb", "ref", "com_aux"; > + > + resets = <&gcc GCC_USB3PHY_PHY_SEC_BCR>, > + <&gcc GCC_USB3_PHY_SEC_BCR>; > + reset-names = "phy", "common"; > + > + lane@88eb200 { > + reg = <0x88eb200 0x128>, > + <0x88eb400 0x1fc>, > + <0x88eb800 0x218>, > + <0x88e9600 0x70>; > + #phy-cells = <0>; > + clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>; > + clock-names = "pipe0"; > + clock-output-names = "usb3_uni_phy_pipe_clk_src"; > + }; > + }; > + > + phy@1d87000 { > + compatible = "qcom,sdm845-qmp-ufs-phy"; > + reg = <0x1d87000 0x18c>; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + clock-names = "ref", > + "ref_aux"; > + clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, > + <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; > + > + status = "disabled"; > + > + lanes@1d87400 { > + reg = <0x1d87400 0x108>, > + <0x1d87600 0x1e0>, > + <0x1d87c00 0x1dc>, > + <0x1d87800 0x108>, > + <0x1d87a00 0x1e0>; > + #phy-cells = <0>; > + }; > + }; > -- > 2.16.4 >
On Mon, Oct 22, 2018 at 5:29 PM Rob Herring <robh@kernel.org> wrote: > > On Thu, Oct 18, 2018 at 02:09:29PM -0700, Evan Green wrote: > > This change adds register regions for the second lane of dual-lane nodes. > > This additional specification is needed so that the driver can stop > > reaching beyond the tx and rx register allocations to get at the > > second lane registers in a dual-lane PHY. > > > > While in there, document #clock-cells as optional for PHYs that don't > > provide a pipe clock. Also, document the pcs_misc register region, which > > was being quietly supplied and used. > > > > Signed-off-by: Evan Green <evgreen@chromium.org> > > > > --- > > This applies atop linux-next 20181018 with the addition of Doug's > > changes [1] and [2]. > > > > [1] https://lore.kernel.org/lkml/20181012213632.252346-1-dianders@chromium.org/ > > [2] https://lore.kernel.org/lkml/20181012213926.253765-1-dianders@chromium.org/ > > > > .../devicetree/bindings/phy/qcom-qmp-phy.txt | 73 +++++++++++++++++++--- > > 1 file changed, 65 insertions(+), 8 deletions(-) > > One nit below, otherwise: > > Reviewed-by: Rob Herring <robh@kernel.org> > > > > > diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > > index fbc198d5dd39..297a7c753fc8 100644 > > --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > > +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > > @@ -25,7 +25,7 @@ Required properties: > > + > > + phy@88eb000 { > > + compatible = "qcom,sdm845-qmp-usb3-uni-phy"; > > + reg = <0x88eb000 0x18c>; > > + status = "disabled"; > > Don't show status in examples. I'll fix it. Thanks Rob.
diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt index fbc198d5dd39..297a7c753fc8 100644 --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt @@ -25,7 +25,7 @@ Required properties: - For all others: - The reg-names property shouldn't be defined. - - #clock-cells: must be 1 + - #clock-cells: must be 1 (PCIe and USB3 PHYs only) - Phy pll outputs a bunch of clocks for Tx, Rx and Pipe interface (for pipe based PHYs). These clock are then gate-controlled by gcc. @@ -82,23 +82,26 @@ Required nodes: - Each device node of QMP phy is required to have as many child nodes as the number of lanes the PHY has. -Required properties for child node: +Required properties for child nodes of PCIe PHYs (one child per lane): - reg: list of offset and length pairs of register sets for PHY blocks - - - index 0: tx - - index 1: rx - - index 2: pcs - - index 3: pcs_misc (optional) + tx, rx, pcs, and pcs_misc (optional). + - #phy-cells: must be 0 +Required properties for a single "lanes" child node of non-PCIe PHYs: + - reg: list of offset and length pairs of register sets for PHY blocks + For 1-lane devices: + tx, rx, pcs, and (optionally) pcs_misc + For 2-lane devices: + tx0, rx0, pcs, tx1, rx1, and (optionally) pcs_misc - #phy-cells: must be 0 -Required properties child node of pcie and usb3 qmp phys: +Required properties for child node of PCIe and USB3 qmp phys: - clocks: a list of phandles and clock-specifier pairs, one for each entry in clock-names. - clock-names: Must contain following: "pipe<lane-number>" for pipe clock specific to each lane. - clock-output-names: Name of the PHY clock that will be the parent for the above pipe clock. - For "qcom,ipq8074-qmp-pcie-phy": - "pcie20_phy0_pipe_clk" Pipe Clock parent (or) @@ -150,3 +153,57 @@ Example: ... ... }; + + phy@88eb000 { + compatible = "qcom,sdm845-qmp-usb3-uni-phy"; + reg = <0x88eb000 0x18c>; + status = "disabled"; + #clock-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>, + <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, + <&gcc GCC_USB3_SEC_CLKREF_CLK>, + <&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>; + clock-names = "aux", "cfg_ahb", "ref", "com_aux"; + + resets = <&gcc GCC_USB3PHY_PHY_SEC_BCR>, + <&gcc GCC_USB3_PHY_SEC_BCR>; + reset-names = "phy", "common"; + + lane@88eb200 { + reg = <0x88eb200 0x128>, + <0x88eb400 0x1fc>, + <0x88eb800 0x218>, + <0x88e9600 0x70>; + #phy-cells = <0>; + clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>; + clock-names = "pipe0"; + clock-output-names = "usb3_uni_phy_pipe_clk_src"; + }; + }; + + phy@1d87000 { + compatible = "qcom,sdm845-qmp-ufs-phy"; + reg = <0x1d87000 0x18c>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + clock-names = "ref", + "ref_aux"; + clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, + <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; + + status = "disabled"; + + lanes@1d87400 { + reg = <0x1d87400 0x108>, + <0x1d87600 0x1e0>, + <0x1d87c00 0x1dc>, + <0x1d87800 0x108>, + <0x1d87a00 0x1e0>; + #phy-cells = <0>; + }; + };
This change adds register regions for the second lane of dual-lane nodes. This additional specification is needed so that the driver can stop reaching beyond the tx and rx register allocations to get at the second lane registers in a dual-lane PHY. While in there, document #clock-cells as optional for PHYs that don't provide a pipe clock. Also, document the pcs_misc register region, which was being quietly supplied and used. Signed-off-by: Evan Green <evgreen@chromium.org> --- This applies atop linux-next 20181018 with the addition of Doug's changes [1] and [2]. [1] https://lore.kernel.org/lkml/20181012213632.252346-1-dianders@chromium.org/ [2] https://lore.kernel.org/lkml/20181012213926.253765-1-dianders@chromium.org/ .../devicetree/bindings/phy/qcom-qmp-phy.txt | 73 +++++++++++++++++++--- 1 file changed, 65 insertions(+), 8 deletions(-)