delete can-flexcan-fix-flexcan_chip_start-on-imx6.patch

diff --git a/queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch b/queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch
deleted file mode 100644 (file)
index 4e5850f..0000000
--- a/queue-3.10/can-flexcan-fix-flexcan_chip_start-on-imx6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0d1862ea1a5bb876cf05555a7307080cb75bf379 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Fri, 27 Sep 2013 12:15:05 +0200
-Subject: can: flexcan: fix flexcan_chip_start() on imx6
-
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream.
-
-In the flexcan_chip_start() function first the flexcan core is going through
-the soft reset sequence, then the RX FIFO is enabled.
-
-With the hardware is put into FIFO mode, message buffers 1...7 are reserved by
-the FIFO engine. The remaining message buffers are in reset default values.
-This patch removes the bogus initialization of the message buffers, as it
-causes an imprecise external abort on imx6.
-
-Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
-Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/can/flexcan.c |   12 ------------
- 1 file changed, 12 deletions(-)
-
---- a/drivers/net/can/flexcan.c
-+++ b/drivers/net/can/flexcan.c
-@@ -711,7 +711,6 @@ static int flexcan_chip_start(struct net
- {
-       struct flexcan_priv *priv = netdev_priv(dev);
-       struct flexcan_regs __iomem *regs = priv->base;
--      unsigned int i;
-       int err;
-       u32 reg_mcr, reg_ctrl;
- 
-@@ -781,17 +780,6 @@ static int flexcan_chip_start(struct net
-       netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
-       flexcan_write(reg_ctrl, &regs->ctrl);
- 
--      for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
--              flexcan_write(0, &regs->cantxfg[i].can_ctrl);
--              flexcan_write(0, &regs->cantxfg[i].can_id);
--              flexcan_write(0, &regs->cantxfg[i].data[0]);
--              flexcan_write(0, &regs->cantxfg[i].data[1]);
--
--              /* put MB into rx queue */
--              flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
--                      &regs->cantxfg[i].can_ctrl);
--      }
--
-       /* acceptance mask/acceptance code (accept everything) */
-       flexcan_write(0x0, &regs->rxgmask);
-       flexcan_write(0x0, &regs->rx14mask);

diff --git a/queue-3.10/series b/queue-3.10/series
index b06412f23067523fecc50bf52ca76ced4d6b3240..b99eb37fc4238790c3b7862708d8d533ab677444 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -90,7 +90,6 @@ mm-avoid-reinserting-isolated-balloon-pages-into-lru-lists.patch
 iscsi-target-only-perform-wait_for_tasks-when-performing-shutdown.patch
 net-update-the-sysctl-permissions-handler-to-test-effective-uid-gid.patch
 irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch
-can-flexcan-fix-flexcan_chip_start-on-imx6.patch
 revert-drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch
 dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch
 dmaengine-imx-dma-fix-callback-path-in-tasklet.patch

diff --git a/queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch b/queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch
deleted file mode 100644 (file)
index 254fcd9..0000000
--- a/queue-3.11/can-flexcan-fix-flexcan_chip_start-on-imx6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0d1862ea1a5bb876cf05555a7307080cb75bf379 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Fri, 27 Sep 2013 12:15:05 +0200
-Subject: can: flexcan: fix flexcan_chip_start() on imx6
-
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream.
-
-In the flexcan_chip_start() function first the flexcan core is going through
-the soft reset sequence, then the RX FIFO is enabled.
-
-With the hardware is put into FIFO mode, message buffers 1...7 are reserved by
-the FIFO engine. The remaining message buffers are in reset default values.
-This patch removes the bogus initialization of the message buffers, as it
-causes an imprecise external abort on imx6.
-
-Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
-Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/can/flexcan.c |   12 ------------
- 1 file changed, 12 deletions(-)
-
---- a/drivers/net/can/flexcan.c
-+++ b/drivers/net/can/flexcan.c
-@@ -702,7 +702,6 @@ static int flexcan_chip_start(struct net
- {
-       struct flexcan_priv *priv = netdev_priv(dev);
-       struct flexcan_regs __iomem *regs = priv->base;
--      unsigned int i;
-       int err;
-       u32 reg_mcr, reg_ctrl;
- 
-@@ -772,17 +771,6 @@ static int flexcan_chip_start(struct net
-       netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
-       flexcan_write(reg_ctrl, &regs->ctrl);
- 
--      for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
--              flexcan_write(0, &regs->cantxfg[i].can_ctrl);
--              flexcan_write(0, &regs->cantxfg[i].can_id);
--              flexcan_write(0, &regs->cantxfg[i].data[0]);
--              flexcan_write(0, &regs->cantxfg[i].data[1]);
--
--              /* put MB into rx queue */
--              flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
--                      &regs->cantxfg[i].can_ctrl);
--      }
--
-       /* acceptance mask/acceptance code (accept everything) */
-       flexcan_write(0x0, &regs->rxgmask);
-       flexcan_write(0x0, &regs->rx14mask);

diff --git a/queue-3.11/series b/queue-3.11/series
index 0c1a4f7af4ff3f9971220b5927ab6669f278b614..f146022ce8054cce879e9b0484ea8587d689cacd 100644 (file)
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@ -109,7 +109,6 @@ mm-avoid-reinserting-isolated-balloon-pages-into-lru-lists.patch
 iscsi-target-only-perform-wait_for_tasks-when-performing-shutdown.patch
 net-update-the-sysctl-permissions-handler-to-test-effective-uid-gid.patch
 irq-force-hardirq-exit-s-softirq-processing-on-its-own-stack.patch
-can-flexcan-fix-flexcan_chip_start-on-imx6.patch
 drm-radeon-fix-hdmi-callbacks-for-rv6xx-incorrectly-added-to-r520.patch
 dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch
 dmaengine-imx-dma-fix-callback-path-in-tasklet.patch

diff --git a/queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch b/queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch
deleted file mode 100644 (file)
index 4a99563..0000000
--- a/queue-3.4/can-flexcan-fix-flexcan_chip_start-on-imx6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0d1862ea1a5bb876cf05555a7307080cb75bf379 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Fri, 27 Sep 2013 12:15:05 +0200
-Subject: can: flexcan: fix flexcan_chip_start() on imx6
-
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-commit 0d1862ea1a5bb876cf05555a7307080cb75bf379 upstream.
-
-In the flexcan_chip_start() function first the flexcan core is going through
-the soft reset sequence, then the RX FIFO is enabled.
-
-With the hardware is put into FIFO mode, message buffers 1...7 are reserved by
-the FIFO engine. The remaining message buffers are in reset default values.
-This patch removes the bogus initialization of the message buffers, as it
-causes an imprecise external abort on imx6.
-
-Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
-Tested-by: Lothar Waßmann <LW@KARO-electronics.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/can/flexcan.c |   12 ------------
- 1 file changed, 12 deletions(-)
-
---- a/drivers/net/can/flexcan.c
-+++ b/drivers/net/can/flexcan.c
-@@ -667,7 +667,6 @@ static int flexcan_chip_start(struct net
- {
-       struct flexcan_priv *priv = netdev_priv(dev);
-       struct flexcan_regs __iomem *regs = priv->base;
--      unsigned int i;
-       int err;
-       u32 reg_mcr, reg_ctrl;
- 
-@@ -733,17 +732,6 @@ static int flexcan_chip_start(struct net
-       netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
-       flexcan_write(reg_ctrl, &regs->ctrl);
- 
--      for (i = 0; i < ARRAY_SIZE(regs->cantxfg); i++) {
--              flexcan_write(0, &regs->cantxfg[i].can_ctrl);
--              flexcan_write(0, &regs->cantxfg[i].can_id);
--              flexcan_write(0, &regs->cantxfg[i].data[0]);
--              flexcan_write(0, &regs->cantxfg[i].data[1]);
--
--              /* put MB into rx queue */
--              flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),
--                      &regs->cantxfg[i].can_ctrl);
--      }
--
-       /* acceptance mask/acceptance code (accept everything) */
-       flexcan_write(0x0, &regs->rxgmask);
-       flexcan_write(0x0, &regs->rx14mask);

diff --git a/queue-3.4/series b/queue-3.4/series
index 09b434e73d28037f5ecacd44f40e40d072075933..e4994e01ed899d156fa279c27a96a91b3a605a4e 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -37,7 +37,6 @@ ib_srpt-destroy-cm_id-before-destroying-qp.patch
 ib_srpt-always-set-response-for-task-management.patch
 rtlwifi-align-private-space-in-rtl_priv-struct.patch
 p54usb-add-usb-id-for-corega-wlusb2gtst-usb-adapter.patch
-can-flexcan-fix-flexcan_chip_start-on-imx6.patch
 dmaengine-imx-dma-fix-lockdep-issue-between-irqhandler-and-tasklet.patch
 dmaengine-imx-dma-fix-callback-path-in-tasklet.patch
 dmaengine-imx-dma-fix-slow-path-issue-in-prep_dma_cyclic.patch