Commit 8a20974f authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

fbdev: sh_mobile_meram: Remove unneeded sh_mobile_meram.h 



The drivers/video/sh_mobile_meram.h header contains unused definitions
and declarations. Move the only used macro to sh_mobile_meram.c, and
remove the header.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent d86d29df

drivers/video/sh_mobile_lcdcfb.c

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

#include <linux/gpio.h>

#include <video/sh_mobile_lcdc.h>

#include <video/sh_mobile_meram.h>

#include <linux/atomic.h>



#include "sh_mobile_lcdcfb.h"

#include "sh_mobile_meram.h"



#define SIDE_B_OFFSET 0x1000

#define MIRROR_OFFSET 0x2000

drivers/video/sh_mobile_meram.c

+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
#include <linux/io.h>

#include <linux/slab.h>

#include <linux/platform_device.h>



#include "sh_mobile_meram.h"

#include <video/sh_mobile_meram.h>



/* meram registers */

#define MEVCR1			0x4
@@ -82,6 +81,8 @@ 
	 ((yszm1) << MExxBSIZE_YSZM1_SHIFT) | \

	 ((xszm1) << MExxBSIZE_XSZM1_SHIFT))



#define SH_MOBILE_MERAM_ICB_NUM		32



static unsigned long common_regs[] = {

	MEVCR1,

	MEQSEL1,

drivers/video/sh_mobile_meram.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
#ifndef __sh_mobile_meram_h__

#define __sh_mobile_meram_h__



#include <linux/mutex.h>

#include <video/sh_mobile_meram.h>



/*

 * MERAM private

 */



#define MERAM_ICB_Y 0x1

#define MERAM_ICB_C 0x2



/* MERAM cache size */

#define SH_MOBILE_MERAM_ICB_NUM		32



#define SH_MOBILE_MERAM_CACHE_OFFSET(p)	((p) >> 16)

#define SH_MOBILE_MERAM_CACHE_SIZE(p)	((p) & 0xffff)



int sh_mobile_meram_alloc_icb(const struct sh_mobile_meram_cfg *cfg,

		   int xres,

		   int yres,

		   unsigned int base_addr,

		   int yuv_mode,

		   int *marker_icb,

		   int *out_pitch);



void sh_mobile_meram_free_icb(int marker_icb);



#define SH_MOBILE_MERAM_START(ind, ab) \

	(0xC0000000 | ((ab & 0x1) << 23) | ((ind & 0x1F) << 24))



#endif /* !__sh_mobile_meram_h__ */