From patchwork Wed Nov 26 00:13:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5382921 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B9F889F2F5 for ; Wed, 26 Nov 2014 00:16:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D832201EC for ; Wed, 26 Nov 2014 00:16:21 +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 0E688200E1 for ; Wed, 26 Nov 2014 00:16:20 +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 1XtQF2-00031o-G6; Wed, 26 Nov 2014 00:13:56 +0000 Received: from mail-ie0-x235.google.com ([2607:f8b0:4001:c03::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XtQEm-0002vo-2C for linux-arm-kernel@lists.infradead.org; Wed, 26 Nov 2014 00:13:41 +0000 Received: by mail-ie0-f181.google.com with SMTP id tp5so1678309ieb.12 for ; Tue, 25 Nov 2014 16:13:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2hcKvNymreYynAyd9y+Y676rmETTqTmcI9+Wfm2xRZQ=; b=GAnrOrNH4tXP8NsJyBHGuai51iG3j3SYRW2nHGEglMBFY9YfNiGpCuVw2k1TGcU530 8Un9Js3ogVVe6EvJG5Fvt7IxC5iKuma+ylYED/VZNyHYu72UM+SwoFxYf+lV/+rlp0Th fgHhcMacNTP//afGDCQYKw16GrJrCkIm2arro= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2hcKvNymreYynAyd9y+Y676rmETTqTmcI9+Wfm2xRZQ=; b=kUI6P1MDD50rZa9jDjyViQDPQqaWxpKIVSXivKYYE+WUBAYmsEKrFrLUEUY6RoaopA jkJvp1R9CNxpal7ptNU3OTBz3up3De2UWVXUqhX5mm+GXvbB7m3DIIJfvOR9L2nOwHEB 9WiMmlxFrCHpplV8fHfXjwbywdl9qr6FdwxksgqRg4ISHC/ekFCv+uQf08mwk4XazLOX Nd9LVinN8fz7QsAPi9xKtVhVdXRf+F52smN/zB6nl6FjWRRBVwMrVIvq93eTKVCwmlWI E/u4LOtiHsQ76pNWfRitRHEz5FgtZNSCrG7MtIlywO8DUs+1ePeqvroUJcXDKMre6b62 v7aQ== X-Gm-Message-State: ALoCoQkZeW1ws2jA8vI1b3DeLmcvC/aGz+9J+RcJCedGChf33tMzM4L7Rx6WgmlKd5TOOF6gRKTg X-Received: by 10.42.121.17 with SMTP id h17mr21025269icr.75.1416960798655; Tue, 25 Nov 2014 16:13:18 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id ik2sm1781735igb.9.2014.11.25.16.13.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Nov 2014 16:13:18 -0800 (PST) From: Doug Anderson To: Heiko Stuebner , cym@rock-chips.com, Mike Turquette Subject: [PATCH 2/2] clk: rockchip: use clock ID for DMC (memory controller) on rk3288 Date: Tue, 25 Nov 2014 16:13:03 -0800 Message-Id: <1416960783-25119-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1416960783-25119-1-git-send-email-dianders@chromium.org> References: <1416960783-25119-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141125_161340_224279_FA5C1BA4 X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-rockchip@lists.infradead.org, Derek Basehore , Doug Anderson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_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 From: Jeff Chen The DMC clocks need to be turned off at runtime. Use the newly assigned clock IDs to export them. Signed-off-by: Jeff Chen [dianders: split into two patches; adjusted commit msg] Signed-off-by: Doug Anderson --- drivers/clk/rockchip/clk-rk3288.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index ad8a27a..2328097 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -625,10 +625,10 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { GATE(PCLK_TIMER, "pclk_timer", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 1, GFLAGS), GATE(PCLK_I2C0, "pclk_i2c0", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 2, GFLAGS), GATE(PCLK_I2C2, "pclk_i2c2", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 3, GFLAGS), - GATE(0, "pclk_ddrupctl0", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 14, GFLAGS), - GATE(0, "pclk_publ0", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 15, GFLAGS), - GATE(0, "pclk_ddrupctl1", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 0, GFLAGS), - GATE(0, "pclk_publ1", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 1, GFLAGS), + GATE(PCLK_DDRUPCTL0, "pclk_ddrupctl0", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 14, GFLAGS), + GATE(PCLK_PUBL0, "pclk_publ0", "pclk_cpu", 0, RK3288_CLKGATE_CON(10), 15, GFLAGS), + GATE(PCLK_DDRUPCTL1, "pclk_ddrupctl1", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 0, GFLAGS), + GATE(PCLK_PUBL1, "pclk_publ1", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 1, GFLAGS), GATE(0, "pclk_efuse_1024", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 2, GFLAGS), GATE(PCLK_TZPC, "pclk_tzpc", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 3, GFLAGS), GATE(PCLK_UART2, "pclk_uart2", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 9, GFLAGS),