leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/imx' into for-linus

Browse Source
This commit is contained in:
Vinod Koul 2018-06-04 10:28:38 +05:30
commit a5e588cca3
3 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/dma/imx-dma.c
View File

@ -1,19 +1,13 @@
/* // SPDX-License-Identifier: GPL-2.0+
* drivers/dma/imx-dma.c //
* // drivers/dma/imx-dma.c
* This file contains a driver for the Freescale i.MX DMA engine //
* found on i.MX1/21/27 // This file contains a driver for the Freescale i.MX DMA engine
* // found on i.MX1/21/27
* Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> //
* Copyright 2012 Javier Martin, Vista Silicon <javier.martin@vista-silicon.com> // Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
* // Copyright 2012 Javier Martin, Vista Silicon <javier.martin@vista-silicon.com>
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>

29
drivers/dma/imx-sdma.c
View File

@ -1,21 +1,14 @@
/* // SPDX-License-Identifier: GPL-2.0+
* drivers/dma/imx-sdma.c //
* // drivers/dma/imx-sdma.c
* This file contains a driver for the Freescale Smart DMA engine //
* // This file contains a driver for the Freescale Smart DMA engine
* Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> //
* // Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
* Based on code from Freescale: //
* // Based on code from Freescale:
* Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. //
* // Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
* Version 2 or later at the following locations:
*
* http://www.opensource.org/licenses/gpl-license.html
* http://www.gnu.org/copyleft/gpl.html
*/
#include <linux/init.h> #include <linux/init.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>

14
drivers/dma/mxs-dma.c
View File

@ -1,12 +1,8 @@
/* // SPDX-License-Identifier: GPL-2.0
* Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. //
* // Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
* Refer to drivers/dma/imx-sdma.c //
* // Refer to drivers/dma/imx-sdma.c
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>