diff mbox series

[RFT,5/6] arm64: dts: qcom: sm6125: add interrupts to DWC3 USB controller

Message ID 20231111164229.63803-5-krzysztof.kozlowski@linaro.org (mailing list archive)
State Accepted
Commit 67e4656f4487b95a39e45884c99235f62ebfaa47
Headers show
Series [1/6] arm64: dts: qcom: sc8180x-flex-5g: use 'gpios' suffix for PCI GPIOs | expand

Commit Message

Krzysztof Kozlowski Nov. 11, 2023, 4:42 p.m. UTC
Add interrupts to SM6125 DWC3 USB controller, based on downstream/vendor
code of Trinket DTSI from Xiaomi Laurel device, to fix dtbs_check
warnings:

  sm6125-xiaomi-laurel-sprout.dtb: usb@4ef8800: 'interrupt-names' is a required property
  sm6125-xiaomi-laurel-sprout.dtb: usb@4ef8800: 'oneOf' conditional failed, one must be fixed:
    'interrupts' is a required property
    'interrupts-extended' is a required property

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

---

Not tested on HW.
---
 arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Marijn Suijten Nov. 21, 2023, 9:26 p.m. UTC | #1
Maybe this should CC the people that have most recently worked on SM6125 and
related hardware?

On 2023-11-11 17:42:28, Krzysztof Kozlowski wrote:
> Add interrupts to SM6125 DWC3 USB controller, based on downstream/vendor
> code of Trinket DTSI from Xiaomi Laurel device, to fix dtbs_check
> warnings:
> 
>   sm6125-xiaomi-laurel-sprout.dtb: usb@4ef8800: 'interrupt-names' is a required property
>   sm6125-xiaomi-laurel-sprout.dtb: usb@4ef8800: 'oneOf' conditional failed, one must be fixed:
>     'interrupts' is a required property
>     'interrupts-extended' is a required property
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> Not tested on HW.

I have had an identical patch [1] on my tree for over one and a half years, but
recall not submitting it because of not being sure where to pull dm_hs_phy_irq /
dp_hs_phy_irq from.  I think you are right (in the dt-bindings fixup) that it is
not available on this platform.

Fixes: cff4bbaf2a2d ("arm64: dts: qcom: Add support for SM6125")
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>

(and obviously tested)

[1]: https://github.com/somainline/linux/commit/b57f7fa80cb3f5cd2db3db2d79548cbf063056d9

> ---
>  arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
> index eb07eca3a48d..1dd3a4056e26 100644
> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
> @@ -1185,6 +1185,10 @@ usb3: usb@4ef8800 {
>  					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
>  			assigned-clock-rates = <19200000>, <66666667>;
>  
> +			interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
> +				     <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
> +			interrupt-names = "hs_phy_irq", "ss_phy_irq";
> +
>  			power-domains = <&gcc USB30_PRIM_GDSC>;
>  			qcom,select-utmi-as-pipe-clk;
>  			status = "disabled";
> -- 
> 2.34.1
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index eb07eca3a48d..1dd3a4056e26 100644
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -1185,6 +1185,10 @@  usb3: usb@4ef8800 {
 					  <&gcc GCC_USB30_PRIM_MASTER_CLK>;
 			assigned-clock-rates = <19200000>, <66666667>;
 
+			interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "hs_phy_irq", "ss_phy_irq";
+
 			power-domains = <&gcc USB30_PRIM_GDSC>;
 			qcom,select-utmi-as-pipe-clk;
 			status = "disabled";