On Mon, Jan 22, 2024 at 12:28:02PM +0100, Johan Hovold wrote:
> On Sat, Jan 20, 2024 at 07:32:33PM -0500, Sasha Levin wrote:
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@xxxxxxxxxxxxxxx> know about it.
> >
> >
> >
> > commit 76ac014a70d1f754ea933151b068d1c71423f384
> > Author: Johan Hovold <johan+linaro@xxxxxxxxxx>
> > Date: Mon Nov 20 17:43:29 2023 +0100
> >
> > arm64: dts: qcom: sm6375: fix USB wakeup interrupt types
> >
> > [ Upstream commit 41952be6661b20f56c2c5b06c431880dd975b747 ]
> >
> > 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: 59d34ca97f91 ("arm64: dts: qcom: Add initial device tree for SM6375")
> > Cc: stable@xxxxxxxxxxxxxxx # 6.2
> > Cc: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
> > Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
> > Link: https://lore.kernel.org/r/20231120164331.8116-10-johan+linaro@xxxxxxxxxx
> > Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
> > Stable-dep-of: d3246a0cf43f ("arm64: dts: qcom: sm6375: Hook up MPM")
> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi
> > index e7ff55443da7..b479f3d9a3a8 100644
> > --- a/arch/arm64/boot/dts/qcom/sm6375.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi
> > @@ -1362,8 +1362,8 @@ usb_1: usb@4ef8800 {
> >
> > interrupts = <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>,
> > <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
> > - <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
> > - <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
> > + <GIC_SPI 93 IRQ_TYPE_EDGE_BOTH>,
> > + <GIC_SPI 94 IRQ_TYPE_EDGE_BOTH>;
>
> This commit is broken and should not be backported to any stable tree.
>
> Commit d3246a0cf43f ("arm64: dts: qcom: sm6375: Hook up MPM") later
> fixed it up, but it did unfortunately not reference this commit and also
> looks too intrusive to be backported.
Just noticed this:
> > Stable-dep-of: d3246a0cf43f ("arm64: dts: qcom: sm6375: Hook up MPM")
So this should be fine as long as you backport both commits.
Johan
