From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 18:00:09 +0000 (-0800)
Subject: Merge tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b13866869b8407497d20a916450594e117583e6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'fbdev-4.4' of git://git./linux/kernel/git/tomba/linux

Pull fbdev updates from Tomi Valkeinen:
 - omap: fix hdmi audio configuration issue
 - ssd1307fb: add ssd1309 support
 - tridentfb: support DDC
 - gxt4500: enable support for non-PPC platforms

* tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  radeonfb: Deinline large functions
  gxt4500: enable panning
  gxt4500: Use arch_phys_wc_* for framebuffer
  gxt4500: fix color order
  gxt4500: fix 16bpp 565 mode
  gxt4500: enable on non-PPC architectures
  tridentfb: Add DDC support
  fb_ddc: Allow I2C adapters without SCL read capability
  fbdev: ssd1307fb: add ssd1309 support
  fbdev: ssd1307fb: alphabetize headers
  video/omap: remove invalid check
  OMAPDSS: hdmi: Reconfigure and restart audio when display is enabled
---

3b13866869b8407497d20a916450594e117583e6
diff --cc Documentation/devicetree/bindings/display/ssd1307fb.txt
index d1be78db63f5,000000000000..eb31ed47a283
mode 100644,000000..100644
--- a/Documentation/devicetree/bindings/display/ssd1307fb.txt
+++ b/Documentation/devicetree/bindings/display/ssd1307fb.txt
@@@ -1,49 -1,0 +1,50 @@@
 +* Solomon SSD1307 Framebuffer Driver
 +
 +Required properties:
 +  - compatible: Should be "solomon,<chip>fb-<bus>". The only supported bus for
-     now is i2c, and the supported chips are ssd1305, ssd1306 and ssd1307.
++    now is i2c, and the supported chips are ssd1305, ssd1306, ssd1307 and
++    ssd1309.
 +  - reg: Should contain address of the controller on the I2C bus. Most likely
 +         0x3c or 0x3d
 +  - pwm: Should contain the pwm to use according to the OF device tree PWM
 +         specification [0]. Only required for the ssd1307.
 +  - reset-gpios: Should contain the GPIO used to reset the OLED display
 +  - solomon,height: Height in pixel of the screen driven by the controller
 +  - solomon,width: Width in pixel of the screen driven by the controller
 +  - solomon,page-offset: Offset of pages (band of 8 pixels) that the screen is
 +    mapped to.
 +
 +Optional properties:
 +  - reset-active-low: Is the reset gpio is active on physical low?
 +  - solomon,segment-no-remap: Display needs normal (non-inverted) data column
 +                              to segment mapping
 +  - solomon,com-seq: Display uses sequential COM pin configuration
 +  - solomon,com-lrremap: Display uses left-right COM pin remap
 +  - solomon,com-invdir: Display uses inverted COM pin scan direction
 +  - solomon,com-offset: Number of the COM pin wired to the first display line
 +  - solomon,prechargep1: Length of deselect period (phase 1) in clock cycles.
 +  - solomon,prechargep2: Length of precharge period (phase 2) in clock cycles.
 +                         This needs to be the higher, the higher the capacitance
 +                         of the OLED's pixels is
 +
 +[0]: Documentation/devicetree/bindings/pwm/pwm.txt
 +
 +Examples:
 +ssd1307: oled@3c {
 +        compatible = "solomon,ssd1307fb-i2c";
 +        reg = <0x3c>;
 +        pwms = <&pwm 4 3000>;
 +        reset-gpios = <&gpio2 7>;
 +        reset-active-low;
 +};
 +
 +ssd1306: oled@3c {
 +        compatible = "solomon,ssd1306fb-i2c";
 +        reg = <0x3c>;
 +        pwms = <&pwm 4 3000>;
 +        reset-gpios = <&gpio2 7>;
 +        reset-active-low;
 +        solomon,com-lrremap;
 +        solomon,com-invdir;
 +        solomon,com-offset = <32>;
 +};