From patchwork Wed Aug 1 12:16:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yixun Lan X-Patchwork-Id: 10551699 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3E1713B8 for ; Wed, 1 Aug 2018 04:20:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B08752A8F3 for ; Wed, 1 Aug 2018 04:20:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A27132A95B; Wed, 1 Aug 2018 04:20:41 +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.0 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 5C9952A8F3 for ; Wed, 1 Aug 2018 04:20:41 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=VyGcPmLm4Mmg30b3rOuL2gQ80U3rDhN0bpP51RTFLhQ=; b=jx6fIYH8gJ3R0o IGyqyvyQkH8W2wZbrMOJ0vfxO/EDid/nnCeTiwdR2TdR2qhLS8BKAPumQ4vqKenawHHYMR/RlC2sx kEK4QyXlxcCY96dqzJv1GrJ0Yt/Q7outDyHabvtXSOeTndKHwFOKmOQZPHi1nIlggROxipzi92Y+O 7W/avZKz9UFa5tEbpu6YS1qEL+QvyXWqLETvaVGTUum1jVRXYd1yfEkhVily9fXw36RqgZnehseWX H3UnnwKzgJDJ3LDEIHOcewg76/MmfhYBmOswf0R8pdEcQEl/w2eDOFknxB3kwuID6r+/XnsOQvsKg eDZc0339xblnqNNwoS+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkicq-0002ES-Hk; Wed, 01 Aug 2018 04:20:40 +0000 Received: from mail-sh2.amlogic.com ([58.32.228.45]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkicl-0002DM-Px; Wed, 01 Aug 2018 04:20:37 +0000 Received: from localhost.localdomain (10.18.20.250) by mail-sh2.amlogic.com (10.18.11.6) with Microsoft SMTP Server id 15.0.1320.4; Wed, 1 Aug 2018 12:20:13 +0800 From: Yixun Lan To: Jerome Brunet , Neil Armstrong Subject: [PATCH] clk: meson-axg: pcie: drop the mpll3 clock parent Date: Wed, 1 Aug 2018 12:16:24 +0000 Message-ID: <20180801121625.9488-1-yixun.lan@amlogic.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-Originating-IP: [10.18.20.250] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_212035_845958_06EEC02A X-CRM114-Status: GOOD ( 11.21 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , Michael Turquette , Yixun Lan , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Qiufang Dai , Jian Hu , Jianxin Qin , linux-amlogic@lists.infradead.org, Stephen Boyd , linux-arm-kernel@lists.infradead.org Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We found the PCIe driver doesn't really work with the mpll3 clock which is actually reserved for debug, So drop it from the mux list. Fixes: 33b89db68236 ("clk: meson-axg: add clocks required by pcie driver") Tested-by: Jianxin Qin Signed-off-by: Yixun Lan --- hi Jerome: I'm sorry we found this during latest PCIe driver test. I'm fine with either pull this as a fixup for 4.18 or queued for next 4.19, since the PCIe driver is not merged yet, just do as you feel what's fit best, thanks. Yixun --- drivers/clk/meson/axg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 2d458092884a..246c23df64a8 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -700,12 +700,14 @@ static struct clk_regmap axg_pcie_mux = { .offset = HHI_PCIE_PLL_CNTL6, .mask = 0x1, .shift = 2, + /* skip the parent mpll3, reserved for debug */ + .table = (u32[]){ 1 }, }, .hw.init = &(struct clk_init_data){ .name = "pcie_mux", .ops = &clk_regmap_mux_ops, - .parent_names = (const char *[]){ "mpll3", "pcie_pll" }, - .num_parents = 2, + .parent_names = (const char *[]){ "pcie_pll" }, + .num_parents = 1, .flags = CLK_SET_RATE_PARENT, }, };