From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63FD8C282C8 for ; Mon, 28 Jan 2019 16:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C01920663 for ; Mon, 28 Jan 2019 16:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548693076; bh=/JaaCffS7k4/l8m+a0AEkfoHDDZZVjEwKleuWmnpXxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VB6yTqBqnCz8hwyVi301GheOTbD//6vmOoYcUMKp9fq9HiLSJvqqcRvt3nPNs2jQv 4byX4l3JmYDyPMq5t4IvgvkY9xno3AvCHoULEYUHiPf+bzTbjDQ92jU3hjQ5Pz+Zlh cOBhQkF/68iXwlhrSDQfOd6uBvvi/6Yx4F0MZ5rI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390370AbfA1Q1L (ORCPT ); Mon, 28 Jan 2019 11:27:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:36992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390332AbfA1Q1I (ORCPT ); Mon, 28 Jan 2019 11:27:08 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8000B2147A; Mon, 28 Jan 2019 16:27:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692828; bh=/JaaCffS7k4/l8m+a0AEkfoHDDZZVjEwKleuWmnpXxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HT6Ndw9ipI2EaYIfNwLzDOCOJL2TQRZyXm1mFL4UiMt6o1ql/kQSzewvChBCeQSUK mZCnmBqhKNmacojHTpGeOA7A+Jq6c3ZQAZRcvjze2KP0sKVnZwAiRyAGIHZp0ftHsA +lfPRMiLFpUqlLemvd7KX4otUdAtBm6clg+VPdjQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anson Huang , Anson Huang , Stephen Boyd , Sasha Levin Subject: [PATCH AUTOSEL 3.18 27/61] clk: imx6sl: ensure MMDC CH0 handshake is bypassed Date: Mon, 28 Jan 2019 11:25:49 -0500 Message-Id: <20190128162623.59854-27-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128162623.59854-1-sashal@kernel.org> References: <20190128162623.59854-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anson Huang [ 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 --- arch/arm/mach-imx/clk-imx6sl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c index e982ebe10814..a99af8bd0571 100644 --- a/arch/arm/mach-imx/clk-imx6sl.c +++ b/arch/arm/mach-imx/clk-imx6sl.c @@ -18,6 +18,8 @@ #include "clk.h" #include "common.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 @@ -410,6 +412,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