UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: amlogic fixes for v5.11-rc (round 2) 

- fix ethernet resets
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmARqpwACgkQWTcYmtP7
 xmUo9w/8CWUh7i/hv/nb6OtVR+b5VqMRF8a+IeW29RDA9oktknQcMvvvSu4rgFOf
 oxipXUgUwI2rLwkV8NCBVDqocQr0iF9xo4RgaeIbkuDZY4sVcVBZm+qjHaWUceuo
 azGAPXaEjMSa4XbKWpkZraBPw4FioUmbTNSI6GFdPEjCvQZBomopkuNrM5tbZdkH
 cg7BguWMwpNQ3pUElVy3IAL8mQg6yZsglAfrjzVoi2Ffj0eCN13R0s+yWxDzHl3U
 8ZMyQdCJob9ujEwXfIY7KjjprbUF28uRC+rIP7to3AyntN8VaMV5SW3Sw/W6FFCV
 /Jd5EPX4AzGef0P3GyrrBPTEZNTROvrLzD9avMDLHmEJSLzsSI/QQjZ3FX66rHbk
 M0AhYysmpifF4ktD3kodUWra78fqzNUmmvooJe+c1lJxyPVw6vcJ6TNByM4XKIAK
 gRciy4Wola7LVCQF/F5SEWsLvbd7xYS/sfb/4BiEoWwawevgqXUHUQBDjdsiOo0m
 eDivpqC8bM2CiH8NtVm2r568Bl3e1B9/p3gBSvszwX3QGtA7NXP4gyR1M5upVTFs
 Lf9iR/DURYPz3SJZ3a0ftsLR/xD6oeS4lHlph3lLQdSVPi/5Nal9PtMeUAMYsVHf
 puS0ncEOCfTUklNTzQBMOA1mYnEJhDrQgVp9C4H6oMfaF/0QJFo=
 =qhAg
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

arm64: dts: amlogic fixes for v5.11-rc (round 2)
- fix ethernet resets

* tag 'amlogic-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  Revert "arm64: dts: amlogic: add missing ethernet reset ID"

Link: https://lore.kernel.org/r/7ho8hai7e6.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-01-28 13:57:11 +01:00
parent f2d514b4f4 19f6fe976a
commit fd28a52a4f
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
View File

@ -280,8 +280,6 @@
"timing-adjustment";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
power-domains = <&pwrc PWRC_AXG_ETHERNET_MEM_ID>;
status = "disabled";
};

2
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
View File

@ -224,8 +224,6 @@
"timing-adjustment";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
status = "disabled";
mdio0: mdio {

3
arch/arm64/boot/dts/amlogic/meson-gx.dtsi
View File

@ -13,7 +13,6 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/meson-gxbb-power.h>
#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
#include <dt-bindings/thermal/thermal.h>
/ {
@ -576,8 +575,6 @@
interrupt-names = "macirq";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
status = "disabled";
};