Merge branch '18.06-kernel5.4' of github.com:project-openwrt/openwrt into 18.06-kernel5.4

This commit is contained in:
CN_SZTL 2020-04-25 11:44:13 +08:00
commit 0b4f23bcb3
No known key found for this signature in database
GPG Key ID: 6850B6345C862176

View File

@ -34,7 +34,7 @@
ahb {
apb {
ddr_ctrl: memory-controller@18000000 {
compatible = "qca,ar9530-ddr-controller",
compatible = "qca,qca9530-ddr-controller",
"qca,ar7240-ddr-controller";
reg = <0x18000000 0x128>;
@ -69,7 +69,7 @@
};
gpio: gpio@18040000 {
compatible = "qca,ar9530-gpio",
compatible = "qca,qca9530-gpio",
"qca,ar9340-gpio";
reg = <0x18040000 0x28>;