From patchwork Mon Jan 4 01:21:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 59111 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp5090245lbb; Sun, 3 Jan 2016 17:22:08 -0800 (PST) X-Received: by 10.98.70.193 with SMTP id o62mr117417894pfi.32.1451870528595; Sun, 03 Jan 2016 17:22:08 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sp7si14009563pac.230.2016.01.03.17.22.08; Sun, 03 Jan 2016 17:22:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbcADBWH (ORCPT + 2 others); Sun, 3 Jan 2016 20:22:07 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:36215 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751974AbcADBWG (ORCPT ); Sun, 3 Jan 2016 20:22:06 -0500 Received: by mail-lb0-f181.google.com with SMTP id oh2so151697315lbb.3 for ; Sun, 03 Jan 2016 17:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=n9yr6TJKw0W23nkD/L2LydPN6q7jOw72RX6ktu5dM0o=; b=BcmnF8t8dVsgo11CA0u3vy6lhHzTwGIYsi9VS2t39I7HLTfUrfbBujdneaMDvzoNqR 4XWp7QtVs+Bu5C1pVA25bLpDdnorxIaNkVKyc5hR62Rmzhv7c9IN+7mQGdAymsm5aoWh 0u/FR8oX3fuaTrHYfGIbimroUZ7ZXBO08lIio= 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=n9yr6TJKw0W23nkD/L2LydPN6q7jOw72RX6ktu5dM0o=; b=bR6iivSLsGdfBwM+Ux9T5kNfTCWo7x3uziXk/jt5DOftww+EkebOEpwrrDp3vFODIK 3/7dWbkCffIf+yzFdnYt0aqxqOh8nbSgmrcR1itATbp6wcV9Hca6IEDuXay/M1dWRIvZ 7cMDTiqjD8b8FDt+MHt374JgMuMPd9acjvgPOA21WKbJ6SxXEIgMRvhIEDuxYEnOsuHl 6Dge24VqbKarZfmz1KtUVK/rd1/V8M3KJdtnUBV30wDnXJGmewjiU+EuqPwXhUObjAAC kwOPzh5sF1PahpzqK2GwVagf9hp1weuBWIGWeTuFbsVq4tjbZDpcyjbW1Nl9NxAah3UM nuTA== X-Gm-Message-State: ALoCoQkIz+oGokyAz4QYIqea13v8/sTT/KgYDo0Dy6TOMtg8i5s3vAPlwWYeqD63wt6jfjnzgSPZ1eiFsvhnUD3GqO5ZstfnBw== X-Received: by 10.112.170.167 with SMTP id an7mr29993480lbc.37.1451870523850; Sun, 03 Jan 2016 17:22:03 -0800 (PST) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id j204sm14891396lfd.16.2016.01.03.17.22.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Jan 2016 17:22:03 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, Chris Ball , Ulf Hansson Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij , stable@vger.kernel.org Subject: [PATCH 1/2] mmc: mmci: fix an ages old detection error Date: Mon, 4 Jan 2016 02:21:55 +0100 Message-Id: <1451870515-21049-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 4956e10903fd3459306dd9438c1e714ba3068a2a "ARM: 6244/1: mmci: add variant data and default MCICLOCK support" added variant data for ARM, U300 and Ux500 variants. The Nomadik NHK8815/8820 variant was erroneously labeled as a U300 variant, and when the proper Nomadik variant was later introduced in commit 34fd421349ffc6a4280b71276bf7c6d48f92156f "ARM: 7378/1: mmci: add support for the Nomadik MMCI variant" this was not fixes. Let's say this fixes the latter commit as there was no proper Nomadik support until then. Cc: stable@vger.kernel.org Fixes: 34fd421349ff "ARM: 7378/1: mmci: add support for the Nomadik MMCI variant" Signed-off-by: Linus Walleij --- drivers/mmc/host/mmci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index fb266745f824..acece3299756 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1886,7 +1886,7 @@ static struct amba_id mmci_ids[] = { { .id = 0x00280180, .mask = 0x00ffffff, - .data = &variant_u300, + .data = &variant_nomadik, }, { .id = 0x00480180,