Commit 86d6688e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev fixes from Helge Deller:

 - Fix some build warnings and failures with CONFIG_FB_IOMEM_FOPS and
   CONFIG_FB_DEVICE

 - Remove the da8xx fbdev driver

 - Constify struct sbus_mmap_map and fix indentation warning

* tag 'fbdev-for-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: wm8505fb: select CONFIG_FB_IOMEM_FOPS
  fbdev: da8xx: remove the driver
  fbdev: Constify struct sbus_mmap_map
  fbdev: nvidiafb: fix inconsistent indentation warning
  fbdev: sstfb: Make CONFIG_FB_DEVICE optional
parents f0560f97 51521d2e

drivers/video/fbdev/Kconfig

+1 −14
Original line number Diff line number Diff line
@@ -1236,7 +1236,6 @@ config FB_3DFX_I2C 
config FB_VOODOO1

	tristate "3Dfx Voodoo Graphics (sst1) support"

	depends on FB && PCI

	depends on FB_DEVICE

	select FB_IOMEM_HELPERS

	help

	  Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or
@@ -1374,6 +1373,7 @@ config FB_VT8500 
config FB_WM8505

	bool "Wondermedia WM8xxx-series frame buffer support"

	depends on (FB = y) && HAS_IOMEM && (ARCH_VT8500 || COMPILE_TEST)

	select FB_IOMEM_FOPS

	select FB_SYS_FILLRECT if (!FB_WMT_GE_ROPS)

	select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS)

	select FB_SYS_IMAGEBLIT
@@ -1660,19 +1660,6 @@ config FB_SH7760 
	  and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for

	  panels <= 320 pixel horizontal resolution.



config FB_DA8XX

	tristate "DA8xx/OMAP-L1xx/AM335x Framebuffer support"

	depends on FB && HAVE_CLK && HAS_IOMEM

	depends on ARCH_DAVINCI_DA8XX || SOC_AM33XX || COMPILE_TEST

	select FB_CFB_REV_PIXELS_IN_BYTE

	select FB_IOMEM_HELPERS

	select FB_MODE_HELPERS

	select VIDEOMODE_HELPERS

	help

	  This is the frame buffer device driver for the TI LCD controller

	  found on DA8xx/OMAP-L1xx/AM335x SoCs.

	  If unsure, say N.



config FB_VIRTUAL

	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"

	depends on FB

drivers/video/fbdev/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ obj-$(CONFIG_FB_VESA) += vesafb.o 
obj-$(CONFIG_FB_EFI)              += efifb.o

obj-$(CONFIG_FB_VGA16)            += vga16fb.o

obj-$(CONFIG_FB_OF)               += offb.o

obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o

obj-$(CONFIG_FB_SSD1307)	  += ssd1307fb.o

obj-$(CONFIG_FB_SIMPLE)           += simplefb.o

drivers/video/fbdev/bw2.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ bw2_blank(int blank, struct fb_info *info) 
	return 0;

}



static struct sbus_mmap_map bw2_mmap_map[] = {

static const struct sbus_mmap_map bw2_mmap_map[] = {

	{

		.size = SBUS_MMAP_FBSIZE(1)

	},

drivers/video/fbdev/cg14.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static void cg14_init_fix(struct fb_info *info, int linebytes, 
	info->fix.accel = FB_ACCEL_SUN_CG14;

}



static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {

static const struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {

	{

		.voff	= CG14_REGS,

		.poff	= 0x80000000,

drivers/video/fbdev/cg3.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int cg3_blank(int blank, struct fb_info *info) 
	return 0;

}



static struct sbus_mmap_map cg3_mmap_map[] = {

static const struct sbus_mmap_map cg3_mmap_map[] = {

	{

		.voff	= CG3_MMAP_OFFSET,

		.poff	= CG3_RAM_OFFSET,