From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A0B9E2210DA; Thu, 12 Dec 2024 16:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021691; cv=none; b=g12EOjNAprOWomCzqaY5RdFqfMhI8+wXusBPLdTtnuq0ILow7Z49XT2mqr5XtmlIWNhDqHFsSjvfQoxW4lVcgOAB+0i2dJMWHAaIpe8HqTBskwiy+eOBoFHHAffbOG+XSEnGgprp7p/tTyrZgO8eR2sKkzE9ogAnGZnDqVo/t80= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021691; c=relaxed/simple; bh=5uLKOlKm/6IR2dPvNaLT7Pfr85hRXTXxf20AyazI4dM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/j9wy0ZZ1o80zp2UVAbIxmmlCE523QGklY/1Il2jhsT68sUBXYxQJXnwrrAk95GU72w1KXE1EDJryqRgA35CoW3uv0S/PzDSoHCM57KWdsSJsu0akJFZkaYeVCjqCKobk3/3AV7CqvlmUObDN78sW2UG5peNgpbveArXm/AyjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=d6Mm7Rho; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="d6Mm7Rho" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CE32C4CECE; Thu, 12 Dec 2024 16:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734021691; bh=5uLKOlKm/6IR2dPvNaLT7Pfr85hRXTXxf20AyazI4dM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d6Mm7Rho8JztOSmrtsRzqCjpNura+ZxpsDwxCYX/4acoyYUJ0WcKnihdVJgVTzXva p2tGjU3x6+2QBfuMANRb1t8R0pg1HY08fq1GJdg4KGFcVF+88dmpCbipVfHU8xXn95 d8DoPtbklJjGhtv04FLHW8SHXazS56Lj7m3U9sCU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andre Przywara , Parthiban Nallathambi , Chen-Yu Tsai , Ulf Hansson , Sasha Levin Subject: [PATCH 5.15 036/565] mmc: sunxi-mmc: Fix A100 compatible description Date: Thu, 12 Dec 2024 15:53:51 +0100 Message-ID: <20241212144312.881666886@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Andre Przywara [ Upstream commit 85b580afc2c215394e08974bf033de9face94955 ] It turns out that the Allwinner A100/A133 SoC only supports 8K DMA blocks (13 bits wide), for both the SD/SDIO and eMMC instances. And while this alone would make a trivial fix, the H616 falls back to the A100 compatible string, so we have to now match the H616 compatible string explicitly against the description advertising 64K DMA blocks. As the A100 is now compatible with the D1 description, let the A100 compatible string point to that block instead, and introduce an explicit match against the H616 string, pointing to the old description. Also remove the redundant setting of clk_delays to NULL on the way. Fixes: 3536b82e5853 ("mmc: sunxi: add support for A100 mmc controller") Cc: stable@vger.kernel.org Signed-off-by: Andre Przywara Tested-by: Parthiban Nallathambi Reviewed-by: Chen-Yu Tsai Message-ID: <20241107014240.24669-1-andre.przywara@arm.com> Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sunxi-mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index cd81f9a79169e..1b6e41d55b622 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1191,10 +1191,9 @@ static const struct sunxi_mmc_cfg sun50i_a64_emmc_cfg = { .needs_new_timings = true, }; -static const struct sunxi_mmc_cfg sun50i_a100_cfg = { +static const struct sunxi_mmc_cfg sun50i_h616_cfg = { .idma_des_size_bits = 16, .idma_des_shift = 2, - .clk_delays = NULL, .can_calibrate = true, .mask_data0 = true, .needs_new_timings = true, @@ -1217,8 +1216,9 @@ static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible = "allwinner,sun20i-d1-mmc", .data = &sun20i_d1_cfg }, { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, - { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, + { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun20i_d1_cfg }, { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, + { .compatible = "allwinner,sun50i-h616-mmc", .data = &sun50i_h616_cfg }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match); -- 2.43.0