Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756095AbcCBAzK (ORCPT ); Tue, 1 Mar 2016 19:55:10 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:48096 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458AbcCAX41 (ORCPT ); Tue, 1 Mar 2016 18:56:27 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=qACfz2xvsKg0h2e+5C8iu5nZTzzqOhiE0/BZtNO4L1YxPchIWXW3lkxkd+Q+e9C5rbpovKqs5XfU hhgimgs3+p/DIRkNAiwElqxHus0FFLVXVV9Ec2Cj4VpMrGmswfLf3V3tBfip13mZPxdnnbhLQceY qKTFB02afICgOCssRcQ=; From: Greg Kroah-Hartman Subject: [PATCH 4.4 139/342] mmc: mmci: fix an ages old detection error X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Linus Walleij , Ulf Hansson Message-Id: <20160301234532.465543656@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.d1582f3bbd4c45eb8a71b6e1e7a241f1 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:54:29 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1272 Lines: 36 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij commit 0bcb7efdff63564e80fe84dd36a9fbdfbf6697a4 upstream. commit 4956e10903fd ("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 34fd421349ff ("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. Fixes: 34fd421349ff ("ARM: 7378/1: mmci: add support for the Nomadik...") Signed-off-by: Linus Walleij Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/mmci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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,