Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2687255imj; Mon, 11 Feb 2019 07:02:51 -0800 (PST) X-Google-Smtp-Source: AHgI3IY3ZKFAtsFS+91Bkf2PtT4dmpFQKzceMw9o8OfUWWtbACmxABIgctwVf0hAFkC/2kT4oD/y X-Received: by 2002:a63:194f:: with SMTP id 15mr29349239pgz.192.1549897371739; Mon, 11 Feb 2019 07:02:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549897371; cv=none; d=google.com; s=arc-20160816; b=zPsgsV6zb+H4oDvObCvRjN4LpBNgGD/nTIpnNcnN5GyVwJWfe45uugyPrBSsNfMUme xruHpyS8Nwmlnto1L3xafwCeZ41tcyxO6I1+NHUo1sFIAlJhrK7YibepglgVqMwxXYpm dxLE96jQn8VS98JplKWu+sncWgMrGTFw7tEYnc3UwnTDLFa14XYgPLssacK8K+wWmfVE xF/ixzYne9jhH2+c0QlUMu1Hx0My6nIAP1MDklEdhvsKlgkuNmQAqhmqBgXOnW8SERND SvEv5lJVadfFpQWijte0/fTKXTaPIGZco0rmYrK6bBASk2o10BPusYOUmW/kkWF/qvvL MoOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GLSMkNoR0JilBIqbTgopimkeW8KhvHCg8uYzuphI8M4=; b=cdRDrTB2v6xCqTRmxL1shGW2VzjMlcJj1MWeAumRnkvxl8TOgqGVKxekFapQUxVi1t VSL+3B3GssF4w9NvkDhZMVQWbXTFt0poqdlfScuqOseEA1aJv8ivBo+nPv9whN2HnifQ Ny+Ft3cw7/f840HrTQZCp+P8j3h1He4VAS7i3IEaCk6RH6dI13N6KOpAPKzKAYOvDumb ZHY4p0ex2kI38mi8Z/k+6NmqKyGFuV1xrJbUfDTPqqrEw4FZajlD3pndNctKzYN8aoHd 2tDCMJMCgiJ9+Xc6zbTcZhjkWJ5+AXLOTQnhbGgr5zhvsKSd9hXVUoZl7a6e+4NrzGN+ dzQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w28gGySO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p12si5180184pgd.361.2019.02.11.07.02.26; Mon, 11 Feb 2019 07:02:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w28gGySO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389909AbfBKO77 (ORCPT + 99 others); Mon, 11 Feb 2019 09:59:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:47792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727896AbfBKO75 (ORCPT ); Mon, 11 Feb 2019 09:59:57 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 92B7C21773; Mon, 11 Feb 2019 14:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897197; bh=Sm/6yHg/ZlqRz49T243GbfD3QH3rt3KBgV2Aa1AtQHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w28gGySOmbSVmRe0TGY4Or5nuMJMZ4PQDrFziLsTuQWyBqBtAZWhRwqp+899T3OcW sSnEd2mi8ovqWwQh9J58PI0Kwi/SqOR+GqmyryRAhhp/8Y3Ht4iASU9K3v0PPSKlS7 dV8fqPQWZZ0DZIb76QQNkRKBdJ8EpEnXxCRWS7vA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anson Huang , Stephen Boyd , Sasha Levin Subject: [PATCH 4.14 083/205] clk: imx6sl: ensure MMDC CH0 handshake is bypassed Date: Mon, 11 Feb 2019 15:18:01 +0100 Message-Id: <20190211141834.118409000@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 0efcc2c0fd2001a83240a8c3d71f67770484917e ] Same as other i.MX6 SoCs, ensure unused MMDC channel's handshake is bypassed, this is to make sure no request signal will be generated when periphe_clk_sel is changed or SRC warm reset is triggered. Signed-off-by: Anson Huang Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-imx6sl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/imx/clk-imx6sl.c b/drivers/clk/imx/clk-imx6sl.c index 9642cdf0fb88..c264a744fae8 100644 --- a/drivers/clk/imx/clk-imx6sl.c +++ b/drivers/clk/imx/clk-imx6sl.c @@ -17,6 +17,8 @@ #include "clk.h" +#define CCDR 0x4 +#define BM_CCM_CCDR_MMDC_CH0_MASK (1 << 17) #define CCSR 0xc #define BM_CCSR_PLL1_SW_CLK_SEL (1 << 2) #define CACRR 0x10 @@ -414,6 +416,10 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) clks[IMX6SL_CLK_USDHC3] = imx_clk_gate2("usdhc3", "usdhc3_podf", base + 0x80, 6); clks[IMX6SL_CLK_USDHC4] = imx_clk_gate2("usdhc4", "usdhc4_podf", base + 0x80, 8); + /* Ensure the MMDC CH0 handshake is bypassed */ + writel_relaxed(readl_relaxed(base + CCDR) | + BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR); + imx_check_clocks(clks, ARRAY_SIZE(clks)); clk_data.clks = clks; -- 2.19.1