From: Greg Kroah-Hartman Date: Fri, 27 Dec 2024 12:22:48 +0000 (+0100) Subject: drop queue-6.1/dt-bindings-net-fec-add-pps-channel-property.patch X-Git-Tag: v6.1.122~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93bec0a1f48d9fe3d83cc2dd554fc81e3c5c86ec;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.1/dt-bindings-net-fec-add-pps-channel-property.patch Wrong branch --- diff --git a/queue-6.1/dt-bindings-net-fec-add-pps-channel-property.patch b/queue-6.1/dt-bindings-net-fec-add-pps-channel-property.patch deleted file mode 100644 index e3b8cb6795b..00000000000 --- a/queue-6.1/dt-bindings-net-fec-add-pps-channel-property.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1aa772be0444a2bd06957f6d31865e80e6ae4244 Mon Sep 17 00:00:00 2001 -From: Francesco Dolcini -Date: Fri, 4 Oct 2024 17:24:17 +0200 -Subject: dt-bindings: net: fec: add pps channel property - -From: Francesco Dolcini - -commit 1aa772be0444a2bd06957f6d31865e80e6ae4244 upstream. - -Add fsl,pps-channel property to select where to connect the PPS signal. -This depends on the internal SoC routing and on the board, for example -on the i.MX8 SoC it can be connected to an external pin (using channel 1) -or to internal eDMA as DMA request (channel 0). - -Signed-off-by: Francesco Dolcini -Acked-by: Conor Dooley -Signed-off-by: Paolo Abeni -Signed-off-by: Csókás, Bence -Signed-off-by: Greg Kroah-Hartman ---- - Documentation/devicetree/bindings/net/fsl,fec.yaml | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/Documentation/devicetree/bindings/net/fsl,fec.yaml -+++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml -@@ -176,6 +176,13 @@ properties: - description: - Register bits of stop mode control, the format is <&gpr req_gpr req_bit>. - -+ fsl,pps-channel: -+ $ref: /schemas/types.yaml#/definitions/uint32 -+ default: 0 -+ description: -+ Specifies to which timer instance the PPS signal is routed. -+ enum: [0, 1, 2, 3] -+ - mdio: - $ref: mdio.yaml# - unevaluatedProperties: false diff --git a/queue-6.1/series b/queue-6.1/series index 022e42e897a..59dd55b5f86 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -79,5 +79,4 @@ epoll-add-synchronous-wakeup-support-for-ep_poll_callback.patch io_uring-rw-split-io_read-into-a-helper.patch io_uring-rw-treat-eopnotsupp-for-iocb_nowait-like-eagain.patch io_uring-rw-avoid-punting-to-io-wq-directly.patch -dt-bindings-net-fec-add-pps-channel-property.patch drm-amdgpu-handle-null-bo-tbo.resource-again-in-amdgpu_vm_bo_update.patch