| Message ID | 1441739991-4676-3-git-send-email-o.schinagl@ultimaker.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/08/2015 02:19 PM, Olliver Schinagl wrote: > The ssd1307fb driver supports a lot of chips from the ssd130xfb series. > This patch adds the ssd1309 chip, a 128x64 OLED driver chip. It is very > similar to the other chips and only has some definitions added to > support it. > > Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> Acked-by: Rob Herring <robh@kernel.org> > --- > Documentation/devicetree/bindings/video/ssd1307fb.txt | 3 ++- > drivers/video/fbdev/ssd1307fb.c | 11 +++++++++++ > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/video/ssd1307fb.txt b/Documentation/devicetree/bindings/video/ssd1307fb.txt > index d1be78d..eb31ed4 100644 > --- a/Documentation/devicetree/bindings/video/ssd1307fb.txt > +++ b/Documentation/devicetree/bindings/video/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 > diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c > index 339615c..8fc7960 100644 > --- a/drivers/video/fbdev/ssd1307fb.c > +++ b/drivers/video/fbdev/ssd1307fb.c > @@ -495,6 +495,12 @@ static struct ssd1307fb_deviceinfo ssd1307fb_ssd1307_deviceinfo = { > .need_pwm = 1, > }; > > +static struct ssd1307fb_deviceinfo ssd1307fb_ssd1309_deviceinfo = { > + .default_vcomh = 0x34, > + .default_dclk_div = 1, > + .default_dclk_frq = 10, > +}; > + > static const struct of_device_id ssd1307fb_of_match[] = { > { > .compatible = "solomon,ssd1305fb-i2c", > @@ -508,6 +514,10 @@ static const struct of_device_id ssd1307fb_of_match[] = { > .compatible = "solomon,ssd1307fb-i2c", > .data = (void *)&ssd1307fb_ssd1307_deviceinfo, > }, > + { > + .compatible = "solomon,ssd1309fb-i2c", > + .data = (void *)&ssd1307fb_ssd1309_deviceinfo, > + }, > {}, > }; > MODULE_DEVICE_TABLE(of, ssd1307fb_of_match); > @@ -708,6 +718,7 @@ static const struct i2c_device_id ssd1307fb_i2c_id[] = { > { "ssd1305fb", 0 }, > { "ssd1306fb", 0 }, > { "ssd1307fb", 0 }, > + { "ssd1309fb", 0 }, > { } > }; > MODULE_DEVICE_TABLE(i2c, ssd1307fb_i2c_id); > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 8, 2015 at 8:19 PM, Olliver Schinagl <o.schinagl@ultimaker.com> wrote: > The ssd1307fb driver supports a lot of chips from the ssd130xfb series. > This patch adds the ssd1309 chip, a 128x64 OLED driver chip. It is very > similar to the other chips and only has some definitions added to > support it. > > Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Cheers, --Prabhakar Lad -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/video/ssd1307fb.txt b/Documentation/devicetree/bindings/video/ssd1307fb.txt index d1be78d..eb31ed4 100644 --- a/Documentation/devicetree/bindings/video/ssd1307fb.txt +++ b/Documentation/devicetree/bindings/video/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 diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 339615c..8fc7960 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -495,6 +495,12 @@ static struct ssd1307fb_deviceinfo ssd1307fb_ssd1307_deviceinfo = { .need_pwm = 1, }; +static struct ssd1307fb_deviceinfo ssd1307fb_ssd1309_deviceinfo = { + .default_vcomh = 0x34, + .default_dclk_div = 1, + .default_dclk_frq = 10, +}; + static const struct of_device_id ssd1307fb_of_match[] = { { .compatible = "solomon,ssd1305fb-i2c", @@ -508,6 +514,10 @@ static const struct of_device_id ssd1307fb_of_match[] = { .compatible = "solomon,ssd1307fb-i2c", .data = (void *)&ssd1307fb_ssd1307_deviceinfo, }, + { + .compatible = "solomon,ssd1309fb-i2c", + .data = (void *)&ssd1307fb_ssd1309_deviceinfo, + }, {}, }; MODULE_DEVICE_TABLE(of, ssd1307fb_of_match); @@ -708,6 +718,7 @@ static const struct i2c_device_id ssd1307fb_i2c_id[] = { { "ssd1305fb", 0 }, { "ssd1306fb", 0 }, { "ssd1307fb", 0 }, + { "ssd1309fb", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, ssd1307fb_i2c_id);
The ssd1307fb driver supports a lot of chips from the ssd130xfb series. This patch adds the ssd1309 chip, a 128x64 OLED driver chip. It is very similar to the other chips and only has some definitions added to support it. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> --- Documentation/devicetree/bindings/video/ssd1307fb.txt | 3 ++- drivers/video/fbdev/ssd1307fb.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)