aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorThomas Niederprüm <niederp@physik.uni-kl.de>2015-03-31 14:27:12 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-05-27 05:54:19 -0400
commit5f2d36b3cf629ae1d70ee8476599ff53f0d1d1f1 (patch)
tree87ccc88c0079a09f6a23eeed6370e1d714fab6b8 /drivers/video
parent2040085143c524cde071b3553698915cb3978ea8 (diff)
fbdev: ssd1307fb: Add support for SSD1305
This patch adds support for the SSD1305 OLED controller. Signed-off-by: Thomas Niederprüm <niederp@physik.uni-kl.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/ssd1307fb.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 8667c7769d8a..f685d244fa2a 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -424,6 +424,12 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
424 return 0; 424 return 0;
425} 425}
426 426
427static struct ssd1307fb_deviceinfo ssd1307fb_ssd1305_deviceinfo = {
428 .default_vcomh = 0x34,
429 .default_dclk_div = 1,
430 .default_dclk_frq = 7,
431};
432
427static struct ssd1307fb_deviceinfo ssd1307fb_ssd1306_deviceinfo = { 433static struct ssd1307fb_deviceinfo ssd1307fb_ssd1306_deviceinfo = {
428 .default_vcomh = 0x20, 434 .default_vcomh = 0x20,
429 .default_dclk_div = 1, 435 .default_dclk_div = 1,
@@ -440,6 +446,10 @@ static struct ssd1307fb_deviceinfo ssd1307fb_ssd1307_deviceinfo = {
440 446
441static const struct of_device_id ssd1307fb_of_match[] = { 447static const struct of_device_id ssd1307fb_of_match[] = {
442 { 448 {
449 .compatible = "solomon,ssd1305fb-i2c",
450 .data = (void *)&ssd1307fb_ssd1305_deviceinfo,
451 },
452 {
443 .compatible = "solomon,ssd1306fb-i2c", 453 .compatible = "solomon,ssd1306fb-i2c",
444 .data = (void *)&ssd1307fb_ssd1306_deviceinfo, 454 .data = (void *)&ssd1307fb_ssd1306_deviceinfo,
445 }, 455 },
@@ -612,6 +622,7 @@ static int ssd1307fb_remove(struct i2c_client *client)
612} 622}
613 623
614static const struct i2c_device_id ssd1307fb_i2c_id[] = { 624static const struct i2c_device_id ssd1307fb_i2c_id[] = {
625 { "ssd1305fb", 0 },
615 { "ssd1306fb", 0 }, 626 { "ssd1306fb", 0 },
616 { "ssd1307fb", 0 }, 627 { "ssd1307fb", 0 },
617 { } 628 { }