mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Rob Herring <robh@kernel.org>
To: Olliver Schinagl <o.schinagl@ultimaker.com>,
	Olliver Schinagl <oliver@schinagl.nl>,
	Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Ian Campbell <ijc+devicetree@hellion.org.uk>,
	Kumar Gala <galak@codeaurora.org>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: "Tomi Valkeinen" <tomi.valkeinen@ti.com>,
	"Thomas Niederprüm" <niederp@physik.uni-kl.de>,
	"Maxime Ripard" <maxime.ripard@free-electrons.com>,
	"Prabhakar Lad" <prabhakar.csengg@gmail.com>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-fbdev@vger.kernel.org
Subject: Re: [PATCH 2/2] fbdev: ssd1307fb: add ssd1309 support
Date: Tue, 8 Sep 2015 18:02:50 -0500	[thread overview]
Message-ID: <55EF691A.5050801@kernel.org> (raw)
In-Reply-To: <1441739991-4676-3-git-send-email-o.schinagl@ultimaker.com>

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);
> 


  reply	other threads:[~2015-09-09  5:39 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-08 19:19 [PATCH 0/2] SSD1307fb updates Olliver Schinagl
2015-09-08 19:19 ` [PATCH 1/2] fbdev: ssd1307fb: alphabetize headers Olliver Schinagl
2015-09-08 19:19 ` [PATCH 2/2] fbdev: ssd1307fb: add ssd1309 support Olliver Schinagl
2015-09-08 23:02   ` Rob Herring [this message]
2015-09-09 10:19   ` Lad, Prabhakar
2015-09-24 11:11 ` [PATCH 0/2] SSD1307fb updates Tomi Valkeinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=55EF691A.5050801@kernel.org \
    --to=robh@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@free-electrons.com \
    --cc=niederp@physik.uni-kl.de \
    --cc=o.schinagl@ultimaker.com \
    --cc=oliver@schinagl.nl \
    --cc=pawel.moll@arm.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=prabhakar.csengg@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=tomi.valkeinen@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome