Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753359AbaBXQZH (ORCPT ); Mon, 24 Feb 2014 11:25:07 -0500 Received: from top.free-electrons.com ([176.31.233.9]:54484 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752484AbaBXQZE (ORCPT ); Mon, 24 Feb 2014 11:25:04 -0500 From: Maxime Ripard To: Emilio Lopez , Dan Williams , Vinod Koul Cc: Mike Turquette , linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, Maxime Ripard 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/