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: 9697579 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 AC4C760224 for ; Tue, 25 Apr 2017 06:42:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A09DB28404 for ; Tue, 25 Apr 2017 06:42:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94A14285BA; Tue, 25 Apr 2017 06:42:55 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 393C328404 for ; Tue, 25 Apr 2017 06:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=J6DaNFBYPXPn5XNWyvVr6bgfBE381hIGaHi7kkox7HY=; b=WWHzFQmfAcGu5DN9gKP6ZXrduU r520uXh8svYN4ZVdPqMjv1ArCKs7tyVAbHNuDR5ju1+M4G5sc/YJkstbjuCU3siuj89H+0z6d1Ap7 LcVPGygTwo/ZUJdh5lVOW8Rf00LaXktrtZBMH6oXW70Y9LqT6YoqfKdOR1fWePCeFlhhJCCshMZ0X 1Wj5e/xNnS30klZEUHcEklcvIE3rhbxbbA2vZw7dvQdCvPQ3sGxO2ShupTmN5yPstPra569nRzzva szqmDL2+ebchFATaxFGkErlmuiyWLwilNw4eEdO9FkMp+g6umf1TednTL8ZOYg8nfFobYBz41uHzr 4llxPR3w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d2uBa-0004kU-CH; Tue, 25 Apr 2017 06:42:54 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2uAr-0003kM-Vt; Tue, 25 Apr 2017 06:42:17 +0000 Received: by mail-pf0-x244.google.com with SMTP id a188so8102385pfa.2; 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=M2pTl44ELRWsAMfFwGhyvhFykWGuZXb3sMgMikkHsyoqe+/Gw88eHqjdeACq8XyxuX 1z3Zyf4KpOkRDiX/5B0mdMw1h8pBrPsvGbJQx9lmA0dYJ7M6r+7a+cGuMl/ingKaEd3w KI2w5S82ZFLanDpu9k5zuxewrIa5NjW/hCK3DHnF8ksmSyYJnsnnKuljqhbGSl7W4vIK 86a4Y2Y2fIHQaichBZh4tf+RIRYOQoANDv+ixZEGfX2XR6kSPW7YlKkcgAOCtiEy5lk/ L8YebJii7fY1Y6wZYGns7+Cok3lTG7b2w+ux0/Tg1TZ8hdvM+AtVTm+eotRczJDB+F+1 Sb+g== X-Gm-Message-State: AN3rC/7zzEOW7OoakbUOqlWmRuGCToF7p1rD4n+e2FZEmj9cj4Z9GIZ5 YDXTWtMVaF6ZJg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170424_234210_458498_1A828460 X-CRM114-Status: UNSURE ( 8.73 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Eddie Cai , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, 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-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),