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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 4B0A3C3A5A6 for ; Thu, 19 Sep 2019 22:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E07121907 for ; Thu, 19 Sep 2019 22:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568930842; bh=wGbDoTXpUGNvLUMPRNHZqIwC7xoPQwk3FoWRPShF1UQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YBcUPiyfetZo+3bkNnBJQqCK2ncJH2Pal/ts7LR6FK8x5njZRj7zIYHOYM71faDAR ZZk78XzrRe/Vt1z8Prx+6Kkce/znkJtYGgnu8ycjwUOeVsqBByttn5IXWdp79zN3k1 bqp8600pMok0oKLvsgQc1smlZ3IVoSu8VBljUWpo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405290AbfISWHV (ORCPT ); Thu, 19 Sep 2019 18:07:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:44944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393166AbfISWHT (ORCPT ); Thu, 19 Sep 2019 18:07:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F2486218AF; Thu, 19 Sep 2019 22:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568930838; bh=wGbDoTXpUGNvLUMPRNHZqIwC7xoPQwk3FoWRPShF1UQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hPTs6j6kZExabXzcL7K8FUTkYVo6c+19UFPEwIiP6NmpVikAfZgTeJwf/IeSndoDR +cRbeqthu5IWu7VqDonVQAopM/z4ebxjgfc6Dr6jz+9R1X0RRSPMzhSygyuLA3XlLX Tm5nUN6xsokL5laSsVX8y3kk+SI5bk8rJwcaoaBo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Keerthy , Tony Lindgren , Sasha Levin Subject: [PATCH 5.2 032/124] bus: ti-sysc: Fix using configured sysc mask value Date: Fri, 20 Sep 2019 00:02:00 +0200 Message-Id: <20190919214820.195703927@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214819.198419517@linuxfoundation.org> References: <20190919214819.198419517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 f5176a5d38cd9..56a2399f341e8 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1388,10 +1388,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