From patchwork Wed Nov 12 21:38:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 5291811 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CBB6C11AC for ; Wed, 12 Nov 2014 21:39:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 437A2201EC for ; Wed, 12 Nov 2014 21:39:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BC39201CE for ; Wed, 12 Nov 2014 21:39:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XofdF-0003yN-Jo; Wed, 12 Nov 2014 21:39:17 +0000 Received: from mail-ie0-f178.google.com ([209.85.223.178]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xofd8-0003tw-37 for linux-rockchip@lists.infradead.org; Wed, 12 Nov 2014 21:39:10 +0000 Received: by mail-ie0-f178.google.com with SMTP id rp18so14544632iec.37 for ; Wed, 12 Nov 2014 13:38:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=vDCiZxfgBQoscUzxk9xAeekXf2mVCEsNwxY7iCSrS0o=; b=jXe7XEu/AzC0cRF+3/8U5ChXppRbq7VB4g/GQgR76GvTW+7WoIv40MKQuoW18gEq9R YwmQdLpzuUMXn89fAbRoXKEeoDlsCVuQvJM8hyJxpnK3KMHzYL4P0fNnUYXTQjkV8qh6 /1td5OqO260QTqlxuU+16VxqNTOa1L8sEqQtikunhK/8ljHJ7F4R0k2yqfmPjhBkxwlq TsiujK7l0ax4iZRC8LC3nsPo5q/srM0LT4KD3BJxo8xszkZUCp5nwoKoL/ZuoekKjbeD N7XuSyLpCEQpQClFjadLcpMc7PYYoFvmYlN9kzwXHR2NNap4nF0EVXYmL3NjbRU2Xt59 J8Tg== X-Gm-Message-State: ALoCoQmQRkciBOhJKPRApBSbHFH7JCW5KnUGAjXuUwC1goFIi/uKsTSQN/46d5b3xg4VatrR1yS+ X-Received: by 10.50.79.232 with SMTP id m8mr43207933igx.11.1415828328496; Wed, 12 Nov 2014 13:38:48 -0800 (PST) Received: from dtor-ws ([2620:0:1000:1301:5cd7:9a92:91b2:d469]) by mx.google.com with ESMTPSA id 92sm11903198ioh.32.2014.11.12.13.38.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Nov 2014 13:38:47 -0800 (PST) Date: Wed, 12 Nov 2014 13:38:45 -0800 From: Dmitry Torokhov To: Heiko Stuebner , Mike Turquette Subject: [PATCH] clk: rockchip: ensure HCLK_VIO2_H2P and PCLK_VIO2_H2P stay enabled Message-ID: <20141112213845.GA14153@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141112_133910_189078_6EAD77C4 X-CRM114-Status: GOOD ( 10.72 ) X-Spam-Score: -1.3 (-) Cc: linux-kernel@vger.kernel.org, Doug Anderson , Kever Yang , linux-rockchip@lists.infradead.org, Jianqun , linux-arm-kernel@lists.infradead.org, Mark yao X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently there is no driver owning these clocks and they have to stay up for the system to function properly, so let's mark them as CLK_IGNORE_UNUSED. Without this patch we have trouble with suspend/resume and we have trouble turning the eDP back on if it ever idles off. Signed-off-by: Doug Anderson Signed-off-by: Dmitry Torokhov Reviewed-by: Doug Anderson Tested-by: Doug Anderson Reviewed-by: Kever Yang --- drivers/clk/rockchip/clk-rk3288.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 2327829..d79d52f 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -724,14 +724,14 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(HCLK_VIP, "hclk_vip", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 15, GFLAGS), GATE(HCLK_IEP, "hclk_iep", "hclk_vio", 0, RK3288_CLKGATE_CON(15), 3, GFLAGS), GATE(HCLK_ISP, "hclk_isp", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 1, GFLAGS), - GATE(HCLK_VIO2_H2P, "hclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 10, GFLAGS), + GATE(HCLK_VIO2_H2P, "hclk_vio2_h2p", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(16), 10, GFLAGS), GATE(PCLK_MIPI_DSI0, "pclk_mipi_dsi0", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 4, GFLAGS), GATE(PCLK_MIPI_DSI1, "pclk_mipi_dsi1", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 5, GFLAGS), GATE(PCLK_MIPI_CSI, "pclk_mipi_csi", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 6, GFLAGS), GATE(PCLK_LVDS_PHY, "pclk_lvds_phy", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 7, GFLAGS), GATE(PCLK_EDP_CTRL, "pclk_edp_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 8, GFLAGS), GATE(PCLK_HDMI_CTRL, "pclk_hdmi_ctrl", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 9, GFLAGS), - GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p", "hclk_vio", 0, RK3288_CLKGATE_CON(16), 11, GFLAGS), + GATE(PCLK_VIO2_H2P, "pclk_vio2_h2p", "hclk_vio", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(16), 11, GFLAGS), /* aclk_vio0 gates */ GATE(ACLK_VOP0, "aclk_vop0", "aclk_vio0", 0, RK3288_CLKGATE_CON(15), 5, GFLAGS),