From patchwork Mon Feb 24 16:22:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 3710371 Return-Path: X-Original-To: patchwork-linux-arm@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 C9B87BF13A for ; Mon, 24 Feb 2014 16:26:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0660420149 for ; Mon, 24 Feb 2014 16:26:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 065B620136 for ; Mon, 24 Feb 2014 16:26:38 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHyMB-0006Zc-2f; Mon, 24 Feb 2014 16:26:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHyM2-0002Hs-D9; Mon, 24 Feb 2014 16:26:06 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHyLW-0002Ce-IO for linux-arm-kernel@lists.infradead.org; Mon, 24 Feb 2014 16:25:38 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 06760852; Mon, 24 Feb 2014 17:25:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost (189.58.26.109.rev.sfr.net [109.26.58.189]) by mail.free-electrons.com (Postfix) with ESMTPSA id BED0380A; Mon, 24 Feb 2014 17:25:02 +0100 (CET) From: Maxime Ripard To: Emilio Lopez , Dan Williams , Vinod Koul Subject: [PATCH 2/5] clk: sun6i: Reparent AHB clock on PLL6 Date: Mon, 24 Feb 2014 17:22:44 +0100 Message-Id: <1393258967-4843-3-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393258967-4843-1-git-send-email-maxime.ripard@free-electrons.com> References: <1393258967-4843-1-git-send-email-maxime.ripard@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140224_112535_237631_C7E40372 X-CRM114-Status: UNSURE ( 9.85 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.2 (-) Cc: devicetree@vger.kernel.org, Mike Turquette , linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, dmaengine@vger.kernel.org, Maxime Ripard , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In order for the DMA controller to work for SDRAM to devices transfers, the AHB clock should be reparented on the PLL6. Force that parenting in the clock driver. Signed-off-by: Maxime Ripard --- drivers/clk/sunxi/clk-sunxi.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index cedaf4b..6cfcd23 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -1286,7 +1286,7 @@ static void __init of_sunxi_table_clock_setup(const struct of_device_id *clk_mat */ static void __init sunxi_clock_protect(void) { - struct clk *clk; + struct clk *clk, *parent; /* memory bus clock - sun5i+ */ clk = clk_get(NULL, "mbus"); @@ -1309,6 +1309,22 @@ static void __init sunxi_clock_protect(void) clk_put(clk); } + clk = clk_get(NULL, "ahb1_mux"); + if (IS_ERR(clk)) { + pr_err("Couldn't get AHB1 Mux\n"); + return; + } + + parent = clk_get(NULL, "pll6"); + if (IS_ERR(clk)) { + pr_err("Couldn't get PLL6\n"); + return; + } + + clk_set_parent(clk, parent); + + clk_put(clk); + clk_put(parent); } static void __init sunxi_init_clocks(void)