aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/auxdisplay
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2017-03-23 09:25:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-08 11:48:19 -0400
commitc7c3f096eb5e721d8522ba060fa621ea906ef738 (patch)
tree3aa2dcdf4771aee2af27523fdf94332646bbf00a /drivers/auxdisplay
parentdeb0b9b21d374f09de0745e0ed29a67503b44384 (diff)
auxdisplay: hd44780: Fix DT properties to include units of measurement
DT properties specifying physical properties should contain appropriate suffices indicating the units of measurement. Hence amend the HD44780 DT bindings to add "chars" suffixes to the "display-height" and "display-width" properties, and update the driver to parse them. Fixes: dd9502a9e9156dd8 ("dt-bindings: auxdisplay: Add bindings for Hitachi HD44780") Fixes: d47d88361feea2ce ("auxdisplay: Add HD44780 Character LCD support") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/auxdisplay')
-rw-r--r--drivers/auxdisplay/hd44780.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index 1665ac6ef9ff..036eec404289 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -264,10 +264,11 @@ static int hd44780_probe(struct platform_device *pdev)
264 } 264 }
265 265
266 /* Required properties */ 266 /* Required properties */
267 ret = device_property_read_u32(dev, "display-height", &lcd->height); 267 ret = device_property_read_u32(dev, "display-height-chars",
268 &lcd->height);
268 if (ret) 269 if (ret)
269 goto fail; 270 goto fail;
270 ret = device_property_read_u32(dev, "display-width", &lcd->width); 271 ret = device_property_read_u32(dev, "display-width-chars", &lcd->width);
271 if (ret) 272 if (ret)
272 goto fail; 273 goto fail;
273 274