From patchwork Mon Oct 21 09:13:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis Carikli X-Patchwork-Id: 285142 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F132D2C0127 for ; Mon, 21 Oct 2013 20:14:34 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYBZD-00049x-0q; Mon, 21 Oct 2013 09:14:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYBZA-0005qE-IR; Mon, 21 Oct 2013 09:14:24 +0000 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VYBZ6-0005p9-Fs for linux-arm-kernel@lists.infradead.org; Mon, 21 Oct 2013 09:14:22 +0000 Received: from denis-N73SV.local.eukrea.com (unknown [88.170.243.169]) by smtp2-g21.free.fr (Postfix) with ESMTP id 61D454B016B; Mon, 21 Oct 2013 11:13:46 +0200 (CEST) From: Denis Carikli To: Jean-Christophe Plagniol-Villard Subject: [PATCHv4] video: backlight: gpio-backlight: Add DT support. Date: Mon, 21 Oct 2013 11:13:33 +0200 Message-Id: <1382346813-8449-1-git-send-email-denis@eukrea.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20131019104555.GI18477@ns203013.ovh.net> References: <20131019104555.GI18477@ns203013.ovh.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131021_051421_369278_BEA902F3 X-CRM114-Status: GOOD ( 20.84 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Mark Rutland , devicetree@vger.kernel.org, Ian Campbell , =?UTF-8?q?Eric=20B=C3=A9nard?= , Pawel Moll , Stephen Warren , Jingoo Han , Rob Herring , Denis Carikli , Richard Purdie , Laurent Pinchart , Sascha Hauer , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Cc: Richard Purdie Cc: Jingoo Han Cc: Laurent Pinchart Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Stephen Warren Cc: Ian Campbell Cc: devicetree@vger.kernel.org Cc: Sascha Hauer Cc: linux-arm-kernel@lists.infradead.org Cc: Lothar Waßmann Cc: Jean-Christophe Plagniol-Villard Cc: Eric Bénard Signed-off-by: Denis Carikli --- ChangeLog v3->v4: - The default-brightness property is now optional, it defaults to 1 if not set. - def_value int becomes an u32. - gbl->def_value was set to pdata->def_value in pdata mode to avoid an extra check. --- .../bindings/video/backlight/gpio-backlight.txt | 20 ++++++ drivers/video/backlight/gpio_backlight.c | 69 ++++++++++++++++++-- 2 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt diff --git a/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt b/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt new file mode 100644 index 0000000..3474d4a --- /dev/null +++ b/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt @@ -0,0 +1,20 @@ +gpio-backlight bindings + +Required properties: + - compatible: "gpio-backlight" + - gpios: describes the gpio that is used for enabling/disabling the backlight + (see GPIO binding[0] for more details). + +Optional properties: + - default-brightness-level: the default brightness level (can be 0(off) or + 1(on) since GPIOs only support theses levels). + +[0]: Documentation/devicetree/bindings/gpio/gpio.txt + +Example: + + backlight { + compatible = "gpio-backlight"; + gpios = <&gpio3 4 0>; + default-brightness-level = <0>; + }; diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c index 81fb127..248124d 100644 --- a/drivers/video/backlight/gpio_backlight.c +++ b/drivers/video/backlight/gpio_backlight.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include #include @@ -23,6 +25,7 @@ struct gpio_backlight { int gpio; int active; + u32 def_value; }; static int gpio_backlight_update_status(struct backlight_device *bl) @@ -60,6 +63,41 @@ static const struct backlight_ops gpio_backlight_ops = { .check_fb = gpio_backlight_check_fb, }; +static int gpio_backlight_probe_dt(struct platform_device *pdev, + struct gpio_backlight *gbl) +{ + struct device_node *np = pdev->dev.of_node; + enum of_gpio_flags gpio_flags; + int ret; + + gbl->fbdev = NULL; + gbl->gpio = of_get_gpio_flags(np, 0, &gpio_flags); + + gbl->active = (gpio_flags & OF_GPIO_ACTIVE_LOW) ? 0 : 1; + + if (gbl->gpio == -EPROBE_DEFER) { + return ERR_PTR(-EPROBE_DEFER); + } else if (gbl->gpio < 0) { + dev_err(&pdev->dev, "Error: gpios is a required parameter.\n"); + return gbl->gpio; + } + + ret = of_property_read_u32(np, "default-brightness-level", + &gbl->def_value); + if (ret < 0) { + /* The property is optional. */ + gbl->def_value = 1; + } + + if (gbl->def_value > 1) { + dev_warn(&pdev->dev, + "Warning: Invalid default-brightness-level value. Its value can be either 0(off) or 1(on).\n"); + gbl->def_value = 1; + } + + return 0; +} + static int gpio_backlight_probe(struct platform_device *pdev) { struct gpio_backlight_platform_data *pdata = @@ -67,10 +105,12 @@ static int gpio_backlight_probe(struct platform_device *pdev) struct backlight_properties props; struct backlight_device *bl; struct gpio_backlight *gbl; + struct device_node *np = pdev->dev.of_node; int ret; - if (!pdata) { - dev_err(&pdev->dev, "failed to find platform data\n"); + if (!pdata && !np) { + dev_err(&pdev->dev, + "failed to find platform data or device tree node.\n"); return -ENODEV; } @@ -79,14 +119,22 @@ static int gpio_backlight_probe(struct platform_device *pdev) return -ENOMEM; gbl->dev = &pdev->dev; - gbl->fbdev = pdata->fbdev; - gbl->gpio = pdata->gpio; - gbl->active = pdata->active_low ? 0 : 1; + + if (np) { + ret = gpio_backlight_probe_dt(pdev, gbl); + if (ret) + return ret; + } else { + gbl->fbdev = pdata->fbdev; + gbl->gpio = pdata->gpio; + gbl->active = pdata->active_low ? 0 : 1; + gbl->def_value = pdata->def_value; + } ret = devm_gpio_request_one(gbl->dev, gbl->gpio, GPIOF_DIR_OUT | (gbl->active ? GPIOF_INIT_LOW : GPIOF_INIT_HIGH), - pdata->name); + pdata ? pdata->name : "backlight"); if (ret < 0) { dev_err(&pdev->dev, "unable to request GPIO\n"); return ret; @@ -103,17 +151,24 @@ static int gpio_backlight_probe(struct platform_device *pdev) return PTR_ERR(bl); } - bl->props.brightness = pdata->def_value; + bl->props.brightness = gbl->def_value; + backlight_update_status(bl); platform_set_drvdata(pdev, bl); return 0; } +static struct of_device_id gpio_backlight_of_match[] = { + { .compatible = "gpio-backlight" }, + { /* sentinel */ } +}; + static struct platform_driver gpio_backlight_driver = { .driver = { .name = "gpio-backlight", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(gpio_backlight_of_match), }, .probe = gpio_backlight_probe, };