mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

i.MX fixes for 6.9, round 2: 

- Fix i.MX8MP the second CSI2 assigned-clock property which got wrong by
   commit f78835d1e6 ("arm64: dts: imx8mp: reparent MEDIA_MIPI_PHY1_REF
   to CLK_24M")
 - Correct USB over-current polarity for imx6ull-tarragon board
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmYqJZEUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM6x7gf/Zgf4c52RH3eLeg8DlG9a992q+ykM
 S+VCf4WMJjS9OGcI7HsZJPl55nnMitab4Hf+8ZABmpUHvTfE/fVuRh6WtOmkPf++
 /iZrqYkX/VgE3fv5btyXOhY5q3DoI0QQzWSBA8SPnZZ8JafnABjEikO7CI9rWyyL
 RapqsHgkFGyd9b32Q2aiLuJ7pE5KoEzhRLAHmFINZ14sjyxEunfYP2HCosOKUP2l
 gfD/+lERGGDbJSwg3k2BrY408Y0AivKs9f1KomTUXoRu3I6rA0AgL/uvI3U5nlWJ
 u3os47BnawAzDo8K0lUHiujbTkNRl+OSYcYm8B68AyFMTzsX9oOtroJglA==
 =n4zb
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmYr0MsACgkQYKtH/8kJ
 Uieleg/+NUekkbuusNOADqRBpOiXLC+vZW807tv2phYsVbpwnzrkqXUo/AO2j5V5
 R8wucc/gYPmKblkUWTPkXXKCVb+p9f5G8iSYbQJfYVXoN7NU6+NhT0hUGX0QMSv7
 k34jms67coxcdXbq3M9zBcez8zm8tfu7wUgWTDnJpK9Zz08ls0CK323NTdV5m0C8
 F9adqJj48YqqULGlBbVRrHRpjUxZAEhyUWgBRiQleLkhrvHyRsUt7lJ0mTNhSN02
 IZt1dS+k/Orty82HhW2dcOf0H3z0gp5RcnQ5wtJyhLVSPolqrpQ3DP0neRA30GHX
 02GR1JKEwGv3q1hjrPsIe/KUkiVuMq8vyJT2ljJeq30t6I2OBRaiO/sfmDYfcZpo
 Hop5vjmI0OObaSPGEqrAIZtH8zuA2o//Zf8Dn8ozVOdSUKJJ/J/MjZ3rQXmg0J/Y
 jPBkI0R5Pt5DCvdIiWzgPq6jKff/L1LfC+0P7YdRMKsvh02Yt2Ly2WbC5c0VLg5P
 Tl1ZAyvFrSCCm702rMNfzxrwWQs+bgZjnUx9UVPDuL4gzqJCAdvB+GBcGdwv0ZiQ
 00Q3sfV4d9f+pSoF1Pd1SNGz3Mo2zupKR6FfYAb/eFWQZICAYFeSe+COegmLf66s
 0B0Od3w4ACIyc6/PzmlvT0oK8hQWr98I/OtV0aAPwOTKAYS8N8w=
 =uGs3
 -----END PGP SIGNATURE-----

Merge tag 'imx-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into for-next

i.MX fixes for 6.9, round 2:

- Fix i.MX8MP the second CSI2 assigned-clock property which got wrong by
  commit f78835d1e6 ("arm64: dts: imx8mp: reparent MEDIA_MIPI_PHY1_REF
  to CLK_24M")
- Correct USB over-current polarity for imx6ull-tarragon board

* tag 'imx-fixes-6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6ull-tarragon: fix USB over-current polarity
  arm64: dts: imx8mp: Fix assigned-clocks for second CSI2

Link: https://lore.kernel.org/r/ZioopqscxwUOwQkf@dragon
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-04-26 18:05:31 +02:00
parent 9e0794aeac d7f3040a56
commit 7e68538346
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi
View File

@ -805,6 +805,7 @@
&pinctrl_usb_pwr>;
dr_mode = "host";
power-active-high;
over-current-active-low;
disable-over-current;
status = "okay";
};

2
arch/arm64/boot/dts/freescale/imx8mp.dtsi
View File

@ -1672,7 +1672,7 @@
<&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>,
<&clk IMX8MP_CLK_MEDIA_AXI_ROOT>;
clock-names = "pclk", "wrap", "phy", "axi";
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM1_PIX>,
assigned-clocks = <&clk IMX8MP_CLK_MEDIA_CAM2_PIX>,
<&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF>;
assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_1000M>,
<&clk IMX8MP_CLK_24M>;