diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:00:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 10:00:09 -0800 |
| commit | 3b13866869b8407497d20a916450594e117583e6 (patch) | |
| tree | 3a64c1efa8da178aaa534cd314e9825a35ec118e /Documentation | |
| parent | 3e82806b97398d542a5e03bd94861f79ce10ecee (diff) | |
| parent | 08bfb453f0458dd353f37737d80475ff13868d9c (diff) | |
| download | linux-3b13866869b8407497d20a916450594e117583e6.tar.bz2 | |
Merge tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/display/ssd1307fb.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt index d1be78db63f5..eb31ed47a283 100644 --- a/Documentation/devicetree/bindings/display/ssd1307fb.txt +++ b/Documentation/devicetree/bindings/display/ssd1307fb.txt @@ -2,7 +2,8 @@ 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 |