From patchwork Thu Dec 31 14:21:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kepplinger X-Patchwork-Id: 11994125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD9FCC433E9 for ; Thu, 31 Dec 2020 14:24:21 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 675BB223DB for ; Thu, 31 Dec 2020 14:24:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 675BB223DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=puri.sm Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=4TzQ5ftM+EJYyUNUpWBGSTagoshHqGEZaPdQZmzm0ck=; b=KATM0jBSFo1BjNiZqc8WHxTQZ8 meZpDOMAcOa79LxJ6dW2hGM/AoztD5v7MMDnhzwyZU4Ymh+pVA0FvPRpjQtcNZliD+DHqZ4UW3NQ4 kpuG9xJ1XfzJP14noFFUGU2J3biftFMdTR0uxFkcanKeeHvqnQ4wE290zo1iwArqkI3yPCVxufxVL NFeyZX9QlCzFjS2zJgvpND26fCdHy8X0Gh3xwE5DaAAB2tnj5XyMyBDfJiVCYnN9b1t9NJ2OeaH3O 6R5RMWtDF1hQG7+R15PJG7ayfeBjzufJ38kcIuK4fZVOcMGXPVW+q8MfcWwG2BUuJIh/GaJEpKao2 TpGGjZ5A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuyr2-0000mt-AJ; Thu, 31 Dec 2020 14:23:04 +0000 Received: from comms.puri.sm ([159.203.221.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuyqz-0000m7-MR for linux-arm-kernel@lists.infradead.org; Thu, 31 Dec 2020 14:23:02 +0000 Received: from localhost (localhost [127.0.0.1]) by comms.puri.sm (Postfix) with ESMTP id 31710E117D; Thu, 31 Dec 2020 06:22:26 -0800 (PST) Received: from comms.puri.sm ([127.0.0.1]) by localhost (comms.puri.sm [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Uz3fBmt1EJap; Thu, 31 Dec 2020 06:22:25 -0800 (PST) From: Martin Kepplinger To: mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org, festevam@gmail.com Subject: [PATCH] Revert "clk: imx: fix composite peripheral flags" Date: Thu, 31 Dec 2020 15:21:49 +0100 Message-Id: <20201231142149.26062-1-martin.kepplinger@puri.sm> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201231_092301_815115_112E6557 X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Kepplinger , linux-kernel@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit 936c383673b9e3007432f17140ac62de53d87db9. It breaks clock reparenting via devfreq on the imx8mq used in the Librem 5 phone. When switching dram frequency (which worked before) the system now hangs after this where the dram_apb clock cannot be set: [ 129.391755] imx8m-ddrc-devfreq 3d400000.memory-controller: failed to set dram_apb parent: -16 [ 129.391959] imx8m-ddrc-devfreq 3d400000.memory-controller: ddrc failed freq switch to 25000000 from 800000000: error -16. now at 25000000 [ 129.406133] imx8m-ddrc-devfreq 3d400000.memory-controller: failed to update frequency from PM QoS (-16) Note that on the Librem 5 devkit that uses a different revision of the imx8mq SoC, the added flag does *not* break said clock reparenting so there might be subtle differences here. Signed-off-by: Martin Kepplinger --- drivers/clk/imx/clk-composite-8m.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/clk/imx/clk-composite-8m.c b/drivers/clk/imx/clk-composite-8m.c index 2c309e3dc8e3..78fb7e52a42a 100644 --- a/drivers/clk/imx/clk-composite-8m.c +++ b/drivers/clk/imx/clk-composite-8m.c @@ -216,7 +216,6 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, div->width = PCG_PREDIV_WIDTH; divider_ops = &imx8m_clk_composite_divider_ops; mux_ops = &clk_mux_ops; - flags |= CLK_SET_PARENT_GATE; } div->lock = &imx_ccm_lock;