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

Commit fa815580 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev updates from Tomi Valkeinen:
 "Minor fixes and cleanups"

* tag 'fbdev-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: fbdev: atmel_lcdfb: remove useless include
  video: fbdev: pxa168fb: Use devm_clk_get
  fbdev: ssd1307fb: fix error return code
  fbdev: fix snprintf() limit in show_bl_curve()
  video: fbdev: s3c-fb: Constify platform_device_id
  video: fbdev: atmel: fix warning for const return value
  video: fbdev: Drop owner assignment from platform_driver
  video: fbdev: Drop owner assignment from i2c_driver
  fbdev: remove unnecessary memset in vfb
  framebuffer: disable vgacon on microblaze arch
  fbdev: udlfb: remove unneeded initialization in few places
  fbdev: Allow compile test of GPIO consumers if !GPIOLIB
  fbdev: fix cea_modes array size
parents 85579ad7 57817e61

drivers/video/console/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config VGA_CONSOLE 
	depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \

		!SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \

		(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \

		!ARM64 && !ARC

		!ARM64 && !ARC && !MICROBLAZE

	default y

	help

	  Saying Y here will allow you to use Linux in text mode through a

drivers/video/fbdev/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2464,7 +2464,7 @@ config FB_SSD1307 
	tristate "Solomon SSD1307 framebuffer support"

	depends on FB && I2C

	depends on OF

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	select FB_SYS_FOPS

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

drivers/video/fbdev/atmel_lcdfb.c

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

#include <linux/gfp.h>

#include <linux/module.h>

#include <linux/platform_data/atmel.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>
@@ -999,7 +998,7 @@ static const char *atmel_lcdfb_wiring_modes[] = { 
	[ATMEL_LCDC_WIRING_RGB]	= "RGB",

};



const int atmel_lcdfb_get_of_wiring_modes(struct device_node *np)

static int atmel_lcdfb_get_of_wiring_modes(struct device_node *np)

{

	const char *mode;

	int err, i;

drivers/video/fbdev/core/fbmon.c

+2 −2
Original line number Diff line number Diff line
@@ -1072,9 +1072,9 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) 


	for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) {

		int idx = svd[i - specs->modedb_len - num];

		if (!idx || idx > 63) {

		if (!idx || idx >= ARRAY_SIZE(cea_modes)) {

			pr_warning("Reserved SVD code %d\n", idx);

		} else if (idx > ARRAY_SIZE(cea_modes) || !cea_modes[idx].xres) {

		} else if (!cea_modes[idx].xres) {

			pr_warning("Unimplemented SVD code %d\n", idx);

		} else {

			memcpy(&m[i], cea_modes + idx, sizeof(m[i]));

drivers/video/fbdev/core/fbsysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static ssize_t show_bl_curve(struct device *device, 


	mutex_lock(&fb_info->bl_curve_mutex);

	for (i = 0; i < FB_BACKLIGHT_LEVELS; i += 8)

		len += snprintf(&buf[len], PAGE_SIZE, "%8ph\n",

		len += scnprintf(&buf[len], PAGE_SIZE - len, "%8ph\n",

				fb_info->bl_curve + i);

	mutex_unlock(&fb_info->bl_curve_mutex);