Commit a5e588cc authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/imx' into for-linus

parents 53cf4c9b ce9c28ca

drivers/dma/imx-dma.c

+10 −16
Original line number Diff line number Diff line 
/*

 * drivers/dma/imx-dma.c

 *

 * 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>

 *

 * 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

 */

// SPDX-License-Identifier: GPL-2.0+

//

// drivers/dma/imx-dma.c

//

// 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>



#include <linux/err.h>

#include <linux/init.h>

#include <linux/types.h>

drivers/dma/imx-sdma.c

+11 −18
Original line number Diff line number Diff line 
/*

 * drivers/dma/imx-sdma.c

 *

 * This file contains a driver for the Freescale Smart DMA engine

 *

 * Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>

 *

 * Based on code from Freescale:

 *

 * 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

 */

// SPDX-License-Identifier: GPL-2.0+

//

// drivers/dma/imx-sdma.c

//

// This file contains a driver for the Freescale Smart DMA engine

//

// Copyright 2010 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>

//

// Based on code from Freescale:

//

// Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.



#include <linux/init.h>

#include <linux/iopoll.h>

drivers/dma/mxs-dma.c

+5 −9
Original line number Diff line number Diff line 
/*

 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * 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.

 */

// SPDX-License-Identifier: GPL-2.0

//

// Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.

//

// Refer to drivers/dma/imx-sdma.c



#include <linux/init.h>

#include <linux/types.h>