Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp871279ybe; Wed, 4 Sep 2019 08:59:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOCQ38SoTlBsmmT9eLYOSI1WRraMP3GgNFwEQM2fux5xYQuUcIzPyRilGBVpnWXsJXTIfT X-Received: by 2002:a63:2a08:: with SMTP id q8mr35338565pgq.415.1567612757730; Wed, 04 Sep 2019 08:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567612757; cv=none; d=google.com; s=arc-20160816; b=QajNLfI/zNFyMh1pXfh+S4fbHb2Vrabrk9lnt/u2dx3XLnn/SSDZW5XNcauNRpj8MO TzthJSFr5ATCUNadt0J13qZ684Qo9wR0QeDaZ9RtsbtlDKSqFvlqw5+lxgZ9viRtt1Gx 3jFHDKZxo2XLF2QdzutotihPkugyvhels7RhnHXOBKB0G7p7XnFUY5C1PnNzEILegc5Y aBijSf/M3/lVh1zWqcbxhSGqE263AVMIN0fanNmGc1M11ghSqWxb/Ts+oTHnSWfjHrOT tCdvFVPW3b8rqr8R5t7eEn1j8/tXKa8b8X9mZ2eHH+V41BwbqtV+y6HaPaGByibpNcp7 pVgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WJEvca1xI7owgH+sxl2EQOKSpKEO5MvbHm7CZKct9DM=; b=uDTVQYOQEsXyqw5IAfjxNzetO1xkBajKH+6Ex2k9eJZ8CkNa3JYnKVM0tOo83sG4UB H0bw2DmOCmsP8q6CBwR0TslNYjTMB3G35+758lLxXZucLtZeumGcHuGmF+Wr7cXf9R3C FM/EOvoGUT57uu9Vfqx+l/ILWQisOEcLLA1s3sHavEly6elKDA7RJI7iy39UbL82wxmc 2JsGTjdWfvPdGIKsmkVe9KbPTpeAzjqwyZvVj9PjhvXJ7nqg23iGpv8VeYKhmxDJixqq eL+6Zw1JbVtlpS6swC4pPol5vvPbK8fbfF0EC37o3Auf1tlXsv6HqsKEzYwGlh3xm1c4 Pv3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=raBn+YaW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u15si17378877pgn.178.2019.09.04.08.59.02; Wed, 04 Sep 2019 08:59:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=raBn+YaW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731650AbfIDP5x (ORCPT + 99 others); Wed, 4 Sep 2019 11:57:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:59508 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731632AbfIDP5w (ORCPT ); Wed, 4 Sep 2019 11:57:52 -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 0DFD02339D; Wed, 4 Sep 2019 15:57:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612671; bh=wGbDoTXpUGNvLUMPRNHZqIwC7xoPQwk3FoWRPShF1UQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=raBn+YaWKW2mGTZrkWRCi7PI9aTf09piTf30zu3wNfLASrdYQH5ipi08PylBdLgpA GhjdVZ4y1bbVpNc7mscGbJJnjuTvsCJdtlkQwXjP8gKipJTueL1gp4etFNi3YBgYlw N/Y8r9Q0NusAWHMazWdEDmkJk9J4T7hERQ+OROp8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tony Lindgren , Keerthy , Sasha Levin Subject: [PATCH AUTOSEL 5.2 06/94] bus: ti-sysc: Fix using configured sysc mask value Date: Wed, 4 Sep 2019 11:56:11 -0400 Message-Id: <20190904155739.2816-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904155739.2816-1-sashal@kernel.org> References: <20190904155739.2816-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: 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