From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C9E62FDC5D for ; Wed, 14 Jan 2026 14:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768401396; cv=none; b=h8JqO7CVtSbLZ/srmIh4ZXSi4UPsoBMwG3JR8qhgvEphbXvliZR8pjNcSYK9pZnbg8F9ZREBHReoun6OyHCid7Eh90wWVendRjs0Udyn4XuW7cazwRuWQZPhDlUh3H5b+N8fDCjT1W1kO6RBIj6MgCkFPlHwNxhM3M1xSPSdKJk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768401396; c=relaxed/simple; bh=IlFPTbTxmVKEnCHnzbYIVZ07NF80mu/pg+8uID8lylc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=Mk2znQ4OBHa3tXIGOBpV8TE1YxGI5Oa0S0ATefxD36kyjzZ+k1kLRjBsOV/tjNDz/KpMNqBgng6+WE3WQeqcc4z3KYLnP5celMXizn1WCzASr+VcnIY/2qZX6Gvgp8T3kJ1WqxDL8P75S2OBAzVRN+m+7z0POvHLI1tQ63TlVQw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=tXjK+QqP; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="tXjK+QqP" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 159AC1A2856; Wed, 14 Jan 2026 14:36:30 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id D36EF6074A; Wed, 14 Jan 2026 14:36:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id A47C610B68240; Wed, 14 Jan 2026 15:36:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1768401388; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=9p/xWhlZwsW5ntb9WQcb6PT46QQrinXc5tTssEQAbTo=; b=tXjK+QqPLzluFnuq6Nc42RQ/ad1Cn375G7P0LQDvjsInQ2XNv9gfNXMUzjWbzuIsOfu732 tCmhl+PIDJ/T/v9RpIjVEhLkweS3kBR10WSJI8GwaVmupPHLrTPHBbG6QcnCd1a/qTCrc9 aPoaghfJmTaM2nkOzM29DtNJtg/o6GyFFJUNKt0MxSryEYwf3Y5yAJGuVRzJIqGEZ49LbX oMqOQBSR3K5fW2bABCBsOQ1TM7QKR18KVS+EWynw280DJ5vjUWKZZRt8pvSL+KJYHMZc/+ QF+Qpm8rK3KfCd4nvgpLvl1VU0rC4nZsEROrZ39MhNQmvM1W++y+h7tabbYrGg== From: Miquel Raynal To: Geert Uytterhoeven Cc: Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Vaishnav Achath , Thomas Petazzoni , =?utf-8?Q?Herv=C3=A9?= Codina , Wolfram Sang , Vignesh Raghavendra , Santhosh Kumar K , Pratyush Yadav , Pascal Eberhard , linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH 07/13] spi: cadence-qspi: Fix probe error path and remove In-Reply-To: (Geert Uytterhoeven's message of "Mon, 22 Dec 2025 13:48:20 +0100") References: <20251219-schneider-6-19-rc1-qspi-v1-0-8ad505173e44@bootlin.com> <20251219-schneider-6-19-rc1-qspi-v1-7-8ad505173e44@bootlin.com> User-Agent: mu4e 1.12.7; emacs 30.2 Date: Wed, 14 Jan 2026 15:36:24 +0100 Message-ID: <87h5sow9av.fsf@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Hi Geert, >> @@ -1995,7 +1995,7 @@ static int cqspi_probe(struct platform_device *pde= v) >> ret =3D cqspi_setup_flash(cqspi); >> if (ret) { >> dev_err(dev, "failed to setup flash parameters %d\n", re= t); >> - goto probe_setup_failed; >> + goto disable_controller; > > FTR, this conflicts with commit 9f0736a4e136a6eb ("spi: cadence-quadspi: > Parse DT for flashes with the rest of the DT parsing") in > spi/for-next. Ugh. I got conflicts on 3 or 4 patches after rebasing on top of spi/for-next. Thanks for the heads up. Miqu=C3=A8l