From patchwork Tue Nov 4 07:52:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 5223481 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 61573C11AC for ; Tue, 4 Nov 2014 07:56:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9574320108 for ; Tue, 4 Nov 2014 07:56:20 +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 CF260200F3 for ; Tue, 4 Nov 2014 07:56:19 +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 1XlYyR-0006Lt-6A; Tue, 04 Nov 2014 07:56:19 +0000 Received: from mail-pd0-x233.google.com ([2607:f8b0:400e:c02::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XlYy4-0005pw-Mz; Tue, 04 Nov 2014 07:55:57 +0000 Received: by mail-pd0-f179.google.com with SMTP id g10so13234554pdj.10 for ; Mon, 03 Nov 2014 23:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=RO06TeCsXJKps4aJ7UUocb1RsoXgqnX1lvQ2D90D8Iw=; b=z+CuCA1xgifthnCJAh7gsjud/BgXb7O0NTcs/LIucXkc2P3u1zslFmW+wqa7AuQuor D+uRUB8FaZ73iNClDQUqs+qN94U7suslwva7yroxycRfuS9safToIxA1IXcJonCiWHd5 4KqFbmYnodCBpAWKeLShPjIxeW9HF8Sr8/kIy8/wO5ZqX413P/B9x6/6lutP0hHh0ngJ IEzMZP/aftC53b1dthWi4TznM5mPV3bNDU9At0gZagzoaHKSCYtBdXiNmVn0XShNxtQ3 NmuPY5vKGwfMmCkMDugJqIf1crwl1yzCwsDfZuVI7tTbXRdMO2vokmN3VxKnQwGmwn19 jHmA== X-Received: by 10.68.68.164 with SMTP id x4mr14688785pbt.104.1415087735224; Mon, 03 Nov 2014 23:55:35 -0800 (PST) Received: from localhost.localdomain ([58.22.7.114]) by mx.google.com with ESMTPSA id r4sm16197953pdm.93.2014.11.03.23.55.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Nov 2014 23:55:33 -0800 (PST) From: Kever Yang To: Mike Turquette , Heiko Stuebner Subject: [PATCH 5/5] clk: rockchip: change DCLK_VOP0 to use new COMPOSITE_DIVOPS Date: Tue, 4 Nov 2014 15:52:39 +0800 Message-Id: <1415087559-19444-6-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415087559-19444-1-git-send-email-kever.yang@rock-chips.com> References: <1415087559-19444-1-git-send-email-kever.yang@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141103_235556_793692_EE9AC6B9 X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.0 (+) Cc: huangtao@rock-chips.com, dkl@rock-chips.com, addy.ke@rock-chips.com, yzq@rock-chips.com, linux-kernel@vger.kernel.org, dianders@chromium.org, Kever Yang , linux-rockchip@lists.infradead.org, fzf@rock-chips.com, ykk@rock-chips.com, cf@rock-chips.com, sonnyrao@chromium.org, linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY, URIBL_BLACK autolearn=no 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 The HDMI clock is actually provide by DCLK_VOP0, so we need this patch to handle the HDMI clock correctly Signed-off-by: Kever Yang --- drivers/clk/rockchip/clk-rk3288.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 0151140..073a719 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -396,8 +396,10 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(30), 14, 2, MFLAGS, 8, 5, DFLAGS, RK3288_CLKGATE_CON(3), 4, GFLAGS), - COMPOSITE(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, 0, + COMPOSITE_DIVOPS(DCLK_VOP0, "dclk_vop0", mux_pll_src_cpll_gpll_npll_p, + (CLK_IGNORE_UNUSED | CLK_SET_RATE_PARENT), RK3288_CLKSEL_CON(27), 0, 2, MFLAGS, 8, 8, DFLAGS, + &dclk_vop_ops, RK3288_CLKGATE_CON(3), 1, GFLAGS), COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0, RK3288_CLKSEL_CON(29), 6, 2, MFLAGS, 8, 8, DFLAGS,