Просмотр исходного кода

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 <[email protected]>
Robert Marko 1 неделя назад
Родитель
Сommit
6944f1c6a0

+ 24 - 0
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

+ 2 - 1
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>;

+ 1 - 1
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 <[email protected]>
 
 --- 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
  

+ 1 - 1
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 <[email protected]>
 
 --- 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:	[email protected]
  L:	[email protected]
  S:	Maintained

+ 0 - 40
target/linux/microchipsw/patches-6.12/103-include-dt-bindings-add-LAN969x-clock-bindings.patch

@@ -1,40 +0,0 @@
-From 334fd8a6295e82c16b3120d29213ca02947d3ebb Mon Sep 17 00:00:00 2001
-From: Robert Marko <[email protected]>
-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 <[email protected]>
----
- 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