| Message ID | 214ae9ca86009148f233be71a3606917f3150dcd.1484303628.git.jsarha@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 13, 2017 at 12:35:48PM +0200, Jyri Sarha wrote: > From: Tomi Valkeinen <tomi.valkeinen@ti.com> > > SSD1306 needs VBAT when it is wired in charge pump configuration. This > patch adds support to the driver to enable VBAT regulator at init time. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Reviewed-by: Roger Quadros <rogerq@ti.com> > Signed-off-by: Jyri Sarha <jsarha@ti.com> > --- > .../devicetree/bindings/display/ssd1307fb.txt | 1 + > drivers/video/fbdev/ssd1307fb.c | 20 +++++++++++++++++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/display/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt > index 6617df6..209d931 100644 > --- a/Documentation/devicetree/bindings/display/ssd1307fb.txt > +++ b/Documentation/devicetree/bindings/display/ssd1307fb.txt > @@ -16,6 +16,7 @@ Required properties: > Optional properties: > - reset-gpios: The GPIO used to reset the OLED display, if available. See > Documentation/devicetree/bindings/gpio/gpio.txt for details. > + - vbat-supply: The supply for VBAT According to the datasheet, SSD1307 has 2 supplies: Vdd and Vcc I don't see any mention of a charge pump, so that must be an external component. > - solomon,segment-no-remap: Display needs normal (non-inverted) data column > to segment mapping > - solomon,com-seq: Display uses sequential COM pin configuration -- 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 19/01/17 00:33, Rob Herring wrote: > On Fri, Jan 13, 2017 at 12:35:48PM +0200, Jyri Sarha wrote: >> From: Tomi Valkeinen <tomi.valkeinen@ti.com> >> >> SSD1306 needs VBAT when it is wired in charge pump configuration. This >> patch adds support to the driver to enable VBAT regulator at init time. >> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> >> Reviewed-by: Roger Quadros <rogerq@ti.com> >> Signed-off-by: Jyri Sarha <jsarha@ti.com> >> --- >> .../devicetree/bindings/display/ssd1307fb.txt | 1 + >> drivers/video/fbdev/ssd1307fb.c | 20 +++++++++++++++++++- >> 2 files changed, 20 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/display/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt >> index 6617df6..209d931 100644 >> --- a/Documentation/devicetree/bindings/display/ssd1307fb.txt >> +++ b/Documentation/devicetree/bindings/display/ssd1307fb.txt >> @@ -16,6 +16,7 @@ Required properties: >> Optional properties: >> - reset-gpios: The GPIO used to reset the OLED display, if available. See >> Documentation/devicetree/bindings/gpio/gpio.txt for details. >> + - vbat-supply: The supply for VBAT > > According to the datasheet, SSD1307 has 2 supplies: Vdd and Vcc > > I don't see any mention of a charge pump, so that must be an external > component. VBAT is for SSD1306. Perhaps the DT doc should mention it. Tomi
On Thu, Jan 19, 2017 at 7:15 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > On 19/01/17 00:33, Rob Herring wrote: >> On Fri, Jan 13, 2017 at 12:35:48PM +0200, Jyri Sarha wrote: >>> From: Tomi Valkeinen <tomi.valkeinen@ti.com> >>> >>> SSD1306 needs VBAT when it is wired in charge pump configuration. This >>> patch adds support to the driver to enable VBAT regulator at init time. >>> >>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> >>> Reviewed-by: Roger Quadros <rogerq@ti.com> >>> Signed-off-by: Jyri Sarha <jsarha@ti.com> >>> --- >>> .../devicetree/bindings/display/ssd1307fb.txt | 1 + >>> drivers/video/fbdev/ssd1307fb.c | 20 +++++++++++++++++++- >>> 2 files changed, 20 insertions(+), 1 deletion(-) >>> >>> diff --git a/Documentation/devicetree/bindings/display/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt >>> index 6617df6..209d931 100644 >>> --- a/Documentation/devicetree/bindings/display/ssd1307fb.txt >>> +++ b/Documentation/devicetree/bindings/display/ssd1307fb.txt >>> @@ -16,6 +16,7 @@ Required properties: >>> Optional properties: >>> - reset-gpios: The GPIO used to reset the OLED display, if available. See >>> Documentation/devicetree/bindings/gpio/gpio.txt for details. >>> + - vbat-supply: The supply for VBAT >> >> According to the datasheet, SSD1307 has 2 supplies: Vdd and Vcc >> >> I don't see any mention of a charge pump, so that must be an external >> component. > > VBAT is for SSD1306. Perhaps the DT doc should mention it. Datasheet says VBAT is reserved, connect to Vdd. I would just describe Vdd and Vcc in that case. Rob -- 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 19/01/17 17:03, Rob Herring wrote: >>> According to the datasheet, SSD1307 has 2 supplies: Vdd and Vcc >>> >>> I don't see any mention of a charge pump, so that must be an external >>> component. >> >> VBAT is for SSD1306. Perhaps the DT doc should mention it. > > Datasheet says VBAT is reserved, connect to Vdd. I would just describe > Vdd and Vcc in that case. I'm no HW guy, but as far as I understand, you can wire it up two ways. One has VBAT connected to VDD. The other one has VBAT connected to external supply. See "Figure 1 : Application Example of SSD1306Z with charge bump". Tomi
On Thu, Jan 19, 2017 at 9:08 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > On 19/01/17 17:03, Rob Herring wrote: > >>>> According to the datasheet, SSD1307 has 2 supplies: Vdd and Vcc >>>> >>>> I don't see any mention of a charge pump, so that must be an external >>>> component. >>> >>> VBAT is for SSD1306. Perhaps the DT doc should mention it. >> >> Datasheet says VBAT is reserved, connect to Vdd. I would just describe >> Vdd and Vcc in that case. > > I'm no HW guy, but as far as I understand, you can wire it up two ways. > One has VBAT connected to VDD. The other one has VBAT connected to > external supply. See "Figure 1 : Application Example of SSD1306Z with > charge bump". I should have kept reading... So either Vdd and Vbat supplies or Vdd and Vcc supplies are valid and the former only applies to 1306. Rob -- 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/display/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt index 6617df6..209d931 100644 --- a/Documentation/devicetree/bindings/display/ssd1307fb.txt +++ b/Documentation/devicetree/bindings/display/ssd1307fb.txt @@ -16,6 +16,7 @@ Required properties: Optional properties: - reset-gpios: The GPIO used to reset the OLED display, if available. See Documentation/devicetree/bindings/gpio/gpio.txt for details. + - vbat-supply: The supply for VBAT - solomon,segment-no-remap: Display needs normal (non-inverted) data column to segment mapping - solomon,com-seq: Display uses sequential COM pin configuration diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c index 89372af..616a6a3 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c @@ -16,6 +16,7 @@ #include <linux/of_gpio.h> #include <linux/pwm.h> #include <linux/uaccess.h> +#include <linux/regulator/consumer.h> #define SSD1307FB_DATA 0x40 #define SSD1307FB_COMMAND 0x80 @@ -74,6 +75,7 @@ struct ssd1307fb_par { struct pwm_device *pwm; u32 pwm_period; struct gpio_desc *reset; + struct regulator *vbat_reg; u32 seg_remap; u32 vcomh; u32 width; @@ -574,6 +576,14 @@ static int ssd1307fb_probe(struct i2c_client *client, goto fb_alloc_error; } + par->vbat_reg = devm_regulator_get_optional(&client->dev, "vbat"); + if (IS_ERR(par->vbat_reg)) { + dev_err(&client->dev, "failed to get VBAT regulator: %ld\n", + PTR_ERR(par->vbat_reg)); + ret = PTR_ERR(par->vbat_reg); + goto fb_alloc_error; + } + if (of_property_read_u32(node, "solomon,width", &par->width)) par->width = 96; @@ -658,9 +668,15 @@ static int ssd1307fb_probe(struct i2c_client *client, udelay(4); } + ret = regulator_enable(par->vbat_reg); + if (ret) { + dev_err(&client->dev, "failed to enable VBAT: %d\n", ret); + goto reset_oled_error; + } + ret = ssd1307fb_init(par); if (ret) - goto reset_oled_error; + goto regulator_enable_error; ret = register_framebuffer(info); if (ret) { @@ -693,6 +709,8 @@ static int ssd1307fb_probe(struct i2c_client *client, pwm_disable(par->pwm); pwm_put(par->pwm); }; +regulator_enable_error: + regulator_disable(par->vbat_reg); reset_oled_error: fb_deferred_io_cleanup(info); fb_alloc_error: