From patchwork Fri May 13 18:42:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9092981 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 3E94F9F1C3 for ; Fri, 13 May 2016 18:44:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6AD6D2014A for ; Fri, 13 May 2016 18:44:43 +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 96D6E2012B for ; Fri, 13 May 2016 18:44:42 +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 1b1I3W-0005tX-Sd; Fri, 13 May 2016 18:43:22 +0000 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b1I3N-0005oz-2Y for linux-arm-kernel@lists.infradead.org; Fri, 13 May 2016 18:43:13 +0000 Received: by mail-pa0-x22e.google.com with SMTP id iv1so43228685pac.2 for ; Fri, 13 May 2016 11:42:52 -0700 (PDT) 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=86ec5Vc72ChZEFOeU9vBD9Sw1vA6vyT1NfE8Ity68dE=; b=RSrQ0PiSJsvOuBgkdFRMqe+crslwJe2iyYCKP7dUOluwbKmy8VY6BC9ZDQCVMR9cxA 6oscbIVMB4iCOkK9OtiqJ5eK9gQFh6fX9eHR7qHkaPjjWL1gb1p4ydbXos2utSboCUP9 67jOI9tbYkWeTwTymk/FfIl9ZHzbLfSzU/v38= 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=86ec5Vc72ChZEFOeU9vBD9Sw1vA6vyT1NfE8Ity68dE=; b=YleK+t1Ky+gm9obxF8OaZ3meXxAo/SFJse9W2JRGLZTGg2wDVSdXXOjPQtGCf1+MCW ZNPzrM6praSTw4cv975e6WVqPKLsWRUwNNhh8JNCq5UxpVbawJRiNsUjaHqB7Dkml0K2 XF3HnNKWNzzuYG5/JHDM1R126/0McJbpQKd3pzKCYxrYPUGq3AtgFO280hdUDesO+cr/ bV0HUsMEfitF/Uag4GOWp/ZFl2UlJEEdJwG+66wzec9YKxwTSg1vbm1nluw+JYw12N3e SMS9BwI4mJM1FJ24QfvumVVlN71Mn0dnbdkYxngx6Wg6hfDvF8I6TxHvNby3nmlNeLMW 5OXg== X-Gm-Message-State: AOPr4FWNH2R/JRiKLxkXCWCzefQ3Kqhg5Ozu775OQBy1VOTWPKihNSu2rTwl3VrwrQa1KXta X-Received: by 10.66.168.198 with SMTP id zy6mr25162474pab.10.1463164972396; Fri, 13 May 2016 11:42:52 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id z9sm29060180pfa.84.2016.05.13.11.42.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 11:42:51 -0700 (PDT) From: Brian Norris To: Michael Turquette , Stephen Boyd Subject: [PATCH 2/2] clk: rockchip: fix incorrect parent for rk3399's {c, g}pll_aclk_perihp_src Date: Fri, 13 May 2016 11:42:17 -0700 Message-Id: <1463164937-91089-2-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1463164937-91089-1-git-send-email-briannorris@chromium.org> References: <1463164937-91089-1-git-send-email-briannorris@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160513_114313_150867_97AEA17E X-CRM114-Status: GOOD ( 11.29 ) 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: Heiko Stuebner , Xing Zheng , Brian Norris , linux-kernel@vger.kernel.org, Doug Anderson , linux-rockchip@lists.infradead.org, Brian Norris , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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: Xing Zheng There was a typo, swapping 'c' <--> 'g'. Signed-off-by: Xing Zheng Signed-off-by: Brian Norris Reviewed-by: Douglas Anderson --- drivers/clk/rockchip/clk-rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c index 145756c4f3c8..9f86bfef70f7 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -832,9 +832,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { RK3399_CLKGATE_CON(13), 1, GFLAGS), /* perihp */ - GATE(0, "cpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, + GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(5), 0, GFLAGS), - GATE(0, "gpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, + GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, RK3399_CLKGATE_CON(5), 1, GFLAGS), COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p, CLK_IGNORE_UNUSED, RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5, DFLAGS,