From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227JJqxR9aOZK7qrTTJXCYJu5uvPS84Wp0nsmUf4YIaCZ3OyDBz9IJ+4m+sfIAJLEa/v4/de ARC-Seal: i=1; a=rsa-sha256; t=1517256688; cv=none; d=google.com; s=arc-20160816; b=zIt9ZSc2oD4ppfIxiVodm0FWT6KSTHLbkN9U5LU4gHQpoBCsQZvDZ1YO1hh5gHvu+Q 51z4DgMB2qeyAWy+AVBkqx3peSBWGy6A8ei1l5HypCY16mLD4rFIeKpJRjUFEPMr5SbK j9UHdXR49O0ghNZ+qZ74fft7W1IL7vyQpjaMzxXU7wnI/Jhp07MhZFqAyD6j49wpdQrS Alu50Kgg+wi3uNIKkn3qOeF6ziIUTlXP14iAvuJGbRRmrpKCu/0tVNLPkMHx+FXdhMUX bW9IhvZgOOsqSSe/B2EZcy5EXMsJrq5ksgwTxfhfLqeT5aaDqj54PcKka+H7OoIqvdbR xE9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=+qhWj3ImF9UHB6tV0mIgaA2BDWhbpORIaaTPbBLmhWs=; b=N+WopfPnoouUTGu5t9HvUmd+0/nBn+HCkp4850UpQOibRrOwd3VVky4MJCKVmXESeM OzoVYP/PbRhhVbqsZt+uwXXOW6P+ms+qewkbRKv4RKmq+YZ48RDcLOrCQYqHfvNi2gBo BHoa9nz1DsueNSyF6xx94Vqp5PKIQOtLSIZft27PE0b/MpBl9c1xRxBSN4zUs7Se0yk+ /kLrqmtBkYC/SElcjFoqsP6t5f7gA8y6xosYZH7RFVpT59fXZVRuwKHXETug34QswdGN ucrzSVjfwMjcHMD/ku5yBKaYHJqFndqY0e1aWSb8CVCAOjqa/+xV0FBUy4Ifvqqy3lC/ 54Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yangbo Lu , Ulf Hansson , Matthias Brugger Subject: [PATCH 4.4 19/74] mmc: sdhci-of-esdhc: add/remove some quirks according to vendor version Date: Mon, 29 Jan 2018 13:56:24 +0100 Message-Id: <20180129123848.480368327@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958949219436726?= X-GMAIL-MSGID: =?utf-8?q?1590958949219436726?= 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: yangbo lu commit 1ef5e49e46b919052474d9b54a15debc79ff0133 upstream. A previous patch had removed esdhc_of_platform_init() by mistake. static void esdhc_of_platform_init(struct sdhci_host *host) { u32 vvn; vvn = in_be32(host->ioaddr + SDHCI_SLOT_INT_STATUS); vvn = (vvn & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT; if (vvn == VENDOR_V_22) host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; if (vvn > VENDOR_V_22) host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ; } This patch is used to fix it by add/remove some quirks according to verdor version in probe. Signed-off-by: Yangbo Lu Fixes: f4932cfd22f1 ("mmc: sdhci-of-esdhc: support both BE and LE host controller") Signed-off-by: Ulf Hansson Signed-off-by: Matthias Brugger Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/host/sdhci-of-esdhc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -584,6 +584,8 @@ static int sdhci_esdhc_probe(struct plat { struct sdhci_host *host; struct device_node *np; + struct sdhci_pltfm_host *pltfm_host; + struct sdhci_esdhc *esdhc; int ret; np = pdev->dev.of_node; @@ -600,6 +602,14 @@ static int sdhci_esdhc_probe(struct plat sdhci_get_of_property(pdev); + pltfm_host = sdhci_priv(host); + esdhc = pltfm_host->priv; + if (esdhc->vendor_ver == VENDOR_V_22) + host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; + + if (esdhc->vendor_ver > VENDOR_V_22) + host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ; + if (of_device_is_compatible(np, "fsl,p5040-esdhc") || of_device_is_compatible(np, "fsl,p5020-esdhc") || of_device_is_compatible(np, "fsl,p4080-esdhc") ||