| Message ID | 20231120164331.8116-11-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | 84ad9ac8d9ca29033d589e79a991866b38e23b85 |
| Headers | show |
| Series | ARM/arm64: dts: qcom: fix USB wakeup interrupt types | expand |
On Mon, Nov 20, 2023 at 05:43:30PM +0100, Johan Hovold wrote: > The DP/DM wakeup interrupts are edge triggered and which edge to trigger > on depends on use-case and whether a Low speed or Full/High speed device > is connected. > > Fixes: 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes") > Fixes: b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes") > Cc: stable@vger.kernel.org # 5.10 > Cc: Jonathan Marek <jonathan@marek.ca> > Cc: Jack Pham <quic_jackp@quicinc.com> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Jack Pham <quic_jackp@quicinc.com> > arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi > index 97623af13464..3e7048d8ac55 100644 > --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi > @@ -3567,8 +3567,8 @@ usb_1: usb@a6f8800 { > > interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>; > + <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>, > + <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>; > interrupt-names = "hs_phy_irq", "ss_phy_irq", > "dm_hs_phy_irq", "dp_hs_phy_irq"; > > @@ -3620,8 +3620,8 @@ usb_2: usb@a8f8800 { > > interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 490 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 491 IRQ_TYPE_LEVEL_HIGH>; > + <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>, > + <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>; > interrupt-names = "hs_phy_irq", "ss_phy_irq", > "dm_hs_phy_irq", "dp_hs_phy_irq";
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 97623af13464..3e7048d8ac55 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -3567,8 +3567,8 @@ usb_1: usb@a6f8800 { interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>; + <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>, + <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", "ss_phy_irq", "dm_hs_phy_irq", "dp_hs_phy_irq"; @@ -3620,8 +3620,8 @@ usb_2: usb@a8f8800 { interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 490 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 491 IRQ_TYPE_LEVEL_HIGH>; + <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>, + <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", "ss_phy_irq", "dm_hs_phy_irq", "dp_hs_phy_irq";
The DP/DM wakeup interrupts are edge triggered and which edge to trigger on depends on use-case and whether a Low speed or Full/High speed device is connected. Fixes: 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes") Fixes: b33d2868e8d3 ("arm64: dts: qcom: sm8150: Add USB and PHY device nodes") Cc: stable@vger.kernel.org # 5.10 Cc: Jonathan Marek <jonathan@marek.ca> Cc: Jack Pham <quic_jackp@quicinc.com> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)