diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 00:58:38 -0400 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 00:58:38 -0400 |
| commit | a5e588cca35baba14d175103fe1ac91dc009d6fe (patch) | |
| tree | b0caae6f36ea759bb87ca5b5a64a2b2ae82d36ac | |
| parent | 53cf4c9b02c0a155f385e105b233a4d984e17117 (diff) | |
| parent | ce9c28ca6c6f572c0bb6e7936e8f42cd1595b820 (diff) | |
Merge branch 'topic/imx' into for-linus
| -rw-r--r-- | drivers/dma/imx-dma.c | 26 | ||||
| -rw-r--r-- | drivers/dma/imx-sdma.c | 29 | ||||
| -rw-r--r-- | drivers/dma/mxs-dma.c | 14 |
3 files changed, 26 insertions, 43 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 715b39ae5a46..75b6ff0415ee 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
| @@ -1,19 +1,13 @@ | |||
| 1 | /* | 1 | // SPDX-License-Identifier: GPL-2.0+ |
| 2 | * drivers/dma/imx-dma.c | 2 | // |
| 3 | * | 3 | // drivers/dma/imx-dma.c |
| 4 | * This file contains a driver for the Freescale i.MX DMA engine | 4 | // |
| 5 | * found on i.MX1/21/27 | 5 | // This file contains a driver for the Freescale i.MX DMA engine |
| 6 | * | 6 | // found on i.MX1/21/27 |
| 7 | * Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> | 7 | // |
| 8 | * Copyright 2012 Javier Martin, Vista Silicon <javier.martin@vista-silicon.com> | 8 | // Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> |
| 9 | * | 9 | // Copyright 2012 Javier Martin, Vista Silicon <javier.martin@vista-silicon.com> |
| 10 | * The code contained herein is licensed under the GNU General Public | 10 | |
| 11 | * License. You may obtain a copy of the GNU General Public License | ||
| 12 | * Version 2 or later at the following locations: | ||
| 13 | * | ||
| 14 | * http://www.opensource.org/licenses/gpl-license.html | ||
| 15 | * http://www.gnu.org/copyleft/gpl.html | ||
| 16 | */ | ||
| 17 | #include <linux/err.h> | 11 | #include <linux/err.h> |
| 18 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 19 | #include <linux/types.h> | 13 | #include <linux/types.h> |
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index ccd03c3cedfe..f077992635c2 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
| @@ -1,21 +1,14 @@ | |||
| 1 | /* | 1 | // SPDX-License-Identifier: GPL-2.0+ |
| 2 | * drivers/dma/imx-sdma.c | 2 | // |
| 3 | * | 3 | // drivers/dma/imx-sdma.c |
| 4 | * This file contains a driver for the Freescale Smart DMA engine | 4 | // |
| 5 | * | 5 | // This file contains a driver for the Freescale Smart DMA engine |
| 6 | * Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> | 6 | // |
| 7 | * | 7 | // Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> |
| 8 | * Based on code from Freescale: | 8 | // |
| 9 | * | 9 | // Based on code from Freescale: |
| 10 | * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. | 10 | // |
| 11 | * | 11 | // Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. |
| 12 | * The code contained herein is licensed under the GNU General Public | ||
| 13 | * License. You may obtain a copy of the GNU General Public License | ||
| 14 | * Version 2 or later at the following locations: | ||
| 15 | * | ||
| 16 | * http://www.opensource.org/licenses/gpl-license.html | ||
| 17 | * http://www.gnu.org/copyleft/gpl.html | ||
| 18 | */ | ||
| 19 | 12 | ||
| 20 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 21 | #include <linux/iopoll.h> | 14 | #include <linux/iopoll.h> |
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 41d167921fab..ae5182ff0128 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c | |||
| @@ -1,12 +1,8 @@ | |||
| 1 | /* | 1 | // SPDX-License-Identifier: GPL-2.0 |
| 2 | * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. | 2 | // |
| 3 | * | 3 | // Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. |
| 4 | * Refer to drivers/dma/imx-sdma.c | 4 | // |
| 5 | * | 5 | // Refer to drivers/dma/imx-sdma.c |
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | 6 | ||
| 11 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 12 | #include <linux/types.h> | 8 | #include <linux/types.h> |