From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3339499-1523479543-2-17143269708997582543 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523479542; b=fMpTIk06Fes8N0E9BK+DxVtuTuMam+HAj2w/X6yr23FOtA6x1b h5KtA7h1cqLF3E+3d2YMTRtMucaDvOc13z9m0lgGPCSDX0ehD67FNqd4MDqnMBl8 TX3asrlcGVVlGcAAqDBF9PRiABnu4VMz7sj+rfXOFhZ7cOyHoB0g6YeG5NbaCzGM z99uFJuFo2gmAGhWLeKEiQ8KEdZzDInksOf4+sP8GdZL1m3NVGCvrKWl2R45//Oi aKLlKkIKfayVwT4dOObXtu1c2vvahA9LsREm7jSK6oHnr7STsMqWQ7BgRxPQcZO+ 7qxRuiF7ilAWFsXgWATdAOSthCN7kwlgvUCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523479542; bh=CDoVQzb2diYswqU+j6tXmikOCh29yg UOhFm8urEw5TI=; b=wB+KW/yrmU8VTp1h9/S1efOQ7LktZZxOfBP33zwkaKVn14 n6SsY3E+tv/obLQt55tjhDFelFWlu+wom98llOssbOckVXnaLc8lf/GMA7AWyyD1 klYVjZr6qjL1IGubXb4Zizek3pA49lEvnxlfCEwsibEdi7u/vBOFxLFN9YJXPsx5 fIhQ50K5NPMQ4HKRK1+6Bvwi6Y6kC6CpIpl9ySxMeD6ttdWWCdpKyLjUZH53MRP3 utp3EMMu3gRVVz87SR95kIUFnpuZw2VOQmqt3HXlpvvMdDtFGBR8cjOsgND4PCkl /T5kUjLthV+wGVkZqgMdm8i4eUF6qXcEyJaTg6XQ== ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfHmtfjRhxInJjI5DP2HuviNpvgL8gcnCV8nORCf+YGy2D1wp3/zXC+UlOT1hgXmgOz5aEiy3G+vVHScGKtHHtTPwsvmydFMXibmD290I7YFiw2RJX60h pb0IdRnBHk2QA0c1hv94v8pTeCrCYXc7BlHN4fqQShFeKe0xNm4OZ9Z9FlSIiZ+VPtxeUrK0pCaQ8gaHN8DixKL8OhfIzOlsNr8KDee2vfc+BVTGYAUtP7n+ X-CM-Analysis: v=2.3 cv=FKU1Odgs c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=VwQbUJbxAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=WBZvL9eSjnWsstDp_dIA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047AbeDKUp0 (ORCPT ); Wed, 11 Apr 2018 16:45:26 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59120 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755816AbeDKSrB (ORCPT ); Wed, 11 Apr 2018 14:47:01 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rasmus Villemoes , Shawn Guo , Sasha Levin Subject: [PATCH 4.4 081/190] ARM: dts: ls1021a: add "fsl,ls1021a-esdhc" compatible string to esdhc node Date: Wed, 11 Apr 2018 20:35:27 +0200 Message-Id: <20180411183555.304361791@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rasmus Villemoes [ Upstream commit d5c7b4d5ac2237a6da7ced3adfe6b8bf769f8cc6 ] Commit a22950c888e3 (mmc: sdhci-of-esdhc: add quirk SDHCI_QUIRK_BROKEN_TIMEOUT_VAL for ls1021a) added logic to the driver to enable the broken timeout val quirk for ls1021a, but did not add the corresponding compatible string to the device tree, so it didn't really have any effect. Fix that. Signed-off-by: Rasmus Villemoes Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/ls1021a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -132,7 +132,7 @@ }; esdhc: esdhc@1560000 { - compatible = "fsl,esdhc"; + compatible = "fsl,ls1021a-esdhc", "fsl,esdhc"; reg = <0x0 0x1560000 0x0 0x10000>; interrupts = ; clock-frequency = <0>;