From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Date: Wed, 13 Feb 2019 02:35:39 +0000 Subject: [PATCH AUTOSEL 4.19 01/83] backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness Message-Id: <20190213023701.20286-1-sashal@kernel.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-pwm@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Lee Jones , Heiko Stuebner From: Heiko Stuebner [ Upstream commit 61170ee9386888f1e6f7e9cc58e8d9a8c2a3c1dd ] Commit 88ba95bedb79 ("backlight: pwm_bl: Compute brightness of LED linearly to human eye") made the parse-dt function return early when using an auto- generated brightness-table, but didn't take into account that some more settings were handled below the brightness handling, like power-on-delays and also setting the pdata enable-gpio to -EINVAL. This surfaces for example in the case of a backlight without any enable-gpio which then tries to use gpio-0 in error. Fix this by simply moving the trailing settings above the brightness handling. Fixes: 88ba95bedb79 ("backlight: pwm_bl: Compute brightness of LED linearly to human eye") Signed-off-by: Heiko Stuebner Acked-by: Daniel Thompson Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/video/backlight/pwm_bl.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index bdfcc0a71db1..6bde543452f2 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -262,6 +262,16 @@ static int pwm_backlight_parse_dt(struct device *dev, memset(data, 0, sizeof(*data)); + /* + * These values are optional and set as 0 by default, the out values + * are modified only if a valid u32 value can be decoded. + */ + of_property_read_u32(node, "post-pwm-on-delay-ms", + &data->post_pwm_on_delay); + of_property_read_u32(node, "pwm-off-delay-ms", &data->pwm_off_delay); + + data->enable_gpio = -EINVAL; + /* * Determine the number of brightness levels, if this property is not * set a default table of brightness levels will be used. @@ -374,15 +384,6 @@ static int pwm_backlight_parse_dt(struct device *dev, data->max_brightness--; } - /* - * These values are optional and set as 0 by default, the out values - * are modified only if a valid u32 value can be decoded. - */ - of_property_read_u32(node, "post-pwm-on-delay-ms", - &data->post_pwm_on_delay); - of_property_read_u32(node, "pwm-off-delay-ms", &data->pwm_off_delay); - - data->enable_gpio = -EINVAL; return 0; } -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin via dri-devel Subject: [PATCH AUTOSEL 4.19 01/83] backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness tables Date: Tue, 12 Feb 2019 21:35:39 -0500 Message-ID: <20190213023701.20286-1-sashal@kernel.org> Reply-To: Sasha Levin Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-pwm@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Lee Jones , Heiko Stuebner List-Id: linux-pwm@vger.kernel.org RnJvbTogSGVpa28gU3R1ZWJuZXIgPGhlaWtvLnN0dWVibmVyQGJxLmNvbT4KClsgVXBzdHJlYW0g Y29tbWl0IDYxMTcwZWU5Mzg2ODg4ZjFlNmY3ZTljYzU4ZThkOWE4YzJhM2MxZGQgXQoKQ29tbWl0 IDg4YmE5NWJlZGI3OSAoImJhY2tsaWdodDogcHdtX2JsOiBDb21wdXRlIGJyaWdodG5lc3Mgb2Yg TEVEIGxpbmVhcmx5CnRvIGh1bWFuIGV5ZSIpIG1hZGUgdGhlIHBhcnNlLWR0IGZ1bmN0aW9uIHJl dHVybiBlYXJseSB3aGVuIHVzaW5nIGFuIGF1dG8tCmdlbmVyYXRlZCBicmlnaHRuZXNzLXRhYmxl LCBidXQgZGlkbid0IHRha2UgaW50byBhY2NvdW50IHRoYXQgc29tZSBtb3JlCnNldHRpbmdzIHdl cmUgaGFuZGxlZCBiZWxvdyB0aGUgYnJpZ2h0bmVzcyBoYW5kbGluZywgbGlrZSBwb3dlci1vbi1k ZWxheXMKYW5kIGFsc28gc2V0dGluZyB0aGUgcGRhdGEgZW5hYmxlLWdwaW8gdG8gLUVJTlZBTC4K ClRoaXMgc3VyZmFjZXMgZm9yIGV4YW1wbGUgaW4gdGhlIGNhc2Ugb2YgYSBiYWNrbGlnaHQgd2l0 aG91dCBhbnkKZW5hYmxlLWdwaW8gd2hpY2ggdGhlbiB0cmllcyB0byB1c2UgZ3Bpby0wIGluIGVy cm9yLgoKRml4IHRoaXMgYnkgc2ltcGx5IG1vdmluZyB0aGUgdHJhaWxpbmcgc2V0dGluZ3MgYWJv dmUgdGhlIGJyaWdodG5lc3MKaGFuZGxpbmcuCgpGaXhlczogODhiYTk1YmVkYjc5ICgiYmFja2xp Z2h0OiBwd21fYmw6IENvbXB1dGUgYnJpZ2h0bmVzcyBvZiBMRUQgbGluZWFybHkgdG8gaHVtYW4g ZXllIikKU2lnbmVkLW9mZi1ieTogSGVpa28gU3R1ZWJuZXIgPGhlaWtvLnN0dWVibmVyQGJxLmNv bT4KQWNrZWQtYnk6IERhbmllbCBUaG9tcHNvbiA8ZGFuaWVsLnRob21wc29uQGxpbmFyby5vcmc+ ClNpZ25lZC1vZmYtYnk6IExlZSBKb25lcyA8bGVlLmpvbmVzQGxpbmFyby5vcmc+ClNpZ25lZC1v ZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL3ZpZGVv L2JhY2tsaWdodC9wd21fYmwuYyB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxMCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvdmlkZW8vYmFja2xpZ2h0L3B3bV9ibC5jIGIvZHJpdmVycy92aWRlby9iYWNrbGlnaHQvcHdt X2JsLmMKaW5kZXggYmRmY2MwYTcxZGIxLi42YmRlNTQzNDUyZjIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvdmlkZW8vYmFja2xpZ2h0L3B3bV9ibC5jCisrKyBiL2RyaXZlcnMvdmlkZW8vYmFja2xpZ2h0 L3B3bV9ibC5jCkBAIC0yNjIsNiArMjYyLDE2IEBAIHN0YXRpYyBpbnQgcHdtX2JhY2tsaWdodF9w YXJzZV9kdChzdHJ1Y3QgZGV2aWNlICpkZXYsCiAKIAltZW1zZXQoZGF0YSwgMCwgc2l6ZW9mKCpk YXRhKSk7CiAKKwkvKgorCSAqIFRoZXNlIHZhbHVlcyBhcmUgb3B0aW9uYWwgYW5kIHNldCBhcyAw IGJ5IGRlZmF1bHQsIHRoZSBvdXQgdmFsdWVzCisJICogYXJlIG1vZGlmaWVkIG9ubHkgaWYgYSB2 YWxpZCB1MzIgdmFsdWUgY2FuIGJlIGRlY29kZWQuCisJICovCisJb2ZfcHJvcGVydHlfcmVhZF91 MzIobm9kZSwgInBvc3QtcHdtLW9uLWRlbGF5LW1zIiwKKwkJCSAgICAgJmRhdGEtPnBvc3RfcHdt X29uX2RlbGF5KTsKKwlvZl9wcm9wZXJ0eV9yZWFkX3UzMihub2RlLCAicHdtLW9mZi1kZWxheS1t cyIsICZkYXRhLT5wd21fb2ZmX2RlbGF5KTsKKworCWRhdGEtPmVuYWJsZV9ncGlvID0gLUVJTlZB TDsKKwogCS8qCiAJICogRGV0ZXJtaW5lIHRoZSBudW1iZXIgb2YgYnJpZ2h0bmVzcyBsZXZlbHMs IGlmIHRoaXMgcHJvcGVydHkgaXMgbm90CiAJICogc2V0IGEgZGVmYXVsdCB0YWJsZSBvZiBicmln aHRuZXNzIGxldmVscyB3aWxsIGJlIHVzZWQuCkBAIC0zNzQsMTUgKzM4NCw2IEBAIHN0YXRpYyBp bnQgcHdtX2JhY2tsaWdodF9wYXJzZV9kdChzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJCWRhdGEtPm1h eF9icmlnaHRuZXNzLS07CiAJfQogCi0JLyoKLQkgKiBUaGVzZSB2YWx1ZXMgYXJlIG9wdGlvbmFs IGFuZCBzZXQgYXMgMCBieSBkZWZhdWx0LCB0aGUgb3V0IHZhbHVlcwotCSAqIGFyZSBtb2RpZmll ZCBvbmx5IGlmIGEgdmFsaWQgdTMyIHZhbHVlIGNhbiBiZSBkZWNvZGVkLgotCSAqLwotCW9mX3By b3BlcnR5X3JlYWRfdTMyKG5vZGUsICJwb3N0LXB3bS1vbi1kZWxheS1tcyIsCi0JCQkgICAgICZk YXRhLT5wb3N0X3B3bV9vbl9kZWxheSk7Ci0Jb2ZfcHJvcGVydHlfcmVhZF91MzIobm9kZSwgInB3 bS1vZmYtZGVsYXktbXMiLCAmZGF0YS0+cHdtX29mZl9kZWxheSk7Ci0KLQlkYXRhLT5lbmFibGVf Z3BpbyA9IC1FSU5WQUw7CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 660FEC282C4 for ; Wed, 13 Feb 2019 02:57:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30F5820835 for ; Wed, 13 Feb 2019 02:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550026658; bh=MNidZeR5Ks5cy3oJGrroxAl1XJeiMJptQxZmgNyjpNc=; h=From:To:Cc:Subject:Date:List-ID:From; b=s17cDDJtKfVH3o7lKoBtmlbbfnY98Oci5NuAZozKo9JioMxSFw9QAtoTmI94T0coZ bEm82+naMXgbJQKIgphTE/Ra5co531zXHoLC2E7jb6oVW9T4nPMqxoGXMCGkMxjsSp t6+oiJgNpKsguNA2aNTtn1P8BVTox5GKU1mYbCNs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390170AbfBMC5h (ORCPT ); Tue, 12 Feb 2019 21:57:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:40608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732852AbfBMChE (ORCPT ); Tue, 12 Feb 2019 21:37:04 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7857222C7; Wed, 13 Feb 2019 02:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025423; bh=MNidZeR5Ks5cy3oJGrroxAl1XJeiMJptQxZmgNyjpNc=; h=From:To:Cc:Subject:Date:From; b=RQ5ga9zUpobFImZw01T9BYGJZ9oDmNb+FGtTvsVgoducB5Eo2rwXtTJaidr6DTCEU 4BM49DKjUu6Ghm0pvLwubB2IBPu+wAkDjlCOo8+YEBsMeHIiLK+579/A//INZ/QUS5 8VB5ajrxvXRxyP42l5EM+9QZ3rE0Q0jbetFq5iN8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heiko Stuebner , Lee Jones , Sasha Levin , linux-pwm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 01/83] backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness tables Date: Tue, 12 Feb 2019 21:35:39 -0500 Message-Id: <20190213023701.20286-1-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiko Stuebner [ Upstream commit 61170ee9386888f1e6f7e9cc58e8d9a8c2a3c1dd ] Commit 88ba95bedb79 ("backlight: pwm_bl: Compute brightness of LED linearly to human eye") made the parse-dt function return early when using an auto- generated brightness-table, but didn't take into account that some more settings were handled below the brightness handling, like power-on-delays and also setting the pdata enable-gpio to -EINVAL. This surfaces for example in the case of a backlight without any enable-gpio which then tries to use gpio-0 in error. Fix this by simply moving the trailing settings above the brightness handling. Fixes: 88ba95bedb79 ("backlight: pwm_bl: Compute brightness of LED linearly to human eye") Signed-off-by: Heiko Stuebner Acked-by: Daniel Thompson Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/video/backlight/pwm_bl.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index bdfcc0a71db1..6bde543452f2 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -262,6 +262,16 @@ static int pwm_backlight_parse_dt(struct device *dev, memset(data, 0, sizeof(*data)); + /* + * These values are optional and set as 0 by default, the out values + * are modified only if a valid u32 value can be decoded. + */ + of_property_read_u32(node, "post-pwm-on-delay-ms", + &data->post_pwm_on_delay); + of_property_read_u32(node, "pwm-off-delay-ms", &data->pwm_off_delay); + + data->enable_gpio = -EINVAL; + /* * Determine the number of brightness levels, if this property is not * set a default table of brightness levels will be used. @@ -374,15 +384,6 @@ static int pwm_backlight_parse_dt(struct device *dev, data->max_brightness--; } - /* - * These values are optional and set as 0 by default, the out values - * are modified only if a valid u32 value can be decoded. - */ - of_property_read_u32(node, "post-pwm-on-delay-ms", - &data->post_pwm_on_delay); - of_property_read_u32(node, "pwm-off-delay-ms", &data->pwm_off_delay); - - data->enable_gpio = -EINVAL; return 0; } -- 2.19.1