Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mips-fixes_6.17_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer:
"Fix ethernet on Lantiq boards"
* tag 'mips-fixes_6.17_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
mips: lantiq: xway: sysctrl: rename the etop node
mips: dts: lantiq: danube: add missing burst length property
+9
-6
+4
-1
arch/mips/boot/dts/lantiq/danube_easy50712.dts
+4
-1
arch/mips/boot/dts/lantiq/danube_easy50712.dts
···
82
82
};
83
83
};
84
84
85
-
etop@e180000 {
85
+
ethernet@e180000 {
86
86
compatible = "lantiq,etop-xway";
87
87
reg = <0xe180000 0x40000>;
88
88
interrupt-parent = <&icu0>;
89
89
interrupts = <73 78>;
90
+
interrupt-names = "tx", "rx";
90
91
phy-mode = "rmii";
91
92
mac-address = [ 00 11 22 33 44 55 ];
93
+
lantiq,rx-burst-length = <4>;
94
+
lantiq,tx-burst-length = <4>;
92
95
};
93
96
94
97
stp0: stp@e100bb0 {
+5
-5
arch/mips/lantiq/xway/sysctrl.c
+5
-5
arch/mips/lantiq/xway/sysctrl.c
···
497
497
ifccr = CGU_IFCCR_VR9;
498
498
pcicr = CGU_PCICR_VR9;
499
499
} else {
500
-
clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);
500
+
clkdev_add_pmu("1e180000.ethernet", NULL, 1, 0, PMU_PPE);
501
501
}
502
502
503
503
if (!of_machine_is_compatible("lantiq,ase"))
···
531
531
CLOCK_133M, CLOCK_133M);
532
532
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
533
533
clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
534
-
clkdev_add_pmu("1e180000.etop", "ppe", 1, 0, PMU_PPE);
535
-
clkdev_add_cgu("1e180000.etop", "ephycgu", CGU_EPHY);
536
-
clkdev_add_pmu("1e180000.etop", "ephy", 1, 0, PMU_EPHY);
534
+
clkdev_add_pmu("1e180000.ethernet", "ppe", 1, 0, PMU_PPE);
535
+
clkdev_add_cgu("1e180000.ethernet", "ephycgu", CGU_EPHY);
536
+
clkdev_add_pmu("1e180000.ethernet", "ephy", 1, 0, PMU_EPHY);
537
537
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_ASE_SDIO);
538
538
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
539
539
} else if (of_machine_is_compatible("lantiq,grx390")) {
···
592
592
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);
593
593
clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);
594
594
clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM);
595
-
clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH);
595
+
clkdev_add_pmu("1e180000.ethernet", "switch", 1, 0, PMU_SWITCH);
596
596
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
597
597
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
598
598
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);