[PATCH v2 0/4] Add USB Phy driver and binding changes for Qualcomm Shikra SoC

[PATCH v2 0/4] Add USB Phy driver and binding changes for Qualcomm Shikra SoC

[Krishna Kurapati]

This series adds Driver and binding changes for USB Phys on Shikra. There
are two USB controllers - One of them is SS capable and other is highspeed
only capable. The ss Phy init sequence is same as that of Talos.

Changes in v2:
- Separated the usb controller binding changes
- Updated commit texts.

Krishna Kurapati (4):
  dt-bindings: phy: qcom,qusb2: Document QUSB2 Phy for Shikra
  dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra
  phy: qcom-qusb2: Add support for Shikra
  phy: qcom: qmp-usbc: Add qmp configuration for Shikra

 .../bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml  |  2 ++
 .../devicetree/bindings/phy/qcom,qusb2-phy.yaml  |  1 +
 drivers/phy/qualcomm/phy-qcom-qmp-usbc.c         |  3 +++
 drivers/phy/qualcomm/phy-qcom-qusb2.c            | 16 ++++++++++++++++
 4 files changed, 22 insertions(+)

-- 
2.34.1

[PATCH v2 1/4] dt-bindings: phy: qcom,qusb2: Document QUSB2 Phy for Shikra

[Krishna Kurapati]

Update dt-bindings to add Shikra to QUSB2 Phy list. Shikra SoC
has two High Speed QUSB2 Phys.

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
---
 Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
index 39851ba9de43..ddbddeec6fb1 100644
--- a/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
@@ -28,6 +28,7 @@ properties:
               - qcom,qcm2290-qusb2-phy
               - qcom,qcs615-qusb2-phy
               - qcom,sdm660-qusb2-phy
+              - qcom,shikra-qusb2-phy
               - qcom,sm4250-qusb2-phy
               - qcom,sm6115-qusb2-phy
       - items:
-- 
2.34.1

[PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krishna Kurapati]

Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
---
 .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml
index 1636285fbe53..8402fe4a96e0 100644
--- a/Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml
@@ -20,6 +20,7 @@ properties:
       - qcom,qcm2290-qmp-usb3-phy
       - qcom,qcs615-qmp-usb3-phy
       - qcom,sdm660-qmp-usb3-phy
+      - qcom,shikra-qmp-usb3-phy
       - qcom,sm6115-qmp-usb3-phy
 
   reg:
@@ -116,6 +117,7 @@ allOf:
           contains:
             enum:
               - qcom,qcm2290-qmp-usb3-phy
+              - qcom,shikra-qmp-usb3-phy
               - qcom,sm6115-qmp-usb3-phy
     then:
       properties:
-- 
2.34.1

[PATCH v2 3/4] phy: qcom-qusb2: Add support for Shikra

[Krishna Kurapati]

Add init sequence and phy configuration for Shikra.

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
---
 drivers/phy/qualcomm/phy-qcom-qusb2.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c
index eb93015be841..ab7437e7b751 100644
--- a/drivers/phy/qualcomm/phy-qcom-qusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c
@@ -381,6 +381,19 @@ static const struct qusb2_phy_cfg sdm660_phy_cfg = {
 	.autoresume_en	 = BIT(3),
 };
 
