From: Robert Marko Date: Fri, 9 Jan 2026 15:50:34 +0000 (+0100) Subject: microchipsw: use latest DTS X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6944f1c6a007f9da07387b9991fd341ebbda1447;p=thirdparty%2Fopenwrt.git microchipsw: use latest DTS Use the latest v3 that is sent upstream, it now uses a DTS header for clock indices. Signed-off-by: Robert Marko --- diff --git a/target/linux/microchipsw/dts/clk-lan9691.h b/target/linux/microchipsw/dts/clk-lan9691.h new file mode 100644 index 00000000000..f0006a60374 --- /dev/null +++ b/target/linux/microchipsw/dts/clk-lan9691.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ + +#ifndef _DTS_CLK_LAN9691_H +#define _DTS_CLK_LAN9691_H + +#define GCK_ID_QSPI0 0 +#define GCK_ID_QSPI2 1 +#define GCK_ID_SDMMC0 2 +#define GCK_ID_SDMMC1 3 +#define GCK_ID_MCAN0 4 +#define GCK_ID_MCAN1 5 +#define GCK_ID_FLEXCOM0 6 +#define GCK_ID_FLEXCOM1 7 +#define GCK_ID_FLEXCOM2 8 +#define GCK_ID_FLEXCOM3 9 +#define GCK_ID_TIMER 10 +#define GCK_ID_USB_REFCLK 11 + +/* Gate clocks */ +#define GCK_GATE_USB_DRD 12 +#define GCK_GATE_MCRAMC 13 +#define GCK_GATE_HMATRIX 14 + +#endif diff --git a/target/linux/microchipsw/dts/lan9691.dtsi b/target/linux/microchipsw/dts/lan9691.dtsi index 69f9bfc89a3..b79923fba00 100644 --- a/target/linux/microchipsw/dts/lan9691.dtsi +++ b/target/linux/microchipsw/dts/lan9691.dtsi @@ -3,12 +3,13 @@ * Copyright (c) 2025 Microchip Technology Inc. and its subsidiaries. */ -#include #include #include #include #include +#include "clk-lan9691.h" + / { #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/microchipsw/patches-6.12/0044-v6.13-net-lan969x-add-match-data-for-lan969x.patch b/target/linux/microchipsw/patches-6.12/0044-v6.13-net-lan969x-add-match-data-for-lan969x.patch index 659e8d053f0..1c877b12d26 100644 --- a/target/linux/microchipsw/patches-6.12/0044-v6.13-net-lan969x-add-match-data-for-lan969x.patch +++ b/target/linux/microchipsw/patches-6.12/0044-v6.13-net-lan969x-add-match-data-for-lan969x.patch @@ -32,7 +32,7 @@ Signed-off-by: Jakub Kicinski --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -15147,6 +15147,13 @@ S: Maintained +@@ -15153,6 +15153,13 @@ S: Maintained F: Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml F: drivers/irqchip/irq-lan966x-oic.c diff --git a/target/linux/microchipsw/patches-6.12/0060-v6.13-net-lan969x-fix-cyclic-dependency-reported-by-depmod.patch b/target/linux/microchipsw/patches-6.12/0060-v6.13-net-lan969x-fix-cyclic-dependency-reported-by-depmod.patch index 5c66df5c523..91b36a4adfb 100644 --- a/target/linux/microchipsw/patches-6.12/0060-v6.13-net-lan969x-fix-cyclic-dependency-reported-by-depmod.patch +++ b/target/linux/microchipsw/patches-6.12/0060-v6.13-net-lan969x-fix-cyclic-dependency-reported-by-depmod.patch @@ -54,7 +54,7 @@ Signed-off-by: David S. Miller --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -15152,7 +15152,7 @@ M: Daniel Machon -Date: Tue, 5 Nov 2024 12:08:06 +0100 -Subject: [PATCH] include: dt-bindings: add LAN969x clock bindings - -Add the required LAN969x clock bindings. - -Signed-off-by: Robert Marko ---- - include/dt-bindings/clock/microchip,lan9691.h | 24 +++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 include/dt-bindings/clock/microchip,lan9691.h - ---- /dev/null -+++ b/include/dt-bindings/clock/microchip,lan9691.h -@@ -0,0 +1,24 @@ -+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ -+ -+#ifndef _DT_BINDINGS_CLK_LAN9691_H -+#define _DT_BINDINGS_CLK_LAN9691_H -+ -+#define GCK_ID_QSPI0 0 -+#define GCK_ID_QSPI2 1 -+#define GCK_ID_SDMMC0 2 -+#define GCK_ID_SDMMC1 3 -+#define GCK_ID_MCAN0 4 -+#define GCK_ID_MCAN1 5 -+#define GCK_ID_FLEXCOM0 6 -+#define GCK_ID_FLEXCOM1 7 -+#define GCK_ID_FLEXCOM2 8 -+#define GCK_ID_FLEXCOM3 9 -+#define GCK_ID_TIMER 10 -+#define GCK_ID_USB_REFCLK 11 -+ -+/* Gate clocks */ -+#define GCK_GATE_USB_DRD 12 -+#define GCK_GATE_MCRAMC 13 -+#define GCK_GATE_HMATRIX 14 -+ -+#endif