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: 9092921 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: X-Original-To: patchwork-linux-clk@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54CF7BF29F for ; Fri, 13 May 2016 18:43:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7428820251 for ; Fri, 13 May 2016 18:43:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E0F9200CF for ; Fri, 13 May 2016 18:43:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753196AbcEMSmy (ORCPT ); Fri, 13 May 2016 14:42:54 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35581 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752828AbcEMSmx (ORCPT ); Fri, 13 May 2016 14:42:53 -0400 Received: by mail-pa0-f50.google.com with SMTP id iv1so43228684pac.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=DMgLoGLsIavTf5EpVT/5VDrXsMcwE6aK3tirgJ/hZKlgNG3y9Bl3XJ0/opkca2u+aN YRt0HG7FNVTVHE+p/6TInRudO8c6odxNwsn6hGzL7TtSTZ8ZazVZKAwEtTedzCtavwp5 NYtKrXl6QVHYzHlHyXgj/ZHqg2Yg5186o3TyD6oKgvC+RRFJeEpZUwtJNIIklVwwBy9Y QhGYY0/MgWPi8yTZQ8tGyZ3I5zydr9mIQp9hV4Itp9hflKQK0soc/m6dkFHn+7hDVdFT aXG7qrppCMh9FqBwJRO7SDZ1qEe5azuvf2JxRHbPh5f3jKl9jFMke91jV/ufFYt9MmoB jGTw== X-Gm-Message-State: AOPr4FXNvWFZu6FTtpR33Fo+kfR78hB3omoKgn2lkUgXdPP8A2bLoJQWTvh+Yvu+Gg5E5Ka3 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 Cc: linux-clk@vger.kernel.org, Heiko Stuebner , , , , Doug Anderson , Brian Norris , Xing Zheng , Brian Norris 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> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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: 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,