From e5dc88d6c29bd78b0dc9d7d69ec589f79517ebea Mon Sep 17 00:00:00 2001 From: Aniket Randive Date: Thu, 18 Feb 2021 11:10:11 +0530 Subject: [PATCH] spi: spi-msm-geni: Set the mode1 for SPI slave Spi slave will support only mode1, so set the CPHA parameter for spi slave. wrongly added condition by merge conflict, hence removing it. Change-Id: I37f9b159b01c9253de1a9e8b46e41160fa940660 Signed-off-by: Aniket Randive --- drivers/spi/spi-msm-geni.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-msm-geni.c b/drivers/spi/spi-msm-geni.c index b5886af2dbe9..a41194f863eb 100644 --- a/drivers/spi/spi-msm-geni.c +++ b/drivers/spi/spi-msm-geni.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ @@ -359,10 +359,8 @@ static int setup_fifo_params(struct spi_device *spi_slv, if (mode & SPI_CPOL) cpol |= CPOL; - if (!spi->slave) { - if (mode & SPI_CPHA) - cpha |= CPHA; - } + if (mode & SPI_CPHA) + cpha |= CPHA; /* SPI slave supports only mode 1, log unsuppoted mode and exit */ if (spi->slave && !(cpol == 0 && cpha == 1)) {