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>

diff --git a/target/linux/microchipsw/dts/clk-lan9691.h b/target/linux/microchipsw/dts/clk-lan9691.h
new file mode 100644 (file)
index 0000000..f0006a6
--- /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 69f9bfc89a3c69bcb46faead1c9b2d016f7b2e07..b79923fba008ba647e9df8e57287d97ebf58c6c2 100644 (file)
--- 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 659e8d053f08d111a629ce071dad6ea7b33aeca6..1c877b12d26054601d890413a0b9e28d2758bbf7 100644 (file)
--- 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 5c66df5c523da91318643a6fd079d37fa534bd5e..91b36a4adfbf501d5991bb4c6312d4d37f2ffa58 100644 (file)
--- 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 (file)
index 9f2b4dd..0000000
--- 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