Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp119614pxx; Tue, 27 Oct 2020 23:32:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyxWCWBBw6sIhEqdBQrm+Jlj36qR3T71jwFaGUk9XCo2rLA6Cq9krXpB1NJpif4sw4i4Yr X-Received: by 2002:a17:906:a119:: with SMTP id t25mr6507670ejy.67.1603866764593; Tue, 27 Oct 2020 23:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603866764; cv=none; d=google.com; s=arc-20160816; b=U/XeWSdGDeiLgL+1IkPxxsNfoyz9Ben2LD6ZD9Uw5wOe+UuM2jwjQP6JOrpn7I0gyv iQm5Y1f4PQ77upUUDC2+tCGeUF+qH18SR8qbrSAK5kw467/NS5I8uZFLfbkvgsjchnjJ 014cAsE9hMDBxPu9zhjwFC4W9pQWnzzf7Fa3d5GJH4qyKP3XCdgBiq/lYL25Gt898diN pJ+OpNIxwVPd9WWXqTiLcoZr6DYIC/sX4EtFuDIKX/9Yg9vRDXHNKCJrCaOeSlZLuMWu /9I0NOG1i16bk7tdVDzrCAbBAsv9XDBbXHoPS0i/LaSoVwYjjNHFi73ur6qIgvCyETKN nf0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=8sscpqmqXQ17nbD18WJ4de0ngnPb0XbpJgEXY9ZTytA=; b=ae/80tKGtPY+9c0rPYz+rdUxf2i/opkHoqEfvOq5RnDOIwEeJHBaeUWsWZjY0Xi3uj romogxXQRdoTfprNXabNauEZ3Jg4Up/OykSC3FuooXAPnPqeK1rKFJcO43KJUTbrAjST HwckAJQjCt3JofCGLWgz0ZXhoBBR5TK40i6ZxjFiUyPthcj2jYof5lab7mFjrgvCMv71 3hFbGqukIeUv2xU/5UXdoSOkaOvNzdqJ4eJUsp0Qc/aeUUGGloZbvjGut5k9iBibR8fu XscXsH+5GSfPYO2n/8T85sC+rDyZ+jyJsPRWIzPLvI54eCex7FCekC5VH6I625rhHfg7 MlAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t1si2761263ejb.712.2020.10.27.23.32.22; Tue, 27 Oct 2020 23:32:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2896598AbgJ0J6d (ORCPT + 99 others); Tue, 27 Oct 2020 05:58:33 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:43651 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410420AbgJ0J5b (ORCPT ); Tue, 27 Oct 2020 05:57:31 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kXLjK-0004UM-D8; Tue, 27 Oct 2020 10:57:26 +0100 Received: from ore by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1kXLjJ-0004s7-Ql; Tue, 27 Oct 2020 10:57:25 +0100 From: Oleksij Rempel To: Dmitry Torokhov , Alexandru Ardelean , Mark Brown Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-spi@vger.kernel.org, David Jander Subject: [PATCH v2 2/2] Input: ads7846: do not overwrite spi->mode flags set by spi framework Date: Tue, 27 Oct 2020 10:57:24 +0100 Message-Id: <20201027095724.18654-3-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027095724.18654-1-o.rempel@pengutronix.de> References: <20201027095724.18654-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not overwrite spi->mode flags set by spi framework, otherwise the chip select polarity will get lost. Signed-off-by: Oleksij Rempel --- drivers/input/touchscreen/ads7846.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 8fd7fc39c4fd..f2dc2c8ab5ec 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -1288,7 +1288,8 @@ static int ads7846_probe(struct spi_device *spi) * may not. So we stick to very-portable 8 bit words, both RX and TX. */ spi->bits_per_word = 8; - spi->mode = SPI_MODE_0; + spi->mode &= ~SPI_MODE_X_MASK; + spi->mode |= SPI_MODE_0; err = spi_setup(spi); if (err < 0) return err; -- 2.28.0