From patchwork Tue Apr 25 06:41:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eddie Cai X-Patchwork-Id: 9697567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B0F860224 for ; Tue, 25 Apr 2017 06:42:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E48928404 for ; Tue, 25 Apr 2017 06:42:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32E47285BA; Tue, 25 Apr 2017 06:42:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC82028404 for ; Tue, 25 Apr 2017 06:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S980925AbdDYGmA (ORCPT ); Tue, 25 Apr 2017 02:42:00 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:32908 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S980905AbdDYGlu (ORCPT ); Tue, 25 Apr 2017 02:41:50 -0400 Received: by mail-pf0-f196.google.com with SMTP id c198so8116697pfc.0; Mon, 24 Apr 2017 23:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BFqQrOd4wdark+2Y6ro0+SkwlMUtistEKtzyDvzNfbQ=; b=reww/0mc8kLGWGKNmnF1GT8m10WBOVsfJkz2GSvKIQFoFw2WriqM449K6qo+49MhB6 P1yxXX/Jm1xtZvcqipWnl46S4anedqM4GuxDoa26ngzeQnGNI8Hwl6P+GDm+uCrMRMb2 m0JYh2dtVNjc3FBc1vaUuqFrlKzWVtsiY8J5skNTrburBsW8fKd37nqJWIRGWbAvayCl sxrOJX73qOMu4E6c7JAFYQkg5+njqqYfCHc7HPeZC6ifTRx3xT6ukA+R0I7Z00NTM1rO sjtFV9XR5koX7xmeBp1aMTdDbK3S3fnuSiITTPaHayfrA5ShDQNGHZzvsi6SNKSyeUZp tV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BFqQrOd4wdark+2Y6ro0+SkwlMUtistEKtzyDvzNfbQ=; b=GOBKkT+feTHWzTLTMY1ntvwwAgRrNXQreYMpaPRbVD3PH63O2EdoEpVcCE5qfEA0df BxBze8kJlk6sDbgaFtMdPbFhe+VJouXw/fjB6iqwEN/+qoYet106jpZUTg7SMEitKwDF 0STsw6lUzq9HbknX0wlTtmq1/G161HgjJlIKcvmIJYm3ps5j1yMkkiw8ObHN0w6CL2TO wI7lXKvSIR0//eF1fJc8KFrVE++w/JgBdgK21jeRbEd9goQxyTpIiDU/PZhDVP+v0B+P +/0XCB+6BKLFqr/lfIuWTpLgGqTnYE21FZTahjo+e+RJCop0iWj114jEiOvZ209zJQ7i 5bDg== X-Gm-Message-State: AN3rC/5pTZslTBqCZJ/1xF9dd13qECH1BjRkQD6nJBRTqchvGeDTVoE6 Bh48iDGjPS/nGQ== X-Received: by 10.84.225.129 with SMTP id u1mr36452848plj.123.1493102509311; Mon, 24 Apr 2017 23:41:49 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 25sm8344782pfr.61.2017.04.24.23.41.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 24 Apr 2017 23:41:48 -0700 (PDT) From: Eddie Cai To: robh+dt@kernel.org, mark.rutland@arm.com, heiko@sntech.de, zhengxing@rock-chips.com, mturquette@baylibre.com, sboyd@codeaurora.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Eddie Cai Subject: [PATCH V2 2/2] clk: rockchip: fix the incorrect ids Date: Tue, 25 Apr 2017 14:41:10 +0800 Message-Id: <1493102470-22965-3-git-send-email-eddie.cai.linux@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493102470-22965-1-git-send-email-eddie.cai.linux@gmail.com> References: <1493102470-22965-1-git-send-email-eddie.cai.linux@gmail.com> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP the ids of clk_testout1 and clk_testout2 is incorrect now. let's correct it Signed-off-by: Eddie Cai --- 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 73121b14..f3656ba 100644 --- a/drivers/clk/rockchip/clk-rk3399.c +++ b/drivers/clk/rockchip/clk-rk3399.c @@ -1066,13 +1066,13 @@ enum rk3399_pmu_plls { /* cif_testout */ MUX(0, "clk_testout1_pll_src", mux_pll_src_cpll_gpll_npll_p, 0, RK3399_CLKSEL_CON(38), 6, 2, MFLAGS), - COMPOSITE(0, "clk_testout1", mux_clk_testout1_p, 0, + COMPOSITE(SCLK_TESTCLKOUT1, "clk_testout1", mux_clk_testout1_p, 0, RK3399_CLKSEL_CON(38), 5, 1, MFLAGS, 0, 5, DFLAGS, RK3399_CLKGATE_CON(13), 14, GFLAGS), MUX(0, "clk_testout2_pll_src", mux_pll_src_cpll_gpll_npll_p, 0, RK3399_CLKSEL_CON(38), 14, 2, MFLAGS), - COMPOSITE(0, "clk_testout2", mux_clk_testout2_p, 0, + COMPOSITE(SCLK_TESTCLKOUT2, "clk_testout2", mux_clk_testout2_p, 0, RK3399_CLKSEL_CON(38), 13, 1, MFLAGS, 8, 5, DFLAGS, RK3399_CLKGATE_CON(13), 15, GFLAGS),