From patchwork Fri Dec 12 17:50:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 5484611 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 70A40BEEA8 for ; Fri, 12 Dec 2014 17:51:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A735F2014A for ; Fri, 12 Dec 2014 17:51:15 +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 DB8392013A for ; Fri, 12 Dec 2014 17:51:14 +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 1XzUMz-0001gf-Jg; Fri, 12 Dec 2014 17:51:13 +0000 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XzUMq-0001YA-QH; Fri, 12 Dec 2014 17:51:05 +0000 Received: by mail-wi0-f175.google.com with SMTP id l15so3274048wiw.8; Fri, 12 Dec 2014 09:50:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=qUwZccjhQcui+Wre3BTh6Hnqqqgs2n45VJ9rLstFVX4=; b=QRbS/iWnDUfeCY6XIMFNFuFcEyVq++gHQCYnEIhgUB9RWYWOKP8b8L9L+07bP13YIK nlaDw+WD9mqaPU+gEYIv+KZjPqVCK80IP0B0E5Uzmm5xRWdPUoEzd4jc1fFfJWPwChlF T4ENhFWJJ/dX6nCVuKuvxyMvG4H0njkZfY/i+5ByjRjLtSVEL0nG/ZBP6m8FUTY8L5Wn zOjVwPLl79X9INOgFl2aTjWYELQZ6iysqq2Go1u3VMPAzmf0WZnUaMDfGe6WKKOPZKy4 sxkQ1BYlz1l1luRc8QNdbejWhmiMdEDHEokZdyB0SjtSFVjFm9MZNU1VmQ4s++GRfnBx W+Uw== X-Received: by 10.180.95.68 with SMTP id di4mr9533048wib.49.1418406642567; Fri, 12 Dec 2014 09:50:42 -0800 (PST) Received: from localhost.localdomain (AToulouse-554-1-36-188.w92-149.abo.wanadoo.fr. [92.149.107.188]) by mx.google.com with ESMTPSA id dg7sm2882276wib.24.2014.12.12.09.50.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Dec 2014 09:50:42 -0800 (PST) From: Romain Perier To: heiko@sntech.de Subject: [PATCH] clk: rockchip: Fix clock gate for rk3188 hclk_emem_peri Date: Fri, 12 Dec 2014 17:50:39 +0000 Message-Id: <1418406639-13668-1-git-send-email-romain.perier@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141212_095104_997944_0A1BAB86 X-CRM114-Status: UNSURE ( 6.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-rockchip@lists.infradead.org, mturquette@linaro.org, linux-kernel@vger.kernel.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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Do not disable clock gate "hclk_emem_peri", otherwise EMAC clocks no longer work and it breaks ethernet on RK3066 and RK3188. It fixes a regression introduced by commit 78eaf6095cc763c1a228ebac5682852f04e85205 ("clk: rockchip: disable unused clocks"). Signed-off-by: Romain Perier --- drivers/clk/rockchip/clk-rk3188.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 1.9.1 diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index c540789..dcf63a6 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -427,8 +427,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { /* hclk_peri gates */ GATE(0, "hclk_peri_axi_matrix", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(4), 0, GFLAGS), GATE(0, "hclk_peri_ahb_arbi", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(4), 6, GFLAGS), - GATE(0, "hclk_emem_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 7, GFLAGS), + GATE(0, "hclk_emem_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(4), 7, GFLAGS), GATE(HCLK_EMAC, "hclk_emac", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 0, GFLAGS), GATE(HCLK_NANDC0, "hclk_nandc0", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 9, GFLAGS), GATE(0, "hclk_usb_peri", "hclk_peri", 0, RK2928_CLKGATE_CON(4), 5, GFLAGS), --