From patchwork Tue Aug 4 14:45:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 6940491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 03BCD9F39D for ; Tue, 4 Aug 2015 14:42:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 121AD20531 for ; Tue, 4 Aug 2015 14:42:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30FEE20481 for ; Tue, 4 Aug 2015 14:42:43 +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 1ZMdOb-0003JG-9Z; Tue, 04 Aug 2015 14:40:49 +0000 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMdNd-0001Sa-0E for linux-arm-kernel@lists.infradead.org; Tue, 04 Aug 2015 14:39:53 +0000 Received: by pdrg1 with SMTP id g1so5342400pdr.2 for ; Tue, 04 Aug 2015 07:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8mwWR+BEEFqC9zREszQk0Ty9n/hlU6zGdmSSBFDpGeY=; b=vljJGx2klur4MZ4zSmrIUwX8qeQKswWDyqXFFSG5aqmxElWNMpqjAvfwyt0uRkuMsD grf9xGmGAQqlVIh7rdinyCMlEIo+79eLCQBw2/i5yX4ote5h6XFyP5UhFhufxFQPnxF/ Wj3ia9jVYLwfK1aQyFNWUrW3KD9VWCbXXV+CazVg5zjPQo9UD4ny4CBI9mO9rPuT+H0K ExqR69wvi1DGzpelM5Ww43LGYou1F9iUY7xSiG31PyGOoXSsvfdTQJluweCs4SiDfBwu AiIptyB+Hb7UJ/2H2gH07T87vXjWjnDEeCw8Sa7/LTMTuvilJhqqMycc+zZ7T3OpPIJo RDnA== X-Received: by 10.70.129.133 with SMTP id nw5mr8405556pdb.52.1438699169945; Tue, 04 Aug 2015 07:39:29 -0700 (PDT) Received: from ip-172-31-29-47.ap-northeast-1.compute.internal (ec2-54-65-106-64.ap-northeast-1.compute.amazonaws.com. [54.65.106.64]) by smtp.gmail.com with ESMTPSA id bd5sm1706862pdb.41.2015.08.04.07.39.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Aug 2015 07:39:28 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: sboyd@codeaurora.org, mturquette@baylibre.com Subject: [PATCH 5/7 v2] clk: atlas7: fix the clock tree for bluetooth stuff Date: Tue, 4 Aug 2015 14:45:30 +0000 Message-Id: <1438699532-13860-6-git-send-email-21cnbao@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438699532-13860-1-git-send-email-21cnbao@gmail.com> References: <1438699532-13860-1-git-send-email-21cnbao@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150804_073949_361657_EE39F638 X-CRM114-Status: GOOD ( 12.34 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guo Zeng , workgroup.linux@csr.com, linux-arm-kernel@lists.infradead.org, Barry Song MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Guo Zeng normally dmac should depends on only one clock, to operate dmac internal register, but dmac4 is very special case, it normally dmac should depends on only one clock, to operate dmac internal register, but dmac4 is very special case, it depends on two additional clock, the reason is that dmac4 is wrapped in hw into bt a7ca module, and accessing dmac4 internal register would also require that the a7ca_io and related bt macro io clk also enabled. here workaround this by setting depend clk into parent of dmac4, and also related clks, to reflect dependency. noc_io -btm_noc_clk -a7ca_io -dmac4_io -uart6_io -usp3_io Signed-off-by: Guo Zeng Signed-off-by: Barry Song --- drivers/clk/sirf/clk-atlas7.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/sirf/clk-atlas7.c b/drivers/clk/sirf/clk-atlas7.c index 1000421..c1788df 100644 --- a/drivers/clk/sirf/clk-atlas7.c +++ b/drivers/clk/sirf/clk-atlas7.c @@ -1169,10 +1169,10 @@ static struct atlas7_unit_init_data unit_list[] __initdata = { { 127, "vss_sdr", "gpum_sdr", 0, SIRFSOC_CLKC_LEAF_CLK_EN7_SET, 1, &leaf7_gate_lock }, { 128, "thgpum_nocr", "gpum_nocr", 0, SIRFSOC_CLKC_LEAF_CLK_EN7_SET, 2, &leaf7_gate_lock }, { 129, "a7ca_btss", "btm_btss", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 1, &leaf8_gate_lock }, - { 130, "dmac4_io", "btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 2, &leaf8_gate_lock }, - { 131, "uart6_io", "btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 3, &leaf8_gate_lock }, - { 132, "usp3_io", "btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 4, &leaf8_gate_lock }, - { 133, "a7ca_io", "btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 5, &leaf8_gate_lock }, + { 130 , "dmac4_io", "a7ca_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 2, &leaf8_gate_lock }, + { 131 , "uart6_io", "dmac4_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 3, &leaf8_gate_lock }, + { 132 , "usp3_io", "dmac4_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 4, &leaf8_gate_lock }, + { 133 , "a7ca_io", "noc_btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 5, &leaf8_gate_lock }, { 134, "noc_btm_io", "btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 6, &leaf8_gate_lock }, { 135, "thbtm_io", "btm_io", 0, SIRFSOC_CLKC_LEAF_CLK_EN8_SET, 7, &leaf8_gate_lock }, { 136, "btslow", "xinw_fixdiv_btslow", 0, SIRFSOC_CLKC_ROOT_CLK_EN1_SET, 25, &root1_gate_lock },