[PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Frank Wang]

From: Frank Wang <frank.wang@rock-chips.com>

Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
configured in usbdp phy driver.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
---
Changelog:
v2:
 - This is a new patch adds rk3576-vo1-grf syscon.

v1:
 - none

 Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
index 50d727f4b76c6..fd42217ab85e7 100644
--- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
+++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
@@ -33,6 +33,7 @@ properties:
               - rockchip,rk3576-usb-grf
               - rockchip,rk3576-usbdpphy-grf
               - rockchip,rk3576-vo0-grf
+              - rockchip,rk3576-vo1-grf
               - rockchip,rk3576-vop-grf
               - rockchip,rk3588-bigcore0-grf
               - rockchip,rk3588-bigcore1-grf
@@ -283,6 +284,7 @@ allOf:
         compatible:
           contains:
             enum:
+              - rockchip,rk3576-vo1-grf
               - rockchip,rk3588-vo-grf
               - rockchip,rk3588-vo0-grf
               - rockchip,rk3588-vo1-grf
-- 
2.25.1

[PATCH v2 2/3] dt-bindings: phy: rockchip-usbdp: add rk3576

[Frank Wang]

From: Frank Wang <frank.wang@rock-chips.com>

Add compatible for the USBDP phy in the Rockchip RK3576 SoC.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
---
Changelog:
v2:
 - add Reviewed and Acked tag.

v1:
 - https://patchwork.kernel.org/project/linux-phy/patch/20241014020342.15974-1-frawang.cn@gmail.com/

 Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml b/Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml
index 1f1f8863b80d0..b42f1272903d8 100644
--- a/Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml
+++ b/Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml
@@ -13,6 +13,7 @@ maintainers:
 properties:
   compatible:
     enum:
+      - rockchip,rk3576-usbdp-phy
       - rockchip,rk3588-usbdp-phy
 
   reg:
-- 
2.25.1

[PATCH v2 3/3] phy: rockchip: usbdp: add rk3576 device match data

[Frank Wang]

From: Frank Wang <frank.wang@rock-chips.com>

This adds RK3576 device match data support.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Acked-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
---
Changelog:
v2:
 - add Reviewed and Acked tag.

v1:
 - https://patchwork.kernel.org/project/linux-phy/patch/20241014020342.15974-2-frawang.cn@gmail.com/

 drivers/phy/rockchip/phy-rockchip-usbdp.c | 41 +++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c
index 2c51e5c62d3eb..5b1e8a3806ed4 100644
--- a/drivers/phy/rockchip/phy-rockchip-usbdp.c
+++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c
@@ -1538,6 +1538,43 @@ static const char * const rk_udphy_rst_list[] = {
 	"init", "cmn", "lane", "pcs_apb", "pma_apb"
 };
 
