From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8C23B442118; Tue, 21 Jul 2026 22:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672749; cv=none; b=bWoQCMWPKGrz5gs/0XKEzkSOw1AGAdMVdtWKT+Ja8pZnbBge0bnYuqq4E14NRqoTORath3kDO0+5nK0Y2PWzMCN/1Zt22rk9q1MyEf6PBOgoysGYof/wwFQ1KRBEBobAXWvJ0MKvNZFjHCwXAIBQkjO0CtIM0Kowmb0eUjGSOZM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672749; c=relaxed/simple; bh=ODBTKFWpGZzhUtOmDW12vIC14FDX+fxNQiFIyy1KGyY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TXueU06EPSerBj+V0vwpaykT3aCNKUNvfKE0SMW/fgMBQLzJ62mTZKAyKap1elN7jP5LnZgKKEbAwAABZ0h/CiVYW6nNh6R0nURqnWNKb0h16Z74xI0ZsITryQ2iV7Pt+uj1ttIdMZpPt+pciAoRrxd1zqoHHZ0s+Wv8tDWtzao= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IHfpI7tj; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IHfpI7tj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBF991F000E9; Tue, 21 Jul 2026 22:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784672748; bh=r0AKwWCXAw9yGeMfqxm3QuHEIrC+A9fWGD7lg+hD8y8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IHfpI7tjO/jcTZkoCCa3HOWAiae3QCCkorluEpNl8iJa8MOfxQSnniGxgEVbBOGUo L2u9MXKk1cfjPENkqvcjnfk4fdvwreFRPN78SbfYTpVB6yHqhuv/6g8rNFhiXC93rK W52SECwNaPEezncvzkbKSaxSXWmgdMgnxEwCJa+U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pengpeng Hou , Miquel Raynal Subject: [PATCH 5.15 725/843] mtd: mchp23k256: use SPI match data for chip caps Date: Tue, 21 Jul 2026 17:26:00 +0200 Message-ID: <20260721152422.350746710@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou commit d322e40f4edf92bf0ca329e5aa4ae1c0316feb38 upstream. The driver stores chip capacity information in both the OF match table and the SPI id table. Probe currently uses of_device_get_match_data(), so a non-OF SPI modalias match falls back to mchp23k256_caps even when the SPI id table selected a different part. Use spi_get_device_match_data() so SPI id-table driver_data is consumed when OF match data is absent. This keeps the existing default fallback while avoiding the wrong MTD geometry for id-table-only matches. Fixes: 4379075a870b ("mtd: mchp23k256: Add support for mchp23lcv1024") Cc: stable@vger.kernel.org Signed-off-by: Pengpeng Hou Signed-off-by: Miquel Raynal Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/devices/mchp23k256.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mtd/devices/mchp23k256.c +++ b/drivers/mtd/devices/mchp23k256.c @@ -188,7 +188,7 @@ static int mchp23k256_probe(struct spi_d data = dev_get_platdata(&spi->dev); - flash->caps = of_device_get_match_data(&spi->dev); + flash->caps = spi_get_device_match_data(spi); if (!flash->caps) flash->caps = &mchp23k256_caps;