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: 7944661 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E1389F350 for ; Mon, 4 Jan 2016 01:22:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADE342038D for ; Mon, 4 Jan 2016 01:22:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D52CF20384 for ; Mon, 4 Jan 2016 01:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbcADBWH (ORCPT ); Sun, 3 Jan 2016 20:22:07 -0500 Received: from mail-lb0-f170.google.com ([209.85.217.170]:33087 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894AbcADBWG (ORCPT ); Sun, 3 Jan 2016 20:22:06 -0500 Received: by mail-lb0-f170.google.com with SMTP id sv6so144405910lbb.0 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=jToQwOHEg6hZeKcZEf5b+8abF+RfXDo3cbm4HaR6es0tCx3Z+MFlNgcFUNKvxAPR9t L4oRxaFV7Gz+H+eTsHZr0v1L/D8H1EznmFr5zy1yGDCHkMPk/YDIM8qHXU4ZK19ZadNE 6OOp3hWeVOQMxflK5Zgv4tb+hy8dk7a0KB2aOrdeHP71uIi+oG3hPfnNdA2Pt3+Ph8Pw 51STL7J1ZZu6cZ0ANORpPZRHT1ffB1C+kaV1QIlFOGCyFIq5FHGIWCJL4ZeS2Z2Qdi9L ODm0UvBeDm+dMlmH5EBocuQGfZRIfbHfH06p2rlzoUovD4udjrWZ0CxvrJ1e7p8nk4XN RILQ== X-Gm-Message-State: ALoCoQn4oI4uPHWLJYquPc/cFl8LB7Wp3KQjDxJxmjyjkVKYQdt2347U6tSGCUXZkA+Nv2t1c48kql7q5OdvgLCF9+Y51AZxmw== 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: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 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(-) 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,