RE: linux-next: manual merge of the net-next tree with the arm-soc tree
From: <hidden>
Date: 2021-02-16 13:50:40
Also in:
linux-arm-kernel, linux-next, lkml
Subsystem:
arm/toshiba visconti architecture, the rest · Maintainers:
Nobuhiro Iwamatsu, Linus Torvalds
Hi, Thnaks for your report.
LKFT builders also found this problem while building arm64 dtb.quoted
This ` causes the following build error on the next-20210216. DTC arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error FATAL ERROR: Unable to parse input tree scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1 scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failedref: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
This seems to be a problem fixing the conflict. https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c5e188ea08290d9b6625b4bef322012c0b1902d7
diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 2407b2d89c1e9..3760df93a89b5 100644
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@ -49,4 +49,22 @@
&gpio {
status = "okay";
+};`
+
+&piether {
+ status = "okay";
+ phy-handle = <&phy0>;
+ phy-mode = "rgmii-id";
+ clocks = <&clk300mhz>, <&clk125mhz>;
+ clock-names = "stmmaceth", "phy_ref_clk";
+
+ mdio0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "snps,dwmac-mdio";
+ phy0: ethernet-phy@1 {
+ device_type = "ethernet-phy";
+ reg = <0x1>;
+ };
+ };
};
Stephen, could you fix this? Best regards, Nobuhiro