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

Commit 2b9c272c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-v5.1' of git://github.com/bzolnier/linux 

Pull fbdev updates from Bartlomiej Zolnierkiewicz:
 "Just a couple of small fixes and cleanups:

   - fix memory access if logo is bigger than the screen (Manfred
     Schlaegl)

   - silence fbcon logo on 'quiet' boots (Prarit Bhargava)

   - use kvmalloc() for scrollback buffer in fbcon (Konstantin Khorenko)

   - misc fixes (Colin Ian King, YueHaibing, Matteo Croce, Mathieu
     Malaterre, Anders Roxell, Arnd Bergmann)

   - misc cleanups (Rob Herring, Lubomir Rintel, Greg Kroah-Hartman,
     Jani Nikula, Michal Vokáč)"

* tag 'fbdev-v5.1' of git://github.com/bzolnier/linux:
  fbdev: mbx: fix a misspelled variable name
  fbdev: omap2: fix warnings in dss core
  video: fbdev: Fix potential NULL pointer dereference
  fbcon: Silence fbcon logo on 'quiet' boots
  printk: Export console_printk
  ARM: dts: imx28-cfa10036: Fix the reset gpio signal polarity
  video: ssd1307fb: Do not hard code active-low reset sequence
  dt-bindings: display: ssd1307fb: Remove reset-active-low from examples
  fbdev: fbmem: fix memory access if logo is bigger than the screen
  video/fbdev: refactor video= cmdline parsing
  fbdev: mbx: fix up debugfs file creation
  fbdev: omap2: no need to check return value of debugfs_create functions
  video: fbdev: geode: remove ifdef OLPC noise
  video: offb: annotate implicit fall throughs
  omapfb: fix typo
  fbdev: Use of_node_name_eq for node name comparisons
  fbcon: use kvmalloc() for scrollback buffer
  fbdev: chipsfb: remove set but not used variable 'size'
  fbdev/via: fix spelling mistake "Expandsion" -> "Expansion"
parents 51b1ac0f 9a9f1d1a

Documentation/devicetree/bindings/display/ssd1307fb.txt

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ ssd1307: oled@3c { 
        reg = <0x3c>;

        pwms = <&pwm 4 3000>;

        reset-gpios = <&gpio2 7>;

        reset-active-low;

};



ssd1306: oled@3c {
@@ -44,7 +43,6 @@ ssd1306: oled@3c { 
        reg = <0x3c>;

        pwms = <&pwm 4 3000>;

        reset-gpios = <&gpio2 7>;

        reset-active-low;

        solomon,com-lrremap;

        solomon,com-invdir;

        solomon,com-offset = <32>;

arch/arm/boot/dts/imx28-cfa10036.dts

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


/dts-v1/;

#include "imx28.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Crystalfontz CFA-10036 Board";
@@ -96,7 +97,7 @@ 
					pinctrl-names = "default";

					pinctrl-0 = <&ssd1306_cfa10036>;

					reg = <0x3c>;

					reset-gpios = <&gpio2 7 0>;

					reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;

					solomon,height = <32>;

					solomon,width = <128>;

					solomon,page-offset = <0>;

drivers/video/fbdev/aty/radeon_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -2844,8 +2844,8 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis 
		 * in some desktop G4s), Via (M9+ chip on iBook G4) and

		 * Snowy (M11 chip on iBook G4 manufactured after July 2005)

		 */

		if (!strcmp(rinfo->of_node->name, "ATY,JasperParent") ||

		    !strcmp(rinfo->of_node->name, "ATY,SnowyParent")) {

		if (of_node_name_eq(rinfo->of_node, "ATY,JasperParent") ||

		    of_node_name_eq(rinfo->of_node, "ATY,SnowyParent")) {

			rinfo->reinit_func = radeon_reinitialize_M10;

			rinfo->pm_mode |= radeon_pm_off;

		}
@@ -2855,7 +2855,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis 
			rinfo->pm_mode |= radeon_pm_off;

		}

#endif

		if (!strcmp(rinfo->of_node->name, "ATY,ViaParent")) {

		if (of_node_name_eq(rinfo->of_node, "ATY,ViaParent")) {

			rinfo->reinit_func = radeon_reinitialize_M9P;

			rinfo->pm_mode |= radeon_pm_off;

		}

drivers/video/fbdev/cg14.c

+2 −2
Original line number Diff line number Diff line
@@ -486,8 +486,8 @@ static int cg14_probe(struct platform_device *op) 
					  info->var.xres);

	info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);



	if (!strcmp(dp->parent->name, "sbus") ||

	    !strcmp(dp->parent->name, "sbi")) {

	if (of_node_name_eq(dp->parent, "sbus") ||

	    of_node_name_eq(dp->parent, "sbi")) {

		info->fix.smem_start = op->resource[0].start;

		par->iospace = op->resource[0].flags & IORESOURCE_BITS;

	} else {

drivers/video/fbdev/cg3.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int cg3_probe(struct platform_device *op) 
	info->var.red.length = 8;

	info->var.green.length = 8;

	info->var.blue.length = 8;

	if (!strcmp(dp->name, "cgRDI"))

	if (of_node_name_eq(dp, "cgRDI"))

		par->flags |= CG3_FLAG_RDI;

	if (par->flags & CG3_FLAG_RDI)

		cg3_rdi_maybe_fixup_var(&info->var, dp);