Skip to content

Commit a69dfb4

Browse files
committed
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
2 parents 14f84cd + 8c431ea commit a69dfb4

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

arch/mips/boot/dts/lantiq/danube_easy50712.dts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,16 @@
8282
};
8383
};
8484

85-
etop@e180000 {
85+
ethernet@e180000 {
8686
compatible = "lantiq,etop-xway";
8787
reg = <0xe180000 0x40000>;
8888
interrupt-parent = <&icu0>;
8989
interrupts = <73 78>;
90+
interrupt-names = "tx", "rx";
9091
phy-mode = "rmii";
9192
mac-address = [ 00 11 22 33 44 55 ];
93+
lantiq,rx-burst-length = <4>;
94+
lantiq,tx-burst-length = <4>;
9295
};
9396

9497
stp0: stp@e100bb0 {

arch/mips/lantiq/xway/sysctrl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ void __init ltq_soc_init(void)
497497
ifccr = CGU_IFCCR_VR9;
498498
pcicr = CGU_PCICR_VR9;
499499
} else {
500-
clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);
500+
clkdev_add_pmu("1e180000.ethernet", NULL, 1, 0, PMU_PPE);
501501
}
502502

503503
if (!of_machine_is_compatible("lantiq,ase"))
@@ -531,9 +531,9 @@ void __init ltq_soc_init(void)
531531
CLOCK_133M, CLOCK_133M);
532532
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
533533
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);
537537
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_ASE_SDIO);
538538
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
539539
} else if (of_machine_is_compatible("lantiq,grx390")) {
@@ -592,7 +592,7 @@ void __init ltq_soc_init(void)
592592
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);
593593
clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);
594594
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);
596596
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
597597
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
598598
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

0 commit comments

Comments
 (0)