dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
(cherry picked from commit f65501e1c2)
Tested-by: Lech Perczak <lech.perczak@gmail.com> [TP-Link TL-WDR4300 v1]
v19.07.3_mercusys_ac12_duma
Chuanhong Guo 5 years ago committed by Adrian Schmutzler
parent b6c01fec92
commit 2d21357b65
5 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File

2
target/linux/ath79/dts/ar9344.dtsi
Unescape Escape View File

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

20
target/linux/ath79/dts/ar934x.dtsi
Unescape Escape View File

@ -38,7 +38,7 @@
}; };
}; };
ahb { ahb: ahb {
compatible = "simple-bus"; compatible = "simple-bus";
ranges; ranges;
@ -133,18 +133,18 @@
#reset-cells = <1>; #reset-cells = <1>;
}; };
};
gmac: gmac@18070000 { gmac: gmac@18070000 {
compatible = "qca,ar9340-gmac"; compatible = "qca,ar9340-gmac";
reg = <0x18070000 0x14>; reg = <0x18070000 0x14>;
}; };
wmac: wmac@18100000 { wmac: wmac@18100000 {
compatible = "qca,ar9340-wmac"; compatible = "qca,ar9340-wmac";
reg = <0x18100000 0x20000>; reg = <0x18100000 0x20000>;
status = "disabled"; status = "disabled";
};
}; };
usb: usb@1b000000 { usb: usb@1b000000 {

64
target/linux/ath79/dts/qca953x.dtsi
Unescape Escape View File

@ -143,43 +143,43 @@
qca,ddr-wb-channels = <&ddr_ctrl 4>, <&ddr_ctrl 3>; qca,ddr-wb-channels = <&ddr_ctrl 4>, <&ddr_ctrl 3>;
}; };
}; };
};
pcie0: pcie-controller@180c0000 { gmac: gmac@18070000 {
compatible = "qcom,ar7240-pci"; compatible = "qca,ar9330-gmac";
#address-cells = <3>; reg = <0x18070000 0x4>;
#size-cells = <2>; };
bus-range = <0x0 0x0>;
reg = <0x180c0000 0x1000>, /* CRP */
<0x180f0000 0x100>, /* CTRL */
<0x14000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x10000000 0x10000000 0 0x04000000 /* pci memory */
0x1000000 0 0x00000000 0x0000000 0 0x000001>; /* io space */
interrupt-parent = <&intc2>;
interrupts = <1>;
interrupt-controller;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 1>;
interrupt-map = <0 0 0 0 &pcie0 0>;
status = "disabled";
};
gmac: gmac@18070000 { pcie0: pcie-controller@180c0000 {
compatible = "qca,ar9330-gmac"; compatible = "qcom,ar7240-pci";
reg = <0x18070000 0x4>; #address-cells = <3>;
}; #size-cells = <2>;
bus-range = <0x0 0x0>;
reg = <0x180c0000 0x1000>, /* CRP */
<0x180f0000 0x100>, /* CTRL */
<0x14000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x10000000 0x10000000 0 0x04000000 /* pci memory */
0x1000000 0 0x00000000 0x0000000 0 0x000001>; /* io space */
interrupt-parent = <&intc2>;
interrupts = <1>;
interrupt-controller;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 1>;
interrupt-map = <0 0 0 0 &pcie0 0>;
status = "disabled";
};
wmac: wmac@18100000 { wmac: wmac@18100000 {
compatible = "qca,qca9530-wmac"; compatible = "qca,qca9530-wmac";
reg = <0x18100000 0x20000>; reg = <0x18100000 0x20000>;
interrupt-parent = <&intc2>; interrupt-parent = <&intc2>;
interrupts = <0>; interrupts = <0>;
status = "disabled"; status = "disabled";
};
}; };
usb0: usb@1b000000 { usb0: usb@1b000000 {

98
target/linux/ath79/dts/qca9557.dtsi
Unescape Escape View File

@ -176,65 +176,65 @@
#reset-cells = <1>; #reset-cells = <1>;
}; };
};
pcie0: pcie-controller@180c0000 { gmac: gmac@18070000 {
compatible = "qcom,ar7240-pci"; compatible = "qca,qca9550-gmac";
#address-cells = <3>; reg = <0x18070000 0x58>;
#size-cells = <2>; };
bus-range = <0x0 0x0>;
reg = <0x180c0000 0x1000>, /* CRP */
<0x180f0000 0x100>, /* CTRL */
<0x14000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x10000000 0x10000000 0 0x02000000 /* pci memory */
0x1000000 0 0x00000000 0x0000000 0 0x000001>; /* io space */
interrupt-parent = <&intc2>;
interrupts = <1>;
interrupt-controller; pcie0: pcie-controller@180c0000 {
#interrupt-cells = <1>; compatible = "qcom,ar7240-pci";
#address-cells = <3>;
#size-cells = <2>;
bus-range = <0x0 0x0>;
reg = <0x180c0000 0x1000>, /* CRP */
<0x180f0000 0x100>, /* CTRL */
<0x14000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x10000000 0x10000000 0 0x02000000 /* pci memory */
0x1000000 0 0x00000000 0x0000000 0 0x000001>; /* io space */
interrupt-parent = <&intc2>;
interrupts = <1>;
interrupt-map-mask = <0 0 0 1>; interrupt-controller;
interrupt-map = <0 0 0 0 &pcie0 0>; #interrupt-cells = <1>;
status = "disabled";
};
pcie1: pcie-controller@18250000 { interrupt-map-mask = <0 0 0 1>;
compatible = "qcom,ar7240-pci"; interrupt-map = <0 0 0 0 &pcie0 0>;
#address-cells = <3>; status = "disabled";
#size-cells = <2>; };
bus-range = <0x0 0x0>;
reg = <0x18250000 0x1000>, /* CRP */
<0x18280000 0x100>, /* CTRL */
<0x16000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x12000000 0x12000000 0 0x02000000 /* pci memory */
0x1000000 0 0x00000000 0x0000001 0 0x000001>; /* io space */
interrupt-parent = <&intc3>;
interrupts = <0>;
interrupt-controller; wmac: wmac@18100000 {
#interrupt-cells = <1>; compatible = "qca,qca9550-wmac";
reg = <0x18100000 0x10000>;
interrupt-map-mask = <0 0 0 1>; interrupt-parent = <&intc2>;
interrupt-map = <0 0 0 0 &pcie1 0>; interrupts = <0>;
status = "disabled";
};
gmac: gmac@18070000 { status = "disabled";
compatible = "qca,qca9550-gmac"; };
reg = <0x18070000 0x58>;
};
wmac: wmac@18100000 { pcie1: pcie-controller@18250000 {
compatible = "qca,qca9550-wmac"; compatible = "qcom,ar7240-pci";
reg = <0x18100000 0x10000>; #address-cells = <3>;
#size-cells = <2>;
bus-range = <0x0 0x0>;
reg = <0x18250000 0x1000>, /* CRP */
<0x18280000 0x100>, /* CTRL */
<0x16000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x12000000 0x12000000 0 0x02000000 /* pci memory */
0x1000000 0 0x00000000 0x0000001 0 0x000001>; /* io space */
interrupt-parent = <&intc3>;
interrupts = <0>;
interrupt-parent = <&intc2>; interrupt-controller;
interrupts = <0>; #interrupt-cells = <1>;
status = "disabled"; interrupt-map-mask = <0 0 0 1>;
}; interrupt-map = <0 0 0 0 &pcie1 0>;
status = "disabled";
}; };
usb0: usb@1b000000 { usb0: usb@1b000000 {

62
target/linux/ath79/dts/qca956x.dtsi
Unescape Escape View File

@ -137,38 +137,43 @@
#reset-cells = <1>; #reset-cells = <1>;
}; };
};
wmac: wmac@18100000 { gmac: gmac@18070000 {
compatible = "qca,qca9560-wmac"; compatible = "qca,qca9560-gmac";
reg = <0x18100000 0x10000>; reg = <0x18070000 0x64>;
};
interrupt-parent = <&cpuintc>; wmac: wmac@18100000 {
interrupts = <2>; compatible = "qca,qca9560-wmac";
reg = <0x18100000 0x10000>;
status = "disabled"; interrupt-parent = <&cpuintc>;
}; interrupts = <2>;
pcie: pcie-controller@18250000 { status = "disabled";
compatible = "qcom,ar7240-pci"; };
#address-cells = <3>;
#size-cells = <2>;
bus-range = <0x0 0x0>;
reg = <0x18250000 0x1000>, /* CRP */
<0x18280000 0x100>, /* CTRL */
<0x16000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x12000000 0x12000000 0 0x02000000 /* pci memory */
0x1000000 0 0x00000000 0x0000000 0 0x000001>; /* io space */
interrupt-parent = <&intc3>;
interrupts = <0>;
interrupt-controller; pcie: pcie-controller@18250000 {
#interrupt-cells = <1>; compatible = "qcom,ar7240-pci";
#address-cells = <3>;
#size-cells = <2>;
bus-range = <0x0 0x0>;
reg = <0x18250000 0x1000>, /* CRP */
<0x18280000 0x100>, /* CTRL */
<0x16000000 0x1000>; /* CFG */
reg-names = "crp_base", "ctrl_base", "cfg_base";
ranges = <0x2000000 0 0x12000000 0x12000000 0 0x02000000 /* pci memory */
0x1000000 0 0x00000000 0x0000000 0 0x000001>; /* io space */
interrupt-parent = <&intc3>;
interrupts = <0>;
interrupt-map-mask = <0 0 0 1>; interrupt-controller;
interrupt-map = <0 0 0 0 &pcie 0>; #interrupt-cells = <1>;
status = "disabled";
}; interrupt-map-mask = <0 0 0 1>;
interrupt-map = <0 0 0 0 &pcie 0>;
status = "disabled";
}; };
usb0: usb@1b000000 { usb0: usb@1b000000 {
@ -221,11 +226,6 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
}; };
gmac: gmac@18070000 {
compatible = "qca,qca9560-gmac";
reg = <0x18070000 0x64>;
};
}; };
usb_phy0: usb-phy { usb_phy0: usb-phy {

Write Preview
Loading…
Cancel
Save