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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 A4D71C4741F for ; Mon, 9 Nov 2020 13:23:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F24720663 for ; Mon, 9 Nov 2020 13:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928224; bh=qEnNBZdx0/2ucAEMWvQZqnsi9phuE+GSp96wOAyyyqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DakCvz561I/v9LgLqP2cJsrcBh+KqmcyuXcot+7Pbw4RgKBL9gET2o27ClMjN9us5 p6QSWykExdWWoCqcfFP6OACMUpVnPkGdJcpd+k0yV9CoKaa8JrM1wSdMViYYcbCI19 EOIznKroq9d8FNC1+tzCJPPLcJK+vYr2heuGxAuU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387624AbgKINUT (ORCPT ); Mon, 9 Nov 2020 08:20:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:47844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387898AbgKINUQ (ORCPT ); Mon, 9 Nov 2020 08:20:16 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 8015020867; Mon, 9 Nov 2020 13:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604928016; bh=qEnNBZdx0/2ucAEMWvQZqnsi9phuE+GSp96wOAyyyqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AgXq77nuGgn+ZfbUL1FiOz4cf1gSmdG8N5gBsLG4PTYsrfia8UZp6tKCtKR4O/d2n b6x3LmjLKJONWQU8P+ChiAsxXDj7E3wzpCQywOKLuO/F0L18Oc4KHdAtx0HVMPtsap vfVeCChzwIiV/pfQjb4ge6aITVgoIwIGl4sPN1HI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= , Mark Brown Subject: [PATCH 5.9 068/133] spi: bcm2835: fix gpio cs level inversion Date: Mon, 9 Nov 2020 13:55:30 +0100 Message-Id: <20201109125034.006058294@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125030.706496283@linuxfoundation.org> References: <20201109125030.706496283@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Hundebøll commit 5e31ba0c0543a04483b53151eb5b7413efece94c upstream. The work on improving gpio chip-select in spi core, and the following fixes, has caused the bcm2835 spi driver to use wrong levels. Fix this by simply removing level handling in the bcm2835 driver, and let the core do its work. Fixes: 3e5ec1db8bfe ("spi: Fix SPI_CS_HIGH setting when using native and GPIO CS") Cc: Signed-off-by: Martin Hundebøll Link: https://lore.kernel.org/r/20201014090230.2706810-1-martin@geanix.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-bcm2835.c | 12 ------------ 1 file changed, 12 deletions(-) --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -1259,18 +1259,6 @@ static int bcm2835_spi_setup(struct spi_ if (!chip) return 0; - /* - * Retrieve the corresponding GPIO line used for CS. - * The inversion semantics will be handled by the GPIO core - * code, so we pass GPIOD_OUT_LOW for "unasserted" and - * the correct flag for inversion semantics. The SPI_CS_HIGH - * on spi->mode cannot be checked for polarity in this case - * as the flag use_gpio_descriptors enforces SPI_CS_HIGH. - */ - if (of_property_read_bool(spi->dev.of_node, "spi-cs-high")) - lflags = GPIO_ACTIVE_HIGH; - else - lflags = GPIO_ACTIVE_LOW; spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select, DRV_NAME, lflags,