+static const struct qusb2_phy_cfg shikra_phy_cfg = {
+	.tbl            = qcs615_init_tbl,
+	.tbl_num        = ARRAY_SIZE(qcs615_init_tbl),
+	.regs           = ipq6018_regs_layout,
+
+	.has_pll_test	= true,
+	.se_clk_scheme_default = true,
+	.disable_ctrl   = CLAMP_N_EN | FREEZIO_N | POWER_DOWN,
+	.mask_core_ready = PLL_LOCKED,
+	.autoresume_en   = BIT(3),
+	.update_tune1_with_efuse = false,
+};
+
 static const struct qusb2_phy_cfg sm6115_phy_cfg = {
 	.tbl		= sm6115_init_tbl,
 	.tbl_num	= ARRAY_SIZE(sm6115_init_tbl),
@@ -958,6 +971,9 @@ static const struct of_device_id qusb2_phy_of_match_table[] = {
 	}, {
 		.compatible	= "qcom,sdm660-qusb2-phy",
 		.data		= &sdm660_phy_cfg,
+	}, {
+		.compatible	= "qcom,shikra-qusb2-phy",
+		.data		= &shikra_phy_cfg,
 	}, {
 		.compatible	= "qcom,sm4250-qusb2-phy",
 		.data		= &sm6115_phy_cfg,
-- 
2.34.1

[PATCH v2 4/4] phy: qcom: qmp-usbc: Add qmp configuration for Shikra

[Krishna Kurapati]

Add init sequence and phy configuration for the Super Speed port
on Shikra SoC.

Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
---
 drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
index c342479a3798..400dcebf8222 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
@@ -2019,6 +2019,9 @@ static const struct of_device_id qmp_usbc_of_match_table[] = {
 	}, {
 		.compatible = "qcom,sdm660-qmp-usb3-phy",
 		.data = &sdm660_usb3phy_cfg,
+	}, {
+		.compatible = "qcom,shikra-qmp-usb3-phy",
+		.data = &qcs615_usb3phy_cfg,
 	}, {
 		.compatible = "qcom,sm6115-qmp-usb3-phy",
 		.data = &qcm2290_usb3phy_cfg,
-- 
2.34.1

Re: [PATCH v2 4/4] phy: qcom: qmp-usbc: Add qmp configuration for Shikra

[Dmitry Baryshkov]

On Mon, May 04, 2026 at 10:36:59PM +0530, Krishna Kurapati wrote:
> Add init sequence and phy configuration for the Super Speed port
> on Shikra SoC.
> 
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---
>  drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
> index c342479a3798..400dcebf8222 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
> @@ -2019,6 +2019,9 @@ static const struct of_device_id qmp_usbc_of_match_table[] = {
>  	}, {
>  		.compatible = "qcom,sdm660-qmp-usb3-phy",
>  		.data = &sdm660_usb3phy_cfg,
> +	}, {
> +		.compatible = "qcom,shikra-qmp-usb3-phy",
> +		.data = &qcs615_usb3phy_cfg,

If we are reusing Talos configuration, should Talos also be used for the
fallback compat instead of modifying the driver?

>  	}, {
>  		.compatible = "qcom,sm6115-qmp-usb3-phy",
>  		.data = &qcm2290_usb3phy_cfg,
> -- 
> 2.34.1
> 

-- 
With best wishes
Dmitry

Re: [PATCH v2 4/4] phy: qcom: qmp-usbc: Add qmp configuration for Shikra

[Krishna Kurapati]

On 5/5/2026 12:58 AM, Dmitry Baryshkov wrote:
> On Mon, May 04, 2026 at 10:36:59PM +0530, Krishna Kurapati wrote:
>> Add init sequence and phy configuration for the Super Speed port
>> on Shikra SoC.
>>
>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>> ---
>>   drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
>> index c342479a3798..400dcebf8222 100644
>> --- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
>> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
>> @@ -2019,6 +2019,9 @@ static const struct of_device_id qmp_usbc_of_match_table[] = {
>>   	}, {
>>   		.compatible = "qcom,sdm660-qmp-usb3-phy",
>>   		.data = &sdm660_usb3phy_cfg,
>> +	}, {
>> +		.compatible = "qcom,shikra-qmp-usb3-phy",
>> +		.data = &qcs615_usb3phy_cfg,
> 
> If we are reusing Talos configuration, should Talos also be used for the
> fallback compat instead of modifying the driver?
>

The clocks are different and hence I didn't use fallback.

Regards,
Krishna,

>>   	}, {
>>   		.compatible = "qcom,sm6115-qmp-usb3-phy",
>>   		.data = &qcm2290_usb3phy_cfg,
>> -- 
>> 2.34.1
>>
> 

Re: [PATCH v2 1/4] dt-bindings: phy: qcom,qusb2: Document QUSB2 Phy for Shikra

[Krzysztof Kozlowski]

On Mon, May 04, 2026 at 10:36:56PM +0530, Krishna Kurapati wrote:
> Update dt-bindings to add Shikra to QUSB2 Phy list. Shikra SoC
> has two High Speed QUSB2 Phys.
> 
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---
>  Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krzysztof Kozlowski]

On Mon, May 04, 2026 at 10:36:57PM +0530, Krishna Kurapati wrote:
> Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.
> 
> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> ---
>  .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH v2 4/4] phy: qcom: qmp-usbc: Add qmp configuration for Shikra

[Krzysztof Kozlowski]

On Tue, May 05, 2026 at 09:36:31AM +0530, Krishna Kurapati wrote:
> 
> 
> On 5/5/2026 12:58 AM, Dmitry Baryshkov wrote:
> > On Mon, May 04, 2026 at 10:36:59PM +0530, Krishna Kurapati wrote:
> > > Add init sequence and phy configuration for the Super Speed port
> > > on Shikra SoC.
> > > 
> > > Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
> > > ---
> > >   drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 3 +++
> > >   1 file changed, 3 insertions(+)
> > > 
> > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
> > > index c342479a3798..400dcebf8222 100644
> > > --- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
> > > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
> > > @@ -2019,6 +2019,9 @@ static const struct of_device_id qmp_usbc_of_match_table[] = {
> > >   	}, {
> > >   		.compatible = "qcom,sdm660-qmp-usb3-phy",
> > >   		.data = &sdm660_usb3phy_cfg,
> > > +	}, {
> > > +		.compatible = "qcom,shikra-qmp-usb3-phy",
> > > +		.data = &qcs615_usb3phy_cfg,
> > 
> > If we are reusing Talos configuration, should Talos also be used for the
> > fallback compat instead of modifying the driver?
> > 
> 
> The clocks are different and hence I didn't use fallback.

And why can't you use the same clocks?

Best regards,
Krzysztof

Re: [PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krzysztof Kozlowski]

On 05/05/2026 12:49, Krzysztof Kozlowski wrote:
> On Mon, May 04, 2026 at 10:36:57PM +0530, Krishna Kurapati wrote:
>> Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.
>>
>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>> ---
>>  .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
>>  1 file changed, 2 insertions(+)
> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

... and then I looked at the driver. So un-reviewed. Devices are clearly
compatible. If not, explain what is not compatible.

Best regards,
Krzysztof

Re: [PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krishna Kurapati]

On 5/5/2026 4:22 PM, Krzysztof Kozlowski wrote:
> On 05/05/2026 12:49, Krzysztof Kozlowski wrote:
>> On Mon, May 04, 2026 at 10:36:57PM +0530, Krishna Kurapati wrote:
>>> Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.
>>>
>>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>>> ---
>>>   .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
>>>   1 file changed, 2 insertions(+)
>>
>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
> 
> ... and then I looked at the driver. So un-reviewed. Devices are clearly
> compatible. If not, explain what is not compatible.
> 
Talos uses GCC_USB3_PRIM_PHY_AUX_CLK.

In Shikra, we are using GCC_USB3_PRIM_PHY_COM_AUX_CLK. We don't have 
GCC_USB3_PRIM_PHY_AUX_CLK.

Hence, I didn't use a fallback compatible.

Regards,
Krishna,

Re: [PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krzysztof Kozlowski]

On 05/05/2026 15:27, Krishna Kurapati wrote:
> 
> 
> On 5/5/2026 4:22 PM, Krzysztof Kozlowski wrote:
>> On 05/05/2026 12:49, Krzysztof Kozlowski wrote:
>>> On Mon, May 04, 2026 at 10:36:57PM +0530, Krishna Kurapati wrote:
>>>> Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.
>>>>
>>>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>>>> ---
>>>>   .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
>>>>   1 file changed, 2 insertions(+)
>>>
>>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>
>> ... and then I looked at the driver. So un-reviewed. Devices are clearly
>> compatible. If not, explain what is not compatible.
>>
> Talos uses GCC_USB3_PRIM_PHY_AUX_CLK.
> 
> In Shikra, we are using GCC_USB3_PRIM_PHY_COM_AUX_CLK. We don't have 
> GCC_USB3_PRIM_PHY_AUX_CLK.
> 
> Hence, I didn't use a fallback compatible.

This still explains nothing. How different clock makes interface for SW
incompatible exactly?

Best regards,
Krzysztof

Re: [PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krishna Kurapati]

On 5/5/2026 6:59 PM, Krzysztof Kozlowski wrote:
> On 05/05/2026 15:27, Krishna Kurapati wrote:
>>
>>
>> On 5/5/2026 4:22 PM, Krzysztof Kozlowski wrote:
>>> On 05/05/2026 12:49, Krzysztof Kozlowski wrote:
>>>> On Mon, May 04, 2026 at 10:36:57PM +0530, Krishna Kurapati wrote:
>>>>> Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.
>>>>>
>>>>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>>>>> ---
>>>>>    .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
>>>>>    1 file changed, 2 insertions(+)
>>>>
>>>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>
>>> ... and then I looked at the driver. So un-reviewed. Devices are clearly
>>> compatible. If not, explain what is not compatible.
>>>
>> Talos uses GCC_USB3_PRIM_PHY_AUX_CLK.
>>
>> In Shikra, we are using GCC_USB3_PRIM_PHY_COM_AUX_CLK. We don't have
>> GCC_USB3_PRIM_PHY_AUX_CLK.
>>
>> Hence, I didn't use a fallback compatible.
> 
> This still explains nothing. How different clock makes interface for SW
> incompatible exactly?
> 
So I went by the naming. AUX vs COM_AUX.

Can I use a fallback compatible and in DT vote for "COM_AUX" clock with 
clock-names mentioning "aux" ?

Regards,
Krishna,

Re: [PATCH v2 2/4] dt-bindings: phy: qcom,msm8998-qmp-usb3-phy: Add support for Shikra

[Krzysztof Kozlowski]

On 05/05/2026 15:57, Krishna Kurapati wrote:
> 
> 
> On 5/5/2026 6:59 PM, Krzysztof Kozlowski wrote:
>> On 05/05/2026 15:27, Krishna Kurapati wrote:
>>>
>>>
>>> On 5/5/2026 4:22 PM, Krzysztof Kozlowski wrote:
>>>> On 05/05/2026 12:49, Krzysztof Kozlowski wrote:
>>>>> On Mon, May 04, 2026 at 10:36:57PM +0530, Krishna Kurapati wrote:
>>>>>> Declare the USB-C QMP PHY present on the Qualcomm Shikra platform.
>>>>>>
>>>>>> Signed-off-by: Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>
>>>>>> ---
>>>>>>    .../devicetree/bindings/phy/qcom,msm8998-qmp-usb3-phy.yaml      | 2 ++
>>>>>>    1 file changed, 2 insertions(+)
>>>>>
>>>>> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
>>>>
>>>> ... and then I looked at the driver. So un-reviewed. Devices are clearly
>>>> compatible. If not, explain what is not compatible.
>>>>
>>> Talos uses GCC_USB3_PRIM_PHY_AUX_CLK.
>>>
>>> In Shikra, we are using GCC_USB3_PRIM_PHY_COM_AUX_CLK. We don't have
>>> GCC_USB3_PRIM_PHY_AUX_CLK.
>>>
>>> Hence, I didn't use a fallback compatible.
>>
>> This still explains nothing. How different clock makes interface for SW
>> incompatible exactly?
>>
> So I went by the naming. AUX vs COM_AUX.

The naming does not matter. If the clock is called
"no_one_expects_spanish_inquisition", does that make software
incompatible? Why would the name itself matter?

> 
> Can I use a fallback compatible and in DT vote for "COM_AUX" clock with 
> clock-names mentioning "aux" ?

I don't know, I asked what is different in software interface.

Best regards,
Krzysztof