Message ID | 20170804213555.6024-2-icenowy@aosc.io (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59349602B8 for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 4 Aug 2017 21:37:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4815B28994 for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 4 Aug 2017 21:37:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A8E3289E4; Fri, 4 Aug 2017 21:37:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B6B6A28994 for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 4 Aug 2017 21:37:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=vPlDuCIdOO4weyhivErwJsbOHB1mlxx4R8WNj8WmXLc=; b=ewwqsNUdm7glNk4CMAfKxUSrHi tqS+es06TfviElyfTA1HtWf88Q5+2PQ7hxYkKXYxDkudWWeqr9SKxhl1KgTHOfqTN27eZaMpnhDEu 21NN9RE6XU8N1bs8RwSJlM4OTuRk3gXZZMzB6Xam2MBfsbNyEtL+6LjYJauqC5XZzWDVp/U5BHXTz bErhV+GjPSzPc8ZXzapslXk2gJcRrlhYCjgCOIS5kWzZVfTlH+yZp28cscqLNykxeeu4ZJfCVzVOK OCqCwO03s9sKFEnVhRYeBI2aJtAzFnhNacyVb8lyjO9fY5EY4UE5kFkQyPCGyYLbD7+EKqCMHOdgX O7XmEuOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ddkHB-0000K3-E9; Fri, 04 Aug 2017 21:36:57 +0000 Received: from nov-007-i458.relay.mailchannels.net ([46.232.183.12]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ddkGv-0008Vf-AC for linux-arm-kernel@lists.infradead.org; Fri, 04 Aug 2017 21:36:44 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 22C45208DA4; Fri, 4 Aug 2017 21:36:15 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.131.135]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id 5D5792090C8; Fri, 4 Aug 2017 21:36:14 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [172.20.108.37]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.9.10); Fri, 04 Aug 2017 21:36:15 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Suffer-Abortive: 01074b5423b52c3f_1501882574964_2629921391 X-MC-Loop-Signature: 1501882574964:4233455104 X-MC-Ingress-Time: 1501882574964 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 020D642134; Fri, 4 Aug 2017 21:36:09 +0000 (UTC) From: Icenowy Zheng <icenowy@aosc.io> To: Ulf Hansson <ulf.hansson@linaro.org>, Maxime Ripard <maxime.ripard@free-electrons.com>, Chen-Yu Tsai <wens@csie.org> Subject: [PATCH 2/2] mmc: sunxi: fix new timings mode on A64 EMMC (MMC2) controller Date: Sat, 5 Aug 2017 05:35:55 +0800 Message-Id: <20170804213555.6024-2-icenowy@aosc.io> In-Reply-To: <20170804213555.6024-1-icenowy@aosc.io> References: <20170804213555.6024-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170804_143642_261771_40357A4E X-CRM114-Status: UNSURE ( 8.55 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: linux-sunxi@googlegroups.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng <icenowy@aosc.io> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index 59aba93beffb..4ad643e37014 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1142,6 +1142,7 @@ static const struct sunxi_mmc_cfg sun50i_a64_emmc_cfg = { .idma_des_size_bits = 13, .clk_delays = NULL, .can_calibrate = true, + .needs_new_timings = true, }; static const struct of_device_id sunxi_mmc_of_match[] = {
The configuration struct of A64 EMMC(MMC2) compatible used to have the needs_new_timings variable missing, which lead to NULL pointer dereference now when trying to set up the old timings mode, as the old timings mode doesn't exist at all on A64. Fix this issue by adding this variable and setting it to true in the configuration struct. Fixes: 4fb3ce07eafa ("mmc: sunxi: Add EMMC (MMC2) controller compatible") Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- drivers/mmc/host/sunxi-mmc.c | 1 + 1 file changed, 1 insertion(+)