From: Greg Kroah-Hartman Date: Mon, 31 Jan 2022 08:28:38 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.4.176~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fafa93a6cff5ddb08443441d8065d8aa3b4ae72;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch --- diff --git a/queue-5.4/dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch b/queue-5.4/dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch new file mode 100644 index 00000000000..f626997464e --- /dev/null +++ b/queue-5.4/dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch @@ -0,0 +1,31 @@ +From 17a30422621c0e04cb6060d20d7edcefd7463347 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Fri, 14 Jan 2022 18:47:41 +0100 +Subject: dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config + +From: Marc Kleine-Budde + +commit 17a30422621c0e04cb6060d20d7edcefd7463347 upstream. + +This tcan4x5x only comes with 2K of MRAM, a RX FIFO with a dept of 32 +doesn't fit into the MRAM. Use a depth of 16 instead. + +Fixes: 4edd396a1911 ("dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver") +Link: https://lore.kernel.org/all/20220119062951.2939851-1-mkl@pengutronix.de +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/devicetree/bindings/net/can/tcan4x5x.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt ++++ b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt +@@ -31,7 +31,7 @@ tcan4x5x: tcan4x5x@0 { + #address-cells = <1>; + #size-cells = <1>; + spi-max-frequency = <10000000>; +- bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>; ++ bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>; + interrupt-parent = <&gpio1>; + interrupts = <14 IRQ_TYPE_LEVEL_LOW>; + device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; diff --git a/queue-5.4/series b/queue-5.4/series index 9b0a7756ade..9038fdcf511 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -59,3 +59,4 @@ net-hns3-handle-empty-unknown-interrupt-for-vf.patch ipv4-raw-lock-the-socket-in-raw_bind.patch ipv4-tcp-send-zero-ipid-in-synack-messages.patch ipv4-remove-sparse-error-in-ip_neigh_gw4.patch +dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch