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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 759DCC3A5A8 for ; Wed, 4 Sep 2019 16:12:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E8F02053B for ; Wed, 4 Sep 2019 16:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613549; bh=G/uRdqFkHn7/5EBZ7Enh1oxM91e/mho9qyCW+FhVgXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JTbWLKfw6X8A37ItKltqeBxa0W5ftDJWT3XzaJm5LD8oK/Rs1TBA5Unphahm0LFZt Mm3HM34tAfNiSyuG6Cwnna72aMYJIBfeX912FYsyhYsmC6TeFByqgZjHUH6omrMjt7 0RBeQ5AvVA6TayfFr00aWOwJIlFqRiZAPaFIdVZk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732592AbfIDQAO (ORCPT ); Wed, 4 Sep 2019 12:00:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:34954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732587AbfIDQAN (ORCPT ); Wed, 4 Sep 2019 12:00:13 -0400 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 080C02087E; Wed, 4 Sep 2019 16:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612812; bh=G/uRdqFkHn7/5EBZ7Enh1oxM91e/mho9qyCW+FhVgXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i4shAZe+lXASoqK6UYBM+OiBlgAnnflVC6q+mIlPNwoI4u1U00WaO4ZBwKlJGhTne tQGWvdbGn9PV5N4qG3OsKsWqUnHH0CqiSltdet0orqBxL8QKA2A6xiUlK/N3JZ4/As gosMZpr4Qu4niBEq60RyeTOWX49Bkkorb25CNBMg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tony Lindgren , Keerthy , Sasha Levin Subject: [PATCH AUTOSEL 4.19 05/52] bus: ti-sysc: Fix using configured sysc mask value Date: Wed, 4 Sep 2019 11:59:17 -0400 Message-Id: <20190904160004.3671-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160004.3671-1-sashal@kernel.org> References: <20190904160004.3671-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Lindgren [ Upstream commit e212abd452a4af3174fcd469d46656f83e135a19 ] We have cases where there are no softreset bits like with am335x lcdc. In that case ti,sysc-mask = <0> needs to be handled properly. Tested-by: Keerthy Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- drivers/bus/ti-sysc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index e4fe954e63a9b..4ca006e2137f7 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1022,10 +1022,7 @@ static int sysc_init_sysc_mask(struct sysc *ddata) if (error) return 0; - if (val) - ddata->cfg.sysc_val = val & ddata->cap->sysc_mask; - else - ddata->cfg.sysc_val = ddata->cap->sysc_mask; + ddata->cfg.sysc_val = val & ddata->cap->sysc_mask; return 0; } -- 2.20.1