From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F16062848BA for ; Sat, 11 Apr 2026 18:04:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775930663; cv=none; b=AKfOC1PgUIwm9rwZrg1qG3Ncuq0JiOTjURe+QAf46+HmGw8zhBmOSnoXE6C7yxJ2A9ypsb/dGxgIDzA1vMAmqoiTmEoitaHIrdccmSvFsOXcbwyYkryihE/Il0rQ/oTl7Lh8dD8NKH338Pfk5UOG+mYXdfH0rkAKOUBuIsEkF+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775930663; c=relaxed/simple; bh=9aKPv9W66PoQjS1drLRMSLNL5N+3u0CUbWozsmMaGuY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qIVw606t2Z+4cSwNO+vQUTfusH+lD/4VsYE3BUn7W4Ikn9dJLOn9zmph0DEowsL82umJ3veVA8QoOXqE039F/tIFM2wbBe+KtYvjZGpKVuDHFN0Wu2kjiIlPGU8Eto0W1M3He+pTP+M8TCp+bq5zTCGIpqtp+Nq1o9hQ4+KxENY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qwa3jElP; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qwa3jElP" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b9825ba7e8dso447290266b.3 for ; Sat, 11 Apr 2026 11:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775930660; x=1776535460; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tUEOsnfxXuZLqwLt1IFYC5XjnP8ak+RNfelGDS4bV6g=; b=qwa3jElP+iCMlndVflfYj152Tniir5hai7buLbBMRxoXa+Qn0CAbxYbkDwRQtthxOa 07CsFti7gkzWoIGciMIAdUQRH8l4CMuvb8Zpc+DON5jTCQnlHS4X69ez4h39FD5g6yd/ hsvPV/CjwSb4SfwX8yeUqjWQYK/G3OjPfngzBy0NVpyw+JrJ4PIiIvUDeulcLDbVQRVE KWmagHOxKfddfm/KpoxhKztksiiJfuJyKctEANyK7O69JrAUIO922iYDqwWMo2Te2Z0K UFItX8O4qAYmIQBKDoMF9dso+amNGQgFHYlqNXrCojUfnyhe2Ay+TildKEkli47rBmAl Yhow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775930660; x=1776535460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tUEOsnfxXuZLqwLt1IFYC5XjnP8ak+RNfelGDS4bV6g=; b=BBiobRpFVVGOnrDL4P73JVegL249isALxCBp5PgzvDKKP53Ny3FKh+Y/pEqBjQRgwK 4YH3+Ad6Ns0uctfQw0YAjQke0Ek78VmPcyIrvOlFXdjAh2wCWZGYj2jyepPeavyPEcdk HpXKDvKFibEmVw8MPNXATyLhPsveFcUR+JzWCRJ1+JKNzRUetjtHyBZ5yeZXZhiez/nE nkgLzzitYvf8Dfp7NithgtQa/Q904jG5R4ocnl6yjxe7kyrNqSzjehoP0NBqpirR6WPV LsyYIiwzXPIwHhsbK3W2zuHWN5RAFtyDSq3papK/2N2RAB6d2voHQbsry46DsFKzkeXt oI4A== X-Forwarded-Encrypted: i=1; AJvYcCXW+vFk9SwOi8VPeHVxCCrTElENk/vp61cAO9UPNG0OsdSb3v8dnlxUn/TXfywOKYff67r9UWIyAJIt3CI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+YjigzWNf8pS5HRG25163mqkKwf8q+zF9OOuXV4XTXq8jZvUX ShKVIs/phx30dux8KfNc7JFZhKNyvH/g6OGLTrBekhh6gQctmMhxgAvq X-Gm-Gg: AeBDievQFEdDAqXUMh++/ME3fVPqEzowni25XsorTCm8MJOUqQYnKzkkXnZ11o1kcUz NyEZSqhtG3qE+aYwNjLwOExrz1i7jE9IfI9qZ4vT0qN7/EWvlV8Bd40URCmU0RkLrbn59NRVqF4 EitcdfNRxK6sZn3RCXg7wiQ8OQq0FeMAsOX3ey/kut23h003PIWmWpa4sGPu/dWNw+T28BgpQq8 nWxX4tP70nF9q/o5thsJtUiHmO2rfZuqOTG7eIysq57kQfMUklmaH/gCCTRK20NAg5ZGE+yc9fL XvCc109u8arwl9dhlWvDF5ax83kTm8VhhanyCxmSq9nYWmEZXtZmCxckD2mBVr7eNPc9+iz9hyf 2y6K7daFwpE12EG98J7hxwvAiWhUX2OftvXi2mOHX2ETNFO8Ofh+x96qbcsEzuHBPq39JuVcSrb vTTIhcvY/GLH2y5PsSF5qr62vdMAPLflvp X-Received: by 2002:a17:906:4790:b0:b98:7e30:8129 with SMTP id a640c23a62f3a-b9d7296657fmr412690366b.32.1775930659993; Sat, 11 Apr 2026 11:04:19 -0700 (PDT) Received: from khalil-hp.home ([62.250.67.33]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9d6e5c56d3sm186160666b.32.2026.04.11.11.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 11:04:19 -0700 (PDT) From: Khalil X-Google-Original-From: Khalil To: broonie@kernel.org, hdegoede@kernel.org, ilpo.jarvinen@linux.intel.com Cc: rf@opensource.cirrus.com, linux-spi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Khalil Subject: [PATCH 1/3] spi: Preserve preset cs_gpiod in __spi_add_device() Date: Sat, 11 Apr 2026 20:04:12 +0200 Message-ID: <20260411180414.481427-2-khalil@rentman.nl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260411180414.481427-1-khalil@rentman.nl> References: <20260215135524.1171065-2-khalil@rentman.nl> <20260411180414.481427-1-khalil@rentman.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Khalil __spi_add_device() unconditionally overwrites spi->cs_gpiod[] from ctlr->cs_gpiods[cs], even if the caller has already set a GPIO descriptor on the device. This prevents drivers like serial-multi-instantiate from pre-configuring a GPIO chip select acquired from ACPI before adding the device. Skip the overwrite when the device already has a cs_gpiod set for the given index, allowing callers to preset GPIO chip selects that aren't described in the controller's cs-gpios property. This is useful on platforms where the ACPI _DSD cs-gpios property on the SPI controller is incomplete, but the peripheral's ACPI node does contain the correct GpioIo resource for its chip select. Suggested-by: Richard Fitzgerald Signed-off-by: Khalil --- drivers/spi/spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1148,7 +1148,8 @@ static int __spi_add_device(struct spi_device *spi) if (ctlr->cs_gpiods) { for (idx = 0; idx < SPI_CS_CNT_MAX; idx++) { - if (is_valid_cs(cs)) + cs = spi_get_chipselect(spi, idx); + if (is_valid_cs(cs) && !spi_get_csgpiod(spi, idx)) spi_set_csgpiod(spi, idx, ctlr->cs_gpiods[cs]); } } -- 2.43.0