diff options
| author | Robert Marko | 2026-01-09 15:50:34 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-01-09 17:55:19 +0000 |
| commit | 7d9602e5275e5c484fabfdc01ff447489ecc6e91 (patch) | |
| tree | 64dd92323621e32b961faa8d54238ad08a9f925e | |
| parent | d925dd48871ba939afbc050494592131b7d73298 (diff) | |
| download | openwrt-7d9602e5275e5c484fabfdc01ff447489ecc6e91.tar.gz | |
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 <robert.marko@sartura.hr>
(cherry picked from commit 6944f1c6a007f9da07387b9991fd341ebbda1447)
5 files changed, 28 insertions, 43 deletions
diff --git a/target/linux/microchipsw/dts/clk-lan9691.h b/target/linux/microchipsw/dts/clk-lan9691.h new file mode 100644 index 0000000000..f0006a6037 --- /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 69f9bfc89a..b79923fba0 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 <dt-bindings/clock/microchip,lan9691.h> #include <dt-bindings/dma/at91.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/mfd/at91-usart.h> #include <dt-bindings/mfd/atmel-flexcom.h> +#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 659e8d053f..1c877b12d2 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 <kuba@kernel.org> --- 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 5c66df5c52..91b36a4adf 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 <davem@davemloft.net> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -15152,7 +15152,7 @@ M: Daniel Machon <daniel.machon@microchi +@@ -15158,7 +15158,7 @@ M: Daniel Machon <daniel.machon@microchi M: UNGLinuxDriver@microchip.com L: netdev@vger.kernel.org S: Maintained diff --git a/target/linux/microchipsw/patches-6.12/103-include-dt-bindings-add-LAN969x-clock-bindings.patch b/target/linux/microchipsw/patches-6.12/103-include-dt-bindings-add-LAN969x-clock-bindings.patch deleted file mode 100644 index 9f2b4dd66a..0000000000 --- a/target/linux/microchipsw/patches-6.12/103-include-dt-bindings-add-LAN969x-clock-bindings.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 334fd8a6295e82c16b3120d29213ca02947d3ebb Mon Sep 17 00:00:00 2001 -From: Robert Marko <robert.marko@sartura.hr> -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 <robert.marko@sartura.hr> ---- - 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 |