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: 4726601 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17763C0338 for ; Fri, 15 Aug 2014 09:12:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53ACF20158 for ; Fri, 15 Aug 2014 09:12:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CBB920127 for ; Fri, 15 Aug 2014 09:12:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754070AbaHOJMp (ORCPT ); Fri, 15 Aug 2014 05:12:45 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:64255 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbaHOJMp (ORCPT ); Fri, 15 Aug 2014 05:12:45 -0400 Received: by mail-we0-f173.google.com with SMTP id q58so2105524wes.4 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=Peb7kbYL31puYa6El+hTMDfk42v6ywll0SEM6AJ370YTcl9g5V1kGmTgFe9ViVRZVr 7NuZPJgZo9rA7t7Kfj5SL225IYFsoU+GJL0gXQoiOPEProWFGU0GzEAGTwS8yV02LHco J8UTWfr2FELUo+UKzFIK7mQqAQOZRedZwGLiKwOte0zwipcXlLRokQarlaf/3AE/j1fg x92YAeKvbInhBg5cl5FNVOQu35aEOlS7AGLq5BhCPpUIaHFLRLwAObOjr7rKiojJVwQd ZWqPtzwfzMBDvkEtkbzNOQhOckfYyHLO2yBhSmi7xEQFo556EjfNF24s/qsj0Ugj3HDa zlEg== X-Gm-Message-State: ALoCoQmb2yPqFrdZtlXFtlDpwAGdPH1/LdMphzqExeUIrwuq3q8mK6G3/ByxfvbCUwv1wpz5Yc6o 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 Cc: peter.griffin@linaro.org, patches@linaro.org, lee.jones@linaro.org 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 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 = {