| Message ID | 20200515202520.1487514-1-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f5a7382d6f176e29e4fd9d733b93d5b93771a7e4 |
| Headers | show |
| Series | [for-5.8,v1,1/1] ARM: dts: meson8m2: Use the Meson8m2 specific USB2 PHY compatible | expand |
Hello: This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next). On Fri, 15 May 2020 22:25:20 +0200 you wrote: > Use the Meson8m2 specific USB2 PHY compatible string. The 3.10 vendor > kernel has at least one known difference between Meson8 and Meson8m2: > Meson8m2 sets the ACA_ENABLE bit while Meson8 doesn't. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > This has a runtime dependency on the meson8b-usb2 PHY series from [0]. > That one is queued for v5.8 so it would be great if this could make it > into v5.8 as well. > > [...] Here is a summary with links: - [for-5.8,v1,1/1] ARM: dts: meson8m2: Use the Meson8m2 specific USB2 PHY compatible https://git.kernel.org/khilman/linux-amlogic/c/f5a7382d6f176e29e4fd9d733b93d5b93771a7e4 You are awesome, thank you!
On Fri, 15 May 2020 22:25:20 +0200, Martin Blumenstingl wrote: > Use the Meson8m2 specific USB2 PHY compatible string. The 3.10 vendor > kernel has at least one known difference between Meson8 and Meson8m2: > Meson8m2 sets the ACA_ENABLE bit while Meson8 doesn't. Applied, thanks! [1/1] ARM: dts: meson8m2: Use the Meson8m2 specific USB2 PHY compatible commit: f5a7382d6f176e29e4fd9d733b93d5b93771a7e4 Best regards,
diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/meson8m2.dtsi index 96b37d5e9afd..2397ba06d608 100644 --- a/arch/arm/boot/dts/meson8m2.dtsi +++ b/arch/arm/boot/dts/meson8m2.dtsi @@ -65,6 +65,14 @@ &saradc { compatible = "amlogic,meson8m2-saradc", "amlogic,meson-saradc"; }; +&usb0_phy { + compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy"; +}; + +&usb1_phy { + compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy"; +}; + &wdt { compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt"; };
Use the Meson8m2 specific USB2 PHY compatible string. The 3.10 vendor kernel has at least one known difference between Meson8 and Meson8m2: Meson8m2 sets the ACA_ENABLE bit while Meson8 doesn't. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- This has a runtime dependency on the meson8b-usb2 PHY series from [0]. That one is queued for v5.8 so it would be great if this could make it into v5.8 as well. This patch is meant to apply on top of my other series titled "ARM: dts: meson8b/m2: RGMII improvements" from [1] [0] https://patchwork.kernel.org/cover/11544233/ [1] https://patchwork.kernel.org/cover/11544215/ arch/arm/boot/dts/meson8m2.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)