ath79: ar93xx/qca95xx: move gmac/wmac/pcie node out of apb bus

according to functional block diagram in datasheet, these devices
don't belong to apb bus.
Move these nodes out to match datasheet description.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
master
Chuanhong Guo 2019-06-21 18:25:12 +08:00
parent a9360452f0
commit f65501e1c2
5 changed files with 121 additions and 121 deletions

View File

@ -31,7 +31,7 @@
};
};
&apb {
&ahb {
pcie: pcie-controller@180c0000 {
compatible = "qcom,ar9340-pci", "qcom,ar7240-pci";
#address-cells = <3>;

View File

@ -38,7 +38,7 @@
};
};
ahb {
ahb: ahb {
compatible = "simple-bus";
ranges;
@ -133,6 +133,7 @@
#reset-cells = <1>;
};
};
gmac: gmac@18070000 {
compatible = "qca,ar9340-gmac";
@ -145,7 +146,6 @@
status = "disabled";
};
};
usb: usb@1b000000 {
compatible = "generic-ehci";

View File

@ -143,6 +143,12 @@
qca,ddr-wb-channels = <&ddr_ctrl 4>, <&ddr_ctrl 3>;
};
};
};
gmac: gmac@18070000 {
compatible = "qca,ar9330-gmac";
reg = <0x18070000 0x4>;
};
pcie0: pcie-controller@180c0000 {
compatible = "qcom,ar7240-pci";
@ -166,11 +172,6 @@
status = "disabled";
};
gmac: gmac@18070000 {
compatible = "qca,ar9330-gmac";
reg = <0x18070000 0x4>;
};
wmac: wmac@18100000 {
compatible = "qca,qca9530-wmac";
reg = <0x18100000 0x20000>;
@ -180,7 +181,6 @@
status = "disabled";
};
};
usb0: usb@1b000000 {
compatible = "generic-ehci";

View File

@ -176,6 +176,12 @@
#reset-cells = <1>;
};
};
gmac: gmac@18070000 {
compatible = "qca,qca9550-gmac";
reg = <0x18070000 0x58>;
};
pcie0: pcie-controller@180c0000 {
compatible = "qcom,ar7240-pci";
@ -199,6 +205,16 @@
status = "disabled";
};
wmac: wmac@18100000 {
compatible = "qca,qca9550-wmac";
reg = <0x18100000 0x10000>;
interrupt-parent = <&intc2>;
interrupts = <0>;
status = "disabled";
};
pcie1: pcie-controller@18250000 {
compatible = "qcom,ar7240-pci";
#address-cells = <3>;
@ -221,22 +237,6 @@
status = "disabled";
};
gmac: gmac@18070000 {
compatible = "qca,qca9550-gmac";
reg = <0x18070000 0x58>;
};
wmac: wmac@18100000 {
compatible = "qca,qca9550-wmac";
reg = <0x18100000 0x10000>;
interrupt-parent = <&intc2>;
interrupts = <0>;
status = "disabled";
};
};
usb0: usb@1b000000 {
compatible = "generic-ehci";
reg = <0x1b000000 0x1fc>;

View File

@ -137,6 +137,12 @@
#reset-cells = <1>;
};
};
gmac: gmac@18070000 {
compatible = "qca,qca9560-gmac";
reg = <0x18070000 0x64>;
};
wmac: wmac@18100000 {
compatible = "qca,qca9560-wmac";
@ -169,7 +175,6 @@
interrupt-map = <0 0 0 0 &pcie 0>;
status = "disabled";
};
};
usb0: usb@1b000000 {
compatible = "generic-ehci";
@ -221,11 +226,6 @@
#address-cells = <1>;
#size-cells = <0>;
};
gmac: gmac@18070000 {
compatible = "qca,qca9560-gmac";
reg = <0x18070000 0x64>;
};
};
usb_phy0: usb-phy {