Commit a69dfb4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 14f84cd3 8c431ea8

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

+4 −1
Original line number Diff line number Diff line
@@ -82,13 +82,16 @@ conf_out { 
			};

		};



		etop@e180000 {

		ethernet@e180000 {

			compatible = "lantiq,etop-xway";

			reg = <0xe180000 0x40000>;

			interrupt-parent = <&icu0>;

			interrupts = <73 78>;

			interrupt-names = "tx", "rx";

			phy-mode = "rmii";

			mac-address = [ 00 11 22 33 44 55 ];

			lantiq,rx-burst-length = <4>;

			lantiq,tx-burst-length = <4>;

		};



		stp0: stp@e100bb0 {

arch/mips/lantiq/xway/sysctrl.c

+5 −5
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ void __init ltq_soc_init(void) 
		ifccr = CGU_IFCCR_VR9;

		pcicr = CGU_PCICR_VR9;

	} else {

		clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);

		clkdev_add_pmu("1e180000.ethernet", NULL, 1, 0, PMU_PPE);

	}



	if (!of_machine_is_compatible("lantiq,ase"))
@@ -531,9 +531,9 @@ void __init ltq_soc_init(void) 
						CLOCK_133M, CLOCK_133M);

		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);

		clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);

		clkdev_add_pmu("1e180000.etop", "ppe", 1, 0, PMU_PPE);

		clkdev_add_cgu("1e180000.etop", "ephycgu", CGU_EPHY);

		clkdev_add_pmu("1e180000.etop", "ephy", 1, 0, PMU_EPHY);

		clkdev_add_pmu("1e180000.ethernet", "ppe", 1, 0, PMU_PPE);

		clkdev_add_cgu("1e180000.ethernet", "ephycgu", CGU_EPHY);

		clkdev_add_pmu("1e180000.ethernet", "ephy", 1, 0, PMU_EPHY);

		clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_ASE_SDIO);

		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

	} else if (of_machine_is_compatible("lantiq,grx390")) {
@@ -592,7 +592,7 @@ void __init ltq_soc_init(void) 
		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);

		clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);

		clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM);

		clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH);

		clkdev_add_pmu("1e180000.ethernet", "switch", 1, 0, PMU_SWITCH);

		clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);

		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);

		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);