From patchwork Fri Aug 15 09:12:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 4726621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FB139F38C for ; Fri, 15 Aug 2014 09:17:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94A3D2017D for ; Fri, 15 Aug 2014 09:17:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA9A22016C for ; Fri, 15 Aug 2014 09:17:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XIDZS-0007OE-Cu; Fri, 15 Aug 2014 09:13:14 +0000 Received: from mail-we0-f175.google.com ([74.125.82.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XIDZN-0007EJ-Vq for linux-arm-kernel@lists.infradead.org; Fri, 15 Aug 2014 09:13:10 +0000 Received: by mail-we0-f175.google.com with SMTP id t60so2126518wes.34 for ; Fri, 15 Aug 2014 02:12:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rBBbhQRt0BhFDfGIJ3HaE5fkOrFy4od3Gaum1/aROuU=; b=WaSgZP0YzqR6ygQyDPb24U4rZjsBMDRAY6cJMxvMmFh41yqMNyZVGKyjEwsZYyed3t CAviNGd8AVQGUywhiAIOc1YoeR1ye4/Bl5bePr1WA9DVyHurq+gSGqUr5F38O09Gbjv+ 37rn4aLOURbOtalnYtAIUHSF+a1MAKeYZaFvj+lbZ5bXWfPbSlIRvg8nP4vYXL3goTpw Ef2LEkB8AX/x0ZLZPi3196/2BsPlrpgn/EAbE+mWPA1Xl51Xspf/S5CGEc0M3TGAhMo1 2kARKBdA5tez4ommUYZuHRHpmkD03NpQp8BzM8wYCE/YBKr4QzRbHzxdSq5q2MmzRORJ LOmQ== X-Gm-Message-State: ALoCoQlg+Y/NtNnv+wWy/IDJXkTaMY7lfiUgaN/Y9bBeNFd0hpyM6RdyJvsLziEWbgAI1/7zcJ+j X-Received: by 10.180.90.11 with SMTP id bs11mr47616320wib.47.1408093963633; Fri, 15 Aug 2014 02:12:43 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id ko8sm17484501wjc.11.2014.08.15.02.12.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Aug 2014 02:12:42 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, chris@printf.net, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, zhangfei.gao@marvell.com, prakity@marvell.com, rmk+kernel@arm.linux.org.uk Subject: [PATCH] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently Date: Fri, 15 Aug 2014 10:12:38 +0100 Message-Id: <1408093958-26058-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140815_021310_180254_7CD8936D X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -0.7 (/) Cc: peter.griffin@linaro.org, lee.jones@linaro.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP .set_uhs_signaling field is currently initialised twice once to the arch specific callback pxav3_set_uhs_signaling, and also to the generic sdhci_set_uhs_signaling callback. This means that uhs is currently broken for this platform currently, as pxav3 has some special constriants which means it can't use the generic callback. This happened in commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function") commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")' Signed-off-by: Peter Griffin --- drivers/mmc/host/sdhci-pxav3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 6f842fb..3f350ea 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -229,7 +229,6 @@ static const struct sdhci_ops pxav3_sdhci_ops = { .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = sdhci_set_bus_width, .reset = pxav3_reset, - .set_uhs_signaling = sdhci_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_pxav3_pdata = {