Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp2170361ybm; Thu, 23 May 2019 12:31:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcUkIfblBJmfkjgq4lQBuJxb40KyM99ChYl6F/297w8MG34p+FMVVhMLSQVPhSbNZaYauh X-Received: by 2002:aa7:9e51:: with SMTP id z17mr106608678pfq.212.1558639866695; Thu, 23 May 2019 12:31:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558639866; cv=none; d=google.com; s=arc-20160816; b=bN2UiVfNTutye/jL3aWvC0re+uU733fmf3HANVTsS9sVf9OQJ76ngD8L9dLKH91nyG 2WIgGta3XEq2jG2XArn9skPVp8/6rF4xjY1WmhqSHo1u+k039QklPZCw2wXGeNAAppX3 QjiIuXed6CdZUhr2nrLOc5SaZw9HKsko1a6YfLs4oDJt47TMffsySiFcgElxoGbGFptf Si8nhPfWCchxBMbXL2XtY/w2YyTnky3bqh+W/r0NCsFXOPTfpfysTfxDyVfyZVYNzChW +90DjYIgNKisjR5cCBo0lhL8miuPSTlsJcRAvv6YkN1y2GJaokS/a9XmJeft9KijUMwR 8e3A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AzJGwQisLgPJcmWIoXV2V45WvZQCEGA+8fLiMpsYZtI=; b=REXerfUCoN1fepcX99HG9J7Isu7kAkKt3wb5ez+sbC5DD4vGgvLj96H4AysPa6/OIB jP1ZH/IMXkfS0IQbtpSkWGi0GqJdfgMp8j/htpsUZEB0l4hzxUzGp+Ihltk15Yaw3EBR V/NCrUDvrYYwnyRK1PJtHF5f4+dAArkDu5Cv0LUmha/KSWvIjCY4jzBADDAxnGtnQh9K chF4ds4+p89YdCn20slk27xvyO63WhkTlFyJAbONTvtzpwIJ1KG0EEG0exNi7xa0xB+A CTpYjT+cCac4So/qPJ9orOWu/Hy1AV6M09VFCjBfys7dxwPR9AsImaKdSIE/js8V/zmo Zg2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CUyFIApX; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k89si325845pje.43.2019.05.23.12.30.51; Thu, 23 May 2019 12:31:06 -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=CUyFIApX; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391784AbfEWT23 (ORCPT + 99 others); Thu, 23 May 2019 15:28:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:41032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403755AbfEWT2Z (ORCPT ); Thu, 23 May 2019 15:28:25 -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 948E92184E; Thu, 23 May 2019 19:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639705; bh=5UCojV3+1l9pwyt7QHyOjN9adHUxg59F+wBeuWKbW/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUyFIApXntihnnoE5dkDscZEcnqxu0WGl1nR1KmBcfA7jVARXC99I1TD0Mf2iTYIV OCjQSzXwFddFp1qX99LIXHl1q1Quxa0VbkRVRPbtYvLgyalOV84p5UIZIeQ0CX0WGT QGz2RPK/gAteepBYSueeSYN05ZbE9E1iE1dcRRDI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Kishon Vijay Abraham I Subject: [PATCH 5.1 048/122] phy: ti-pipe3: fix missing bit-wise or operator when assigning val Date: Thu, 23 May 2019 21:06:10 +0200 Message-Id: <20190523181711.050745052@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181705.091418060@linuxfoundation.org> References: <20190523181705.091418060@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: Colin Ian King commit e6577cb5103b7ca7c0204c0c86ef4af8aa6288f6 upstream. There seems to be a missing bit-wise or operator when setting val, fix this by adding it in. Fixes: 2796ceb0c18a ("phy: ti-pipe3: Update pcie phy settings") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Colin Ian King Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Greg Kroah-Hartman --- drivers/phy/ti/phy-ti-pipe3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/phy/ti/phy-ti-pipe3.c +++ b/drivers/phy/ti/phy-ti-pipe3.c @@ -303,7 +303,7 @@ static void ti_pipe3_calibrate(struct ti val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY); val &= ~(INTERFACE_MASK | LOSD_MASK | MEM_PLLDIV); - val = (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT); + val |= (0x1 << INTERFACE_SHIFT | 0xA << LOSD_SHIFT); ti_pipe3_writel(phy->phy_rx, PCIEPHYRX_ANA_PROGRAMMABILITY, val); val = ti_pipe3_readl(phy->phy_rx, PCIEPHYRX_DIGITAL_MODES);