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,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 9F832C2D0CE for ; Sun, 29 Dec 2019 17:51:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B14520748 for ; Sun, 29 Dec 2019 17:51:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641914; bh=SO14ytmvWlkBdIUPvWJBq0qkqjZ/rvey0FkPu8dhX5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YztwEFDEwM1MJOoQltgM6bhH8ZqBJoq4Z0YYgjk2rYffcJ4Axxfu6g3BgmXsEiDa+ WKKCL4aTGu3EU/In9C0/01geYuUjwW3GGc7VBvabiMX7Qdd/kHtftoEVtRyDOlbJvv Dmlm+LVz1ZdEMKV2QKMWF6//9TnxyUUNWLtq4eEo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732169AbfL2Rvw (ORCPT ); Sun, 29 Dec 2019 12:51:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:37594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732168AbfL2Rvv (ORCPT ); Sun, 29 Dec 2019 12:51:51 -0500 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 0D9DA208C4; Sun, 29 Dec 2019 17:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641911; bh=SO14ytmvWlkBdIUPvWJBq0qkqjZ/rvey0FkPu8dhX5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sx0wE0r/Yov1jlp5YCETT0yyBYAL/pmgfmp/E7oBEKV7Ya6a+HKKSdoIHnl911HKn m7c2nkTCNZgYIo5b7rv6azCQaalqkWG0tc8fWFS0aHpoWYapOy8VhYMSP7s6IVP+Yy APirWrlHMLHUEwGNijnYuu4qvKrppz6DL/u67CGU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thor Thayer , Mark Brown , Sasha Levin Subject: [PATCH 5.4 236/434] spi: dw: Fix Designware SPI loopback Date: Sun, 29 Dec 2019 18:24:49 +0100 Message-Id: <20191229172717.557909063@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thor Thayer [ Upstream commit 1403cfa69d310781f9548951c97725c67ffcf613 ] The SPI_LOOP is set in spi->mode but not propagated to the register. A previous patch removed the bit during a cleanup. Fixes: e1bc204894ea ("spi: dw: fix potential variable assignment error") Signed-off-by: Thor Thayer Link: https://lore.kernel.org/r/1572985330-5525-1-git-send-email-thor.thayer@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-dw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 9a49e073e8b7..076652d3d051 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -308,7 +308,8 @@ static int dw_spi_transfer_one(struct spi_controller *master, cr0 = (transfer->bits_per_word - 1) | (chip->type << SPI_FRF_OFFSET) | ((((spi->mode & SPI_CPOL) ? 1 : 0) << SPI_SCOL_OFFSET) | - (((spi->mode & SPI_CPHA) ? 1 : 0) << SPI_SCPH_OFFSET)) + (((spi->mode & SPI_CPHA) ? 1 : 0) << SPI_SCPH_OFFSET) | + (((spi->mode & SPI_LOOP) ? 1 : 0) << SPI_SRL_OFFSET)) | (chip->tmode << SPI_TMOD_OFFSET); /* -- 2.20.1