+static const struct rk_udphy_cfg rk3576_udphy_cfgs = {
+	.num_phys = 1,
+	.phy_ids = { 0x2b010000 },
+	.num_rsts = ARRAY_SIZE(rk_udphy_rst_list),
+	.rst_list = rk_udphy_rst_list,
+	.grfcfg	= {
+		/* u2phy-grf */
+		.bvalid_phy_con		= RK_UDPHY_GEN_GRF_REG(0x0010, 1, 0, 0x2, 0x3),
+		.bvalid_grf_con		= RK_UDPHY_GEN_GRF_REG(0x0000, 15, 14, 0x1, 0x3),
+
+		/* usb-grf */
+		.usb3otg0_cfg		= RK_UDPHY_GEN_GRF_REG(0x0030, 15, 0, 0x1100, 0x0188),
+
+		/* usbdpphy-grf */
+		.low_pwrn		= RK_UDPHY_GEN_GRF_REG(0x0004, 13, 13, 0, 1),
+		.rx_lfps		= RK_UDPHY_GEN_GRF_REG(0x0004, 14, 14, 0, 1),
+	},
+	.vogrfcfg = {
+		{
+			.hpd_trigger	= RK_UDPHY_GEN_GRF_REG(0x0000, 11, 10, 1, 3),
+			.dp_lane_reg    = 0x0000,
+		},
+	},
+	.dp_tx_ctrl_cfg = {
+		rk3588_dp_tx_drv_ctrl_rbr_hbr_typec,
+		rk3588_dp_tx_drv_ctrl_rbr_hbr_typec,
+		rk3588_dp_tx_drv_ctrl_hbr2,
+		rk3588_dp_tx_drv_ctrl_hbr3,
+	},
+	.dp_tx_ctrl_cfg_typec = {
+		rk3588_dp_tx_drv_ctrl_rbr_hbr_typec,
+		rk3588_dp_tx_drv_ctrl_rbr_hbr_typec,
+		rk3588_dp_tx_drv_ctrl_hbr2,
+		rk3588_dp_tx_drv_ctrl_hbr3,
+	},
+};
+
 static const struct rk_udphy_cfg rk3588_udphy_cfgs = {
 	.num_phys = 2,
 	.phy_ids = {
@@ -1584,6 +1621,10 @@ static const struct rk_udphy_cfg rk3588_udphy_cfgs = {
 };
 
 static const struct of_device_id rk_udphy_dt_match[] = {
+	{
+		.compatible = "rockchip,rk3576-usbdp-phy",
+		.data = &rk3576_udphy_cfgs
+	},
 	{
 		.compatible = "rockchip,rk3588-usbdp-phy",
 		.data = &rk3588_udphy_cfgs
-- 
2.25.1

Re: [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Krzysztof Kozlowski]

On Thu, Oct 17, 2024 at 10:52:28AM +0800, Frank Wang wrote:
> From: Frank Wang <frank.wang@rock-chips.com>
> 
> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
> configured in usbdp phy driver.
> 
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
> ---
> Changelog:
> v2:
>  - This is a new patch adds rk3576-vo1-grf syscon.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: (subset) [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Vinod Koul]

On Thu, 17 Oct 2024 10:52:28 +0800, Frank Wang wrote:
> From: Frank Wang <frank.wang@rock-chips.com>
> 
> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
> configured in usbdp phy driver.
> 
> 

Applied, thanks!

[2/3] dt-bindings: phy: rockchip-usbdp: add rk3576
      commit: b3e804ab9aad465ba7285aa5daf83656d5efc59f
[3/3] phy: rockchip: usbdp: add rk3576 device match data
      commit: a76de028c619dd18f89786805bcc7bb4d379ea9f

Best regards,
-- 
~Vinod

Re: [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Dragan Simic]

Hello Frank,

On 2024-10-17 04:52, Frank Wang wrote:
> From: Frank Wang <frank.wang@rock-chips.com>
> 
> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
> configured in usbdp phy driver.
> 
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
> ---
> Changelog:
> v2:
>  - This is a new patch adds rk3576-vo1-grf syscon.

Could you, please, clarify a bit why is this additional patch
needed in this series?

> v1:
>  - none
> 
>  Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
> b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
> index 50d727f4b76c6..fd42217ab85e7 100644
> --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
> +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
> @@ -33,6 +33,7 @@ properties:
>                - rockchip,rk3576-usb-grf
>                - rockchip,rk3576-usbdpphy-grf
>                - rockchip,rk3576-vo0-grf
> +              - rockchip,rk3576-vo1-grf
>                - rockchip,rk3576-vop-grf
>                - rockchip,rk3588-bigcore0-grf
>                - rockchip,rk3588-bigcore1-grf
> @@ -283,6 +284,7 @@ allOf:
>          compatible:
>            contains:
>              enum:
> +              - rockchip,rk3576-vo1-grf
>                - rockchip,rk3588-vo-grf
>                - rockchip,rk3588-vo0-grf
>                - rockchip,rk3588-vo1-grf

Re: [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Frank Wang]

Hi Dragan,

On 2024/10/18 13:02, Dragan Simic wrote:
> Hello Frank,
>
> On 2024-10-17 04:52, Frank Wang wrote:
>> From: Frank Wang <frank.wang@rock-chips.com>
>>
>> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
>> configured in usbdp phy driver.
>>
>> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
>> ---
>> Changelog:
>> v2:
>>  - This is a new patch adds rk3576-vo1-grf syscon.
>
> Could you, please, clarify a bit why is this additional patch
> needed in this series?
>

I mentioned in the commit content. The usbdp-phy driver select dp lanes 
via configuring the vo1-grf.

Best regards,
Frank

>> v1:
>>  - none
>>
>>  Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>> b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>> index 50d727f4b76c6..fd42217ab85e7 100644
>> --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>> +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>> @@ -33,6 +33,7 @@ properties:
>>                - rockchip,rk3576-usb-grf
>>                - rockchip,rk3576-usbdpphy-grf
>>                - rockchip,rk3576-vo0-grf
>> +              - rockchip,rk3576-vo1-grf
>>                - rockchip,rk3576-vop-grf
>>                - rockchip,rk3588-bigcore0-grf
>>                - rockchip,rk3588-bigcore1-grf
>> @@ -283,6 +284,7 @@ allOf:
>>          compatible:
>>            contains:
>>              enum:
>> +              - rockchip,rk3576-vo1-grf
>>                - rockchip,rk3588-vo-grf
>>                - rockchip,rk3588-vo0-grf
>>                - rockchip,rk3588-vo1-grf

Re: [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Dragan Simic]

Hello Frank,

On 2024-10-18 08:18, Frank Wang wrote:
> On 2024/10/18 13:02, Dragan Simic wrote:
>> On 2024-10-17 04:52, Frank Wang wrote:
>>> From: Frank Wang <frank.wang@rock-chips.com>
>>> 
>>> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
>>> configured in usbdp phy driver.
>>> 
>>> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
>>> ---
>>> Changelog:
>>> v2:
>>>  - This is a new patch adds rk3576-vo1-grf syscon.
>> 
>> Could you, please, clarify a bit why is this additional patch
>> needed in this series?
> 
> I mentioned in the commit content. The usbdp-phy driver select dp
> lanes via configuring the vo1-grf.

Yes, I already saw that in the patch description.  Though, and
I apologize if I'm missing something obvious, I can't see where
is it actually used in the code?  Is it yet to be used in the
dts(i) files?

I'd appreciate if you could clarify that just a bit further, so
I can hopefully understand it better.

>>> v1:
>>>  - none
>>> 
>>>  Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++
>>>  1 file changed, 2 insertions(+)
>>> 
>>> diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>> b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>> index 50d727f4b76c6..fd42217ab85e7 100644
>>> --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>> +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>> @@ -33,6 +33,7 @@ properties:
>>>                - rockchip,rk3576-usb-grf
>>>                - rockchip,rk3576-usbdpphy-grf
>>>                - rockchip,rk3576-vo0-grf
>>> +              - rockchip,rk3576-vo1-grf
>>>                - rockchip,rk3576-vop-grf
>>>                - rockchip,rk3588-bigcore0-grf
>>>                - rockchip,rk3588-bigcore1-grf
>>> @@ -283,6 +284,7 @@ allOf:
>>>          compatible:
>>>            contains:
>>>              enum:
>>> +              - rockchip,rk3576-vo1-grf
>>>                - rockchip,rk3588-vo-grf
>>>                - rockchip,rk3588-vo0-grf
>>>                - rockchip,rk3588-vo1-grf
> 
> 
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Frank Wang]

Hi Dragan,

On 2024/10/18 14:37, Dragan Simic wrote:
> Hello Frank,
>
> On 2024-10-18 08:18, Frank Wang wrote:
>> On 2024/10/18 13:02, Dragan Simic wrote:
>>> On 2024-10-17 04:52, Frank Wang wrote:
>>>> From: Frank Wang <frank.wang@rock-chips.com>
>>>>
>>>> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
>>>> configured in usbdp phy driver.
>>>>
>>>> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
>>>> ---
>>>> Changelog:
>>>> v2:
>>>>  - This is a new patch adds rk3576-vo1-grf syscon.
>>>
>>> Could you, please, clarify a bit why is this additional patch
>>> needed in this series?
>>
>> I mentioned in the commit content. The usbdp-phy driver select dp
>> lanes via configuring the vo1-grf.
>
> Yes, I already saw that in the patch description.  Though, and
> I apologize if I'm missing something obvious, I can't see where
> is it actually used in the code?  Is it yet to be used in the
> dts(i) files?
>
> I'd appreciate if you could clarify that just a bit further, so
> I can hopefully understand it better.
>

Yes, the usbdp_phy node in dts(i) will assign the vo1-grf phandle like this:

usbdp_phy: phy@2b010000 {
         ...
         rockchip,vo-grf = <&vo1_grf>;
};

And the usbdp-phy driver parses it and assign to udphy->vogrf, it uses 
in rk_udphy_dplane_select().

The related codes have already existed in the current driver, so for 
RK3576, just only need to do a configuration.


Best regards,
Frank

>>>> v1:
>>>>  - none
>>>>
>>>>  Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++
>>>>  1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>> b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>> index 50d727f4b76c6..fd42217ab85e7 100644
>>>> --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>> +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>> @@ -33,6 +33,7 @@ properties:
>>>>                - rockchip,rk3576-usb-grf
>>>>                - rockchip,rk3576-usbdpphy-grf
>>>>                - rockchip,rk3576-vo0-grf
>>>> +              - rockchip,rk3576-vo1-grf
>>>>                - rockchip,rk3576-vop-grf
>>>>                - rockchip,rk3588-bigcore0-grf
>>>>                - rockchip,rk3588-bigcore1-grf
>>>> @@ -283,6 +284,7 @@ allOf:
>>>>          compatible:
>>>>            contains:
>>>>              enum:
>>>> +              - rockchip,rk3576-vo1-grf
>>>>                - rockchip,rk3588-vo-grf
>>>>                - rockchip,rk3588-vo0-grf
>>>>                - rockchip,rk3588-vo1-grf
>>
>>
>> _______________________________________________
>> Linux-rockchip mailing list
>> Linux-rockchip@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-rockchip

Re: [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Dragan Simic]

Hello Frank,

On 2024-10-18 09:34, Frank Wang wrote:
> On 2024/10/18 14:37, Dragan Simic wrote:
>> On 2024-10-18 08:18, Frank Wang wrote:
>>> On 2024/10/18 13:02, Dragan Simic wrote:
>>>> On 2024-10-17 04:52, Frank Wang wrote:
>>>>> From: Frank Wang <frank.wang@rock-chips.com>
>>>>> 
>>>>> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
>>>>> configured in usbdp phy driver.
>>>>> 
>>>>> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
>>>>> ---
>>>>> Changelog:
>>>>> v2:
>>>>>  - This is a new patch adds rk3576-vo1-grf syscon.
>>>> 
>>>> Could you, please, clarify a bit why is this additional patch
>>>> needed in this series?
>>> 
>>> I mentioned in the commit content. The usbdp-phy driver select dp
>>> lanes via configuring the vo1-grf.
>> 
>> Yes, I already saw that in the patch description.  Though, and
>> I apologize if I'm missing something obvious, I can't see where
>> is it actually used in the code?  Is it yet to be used in the
>> dts(i) files?
>> 
>> I'd appreciate if you could clarify that just a bit further, so
>> I can hopefully understand it better.
> 
> Yes, the usbdp_phy node in dts(i) will assign the vo1-grf phandle like 
> this:
> 
> usbdp_phy: phy@2b010000 {
>         ...
>         rockchip,vo-grf = <&vo1_grf>;
> };
> 
> And the usbdp-phy driver parses it and assign to udphy->vogrf, it uses
> in rk_udphy_dplane_select().
> 
> The related codes have already existed in the current driver, so for
> RK3576, just only need to do a configuration.

Great, thanks for the detailed explanation!  This confirms
my latest assumption and everything is looking good, so please
free to include:

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

>>>>> v1:
>>>>>  - none
>>>>> 
>>>>>  Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 2 ++
>>>>>  1 file changed, 2 insertions(+)
>>>>> 
>>>>> diff --git 
>>>>> a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>>> b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>>> index 50d727f4b76c6..fd42217ab85e7 100644
>>>>> --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>>> +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml
>>>>> @@ -33,6 +33,7 @@ properties:
>>>>>                - rockchip,rk3576-usb-grf
>>>>>                - rockchip,rk3576-usbdpphy-grf
>>>>>                - rockchip,rk3576-vo0-grf
>>>>> +              - rockchip,rk3576-vo1-grf
>>>>>                - rockchip,rk3576-vop-grf
>>>>>                - rockchip,rk3588-bigcore0-grf
>>>>>                - rockchip,rk3588-bigcore1-grf
>>>>> @@ -283,6 +284,7 @@ allOf:
>>>>>          compatible:
>>>>>            contains:
>>>>>              enum:
>>>>> +              - rockchip,rk3576-vo1-grf
>>>>>                - rockchip,rk3588-vo-grf
>>>>>                - rockchip,rk3588-vo0-grf
>>>>>                - rockchip,rk3588-vo1-grf

Re: (subset) [PATCH v2 1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon

[Heiko Stuebner]

On Thu, 17 Oct 2024 10:52:28 +0800, Frank Wang wrote:
> From: Frank Wang <frank.wang@rock-chips.com>
> 
> Add rockchip,rk3576-vo1-grf syscon compatible, the vo1-grf is
> configured in usbdp phy driver.
> 
> 

Applied, thanks!

[1/3] dt-bindings: soc: rockchip: add rk3576 vo1-grf syscon
      commit: ab79914808df7163564bffbc9f79801898fa906d

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>