Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8a6d998 authored by Shawn Guo's avatar Shawn Guo
Browse files

dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h 



The header ipu.h really belongs to dma subsystem rather than imx
platform.  Rename it to ipu-dma.h and put it into include/linux/dma/.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-media@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
parent d6071738

drivers/dma/ipu/ipu_idmac.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,7 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/module.h>



#include <linux/dma/ipu-dma.h>

#include <mach/ipu.h>





#include "../dmaengine.h"

#include "../dmaengine.h"

#include "ipu_intern.h"

#include "ipu_intern.h"

drivers/dma/ipu/ipu_irq.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,7 @@ 
#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/module.h>



#include <linux/dma/ipu-dma.h>

#include <mach/ipu.h>





#include "ipu_intern.h"

#include "ipu_intern.h"

drivers/media/platform/soc_camera/mx3_camera.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/vmalloc.h>

#include <linux/vmalloc.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/dma/ipu-dma.h>





#include <media/v4l2-common.h>

#include <media/v4l2-common.h>

#include <media/v4l2-dev.h>

#include <media/v4l2-dev.h>
@@ -24,7 +25,6 @@ 
#include <media/soc_camera.h>

#include <media/soc_camera.h>

#include <media/soc_mediabus.h>

#include <media/soc_mediabus.h>





#include <mach/ipu.h>

#include <linux/platform_data/camera-mx3.h>

#include <linux/platform_data/camera-mx3.h>

#include <linux/platform_data/dma-imx.h>

#include <linux/platform_data/dma-imx.h>

drivers/video/mx3fb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,10 +26,10 @@ 
#include <linux/console.h>

#include <linux/console.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/dma/ipu-dma.h>





#include <linux/platform_data/dma-imx.h>

#include <linux/platform_data/dma-imx.h>

#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/ipu.h>

#include <linux/platform_data/video-mx3fb.h>

#include <linux/platform_data/video-mx3fb.h>





#include <asm/io.h>

#include <asm/io.h>

arch/arm/mach-imx/include/mach/ipu.h→include/linux/dma/ipu-dma.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -9,8 +9,8 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

 */

 */





#ifndef _IPU_H_

#ifndef __LINUX_DMA_IPU_DMA_H

#define _IPU_H_

#define __LINUX_DMA_IPU_DMA_H





#include <linux/types.h>

#include <linux/types.h>

#include <linux/dmaengine.h>

#include <linux/dmaengine.h>
@@ -174,4 +174,4 @@ struct idmac_channel { 
#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd)

#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd)

#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan)

#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan)





#endif
 
#endif /* __LINUX_DMA_IPU_DMA_H */