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

Commit 187a6035 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

video: fbdev: remove unused sh_mobile_meram driver 



Since commit a521422e  ("ARM: shmobile: mackerel: Remove Legacy C
board code") MERAM functionality is unused. Remove it.

Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent e7deb3c7

drivers/video/fbdev/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -2312,18 +2312,6 @@ source "drivers/video/fbdev/omap/Kconfig" 
source "drivers/video/fbdev/omap2/Kconfig"

source "drivers/video/fbdev/mmp/Kconfig"



config FB_SH_MOBILE_MERAM

	tristate "SuperH Mobile MERAM read ahead support"

	depends on ARCH_SHMOBILE

	select GENERIC_ALLOCATOR

	---help---

	  Enable MERAM support for the SuperH controller.



	  This will allow for caching of the framebuffer to provide more

	  reliable access under heavy main memory bus traffic situations.

	  Up to 4 memory channels can be configured, allowing 4 RGB or

	  2 YCbCr framebuffers to be configured.



config FB_SSD1307

	tristate "Solomon SSD1307 framebuffer support"

	depends on FB && I2C

drivers/video/fbdev/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ obj-$(CONFIG_FB_SM501) += sm501fb.o 
obj-$(CONFIG_FB_UDL)		  += udlfb.o

obj-$(CONFIG_FB_SMSCUFX)	  += smscufx.o

obj-$(CONFIG_FB_XILINX)           += xilinxfb.o

obj-$(CONFIG_FB_SH_MOBILE_MERAM)  += sh_mobile_meram.o

obj-$(CONFIG_FB_SH_MOBILE_LCDC)	  += sh_mobile_lcdcfb.o

obj-$(CONFIG_FB_OMAP)             += omap/

obj-y                             += omap2/

drivers/video/fbdev/sh_mobile_meram.c

deleted100644 → 0
+0 −754

File deleted.

Preview size limit exceeded, changes collapsed.

include/video/sh_mobile_meram.h

deleted100644 → 0
+0 −95
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __VIDEO_SH_MOBILE_MERAM_H__

#define __VIDEO_SH_MOBILE_MERAM_H__



/* For sh_mobile_meram_info.addr_mode */

enum {

	SH_MOBILE_MERAM_MODE0 = 0,

	SH_MOBILE_MERAM_MODE1

};



enum {

	SH_MOBILE_MERAM_PF_NV = 0,

	SH_MOBILE_MERAM_PF_RGB,

	SH_MOBILE_MERAM_PF_NV24

};





struct sh_mobile_meram_priv;



/*

 * struct sh_mobile_meram_info - MERAM platform data

 * @reserved_icbs: Bitmask of reserved ICBs (for instance used through UIO)

 */

struct sh_mobile_meram_info {

	int				addr_mode;

	u32				reserved_icbs;

	struct sh_mobile_meram_priv	*priv;

	struct platform_device		*pdev;

};



/* icb config */

struct sh_mobile_meram_icb_cfg {

	unsigned int meram_size;	/* MERAM Buffer Size to use */

};



struct sh_mobile_meram_cfg {

	struct sh_mobile_meram_icb_cfg icb[2];

};



#if defined(CONFIG_FB_SH_MOBILE_MERAM) || \

    defined(CONFIG_FB_SH_MOBILE_MERAM_MODULE)

unsigned long sh_mobile_meram_alloc(struct sh_mobile_meram_info *meram_dev,

				    size_t size);

void sh_mobile_meram_free(struct sh_mobile_meram_info *meram_dev,

			  unsigned long mem, size_t size);

void *sh_mobile_meram_cache_alloc(struct sh_mobile_meram_info *dev,

				  const struct sh_mobile_meram_cfg *cfg,

				  unsigned int xres, unsigned int yres,

				  unsigned int pixelformat,

				  unsigned int *pitch);

void sh_mobile_meram_cache_free(struct sh_mobile_meram_info *dev, void *data);

void sh_mobile_meram_cache_update(struct sh_mobile_meram_info *dev, void *data,

				  unsigned long base_addr_y,

				  unsigned long base_addr_c,

				  unsigned long *icb_addr_y,

				  unsigned long *icb_addr_c);

#else

static inline unsigned long

sh_mobile_meram_alloc(struct sh_mobile_meram_info *meram_dev, size_t size)

{

	return 0;

}



static inline void

sh_mobile_meram_free(struct sh_mobile_meram_info *meram_dev,

		     unsigned long mem, size_t size)

{

}



static inline void *

sh_mobile_meram_cache_alloc(struct sh_mobile_meram_info *dev,

			    const struct sh_mobile_meram_cfg *cfg,

			    unsigned int xres, unsigned int yres,

			    unsigned int pixelformat,

			    unsigned int *pitch)

{

	return ERR_PTR(-ENODEV);

}



static inline void

sh_mobile_meram_cache_free(struct sh_mobile_meram_info *dev, void *data)

{

}



static inline void

sh_mobile_meram_cache_update(struct sh_mobile_meram_info *dev, void *data,

			     unsigned long base_addr_y,

			     unsigned long base_addr_c,

			     unsigned long *icb_addr_y,

			     unsigned long *icb_addr_c)

{

}

#endif



#endif /* __VIDEO_SH_MOBILE_MERAM_H__  */