From patchwork Wed Oct 7 19:35:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 11821677 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5FD217D2 for ; Wed, 7 Oct 2020 19:35:33 +0000 (UTC) Received: by mail.kernel.org (Postfix) id BCBBB2193E; Wed, 7 Oct 2020 19:35:33 +0000 (UTC) Delivered-To: soc@kernel.org Received: from dellmb.labs.office.nic.cz (nat-1.nic.cz [217.31.205.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1720A20B1F; Wed, 7 Oct 2020 19:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602099333; bh=dQ72kqpJbN80gLwQU72h5AefmHYSB1+Yevt1m1H+8vQ=; h=From:To:List-Id:Cc:Subject:Date:In-Reply-To:References:From; b=ptZiqFE5S0AvrrmS4mqwB2W62VWJ9+UCq+hCBqXooxI32u66HfmPA4mzbcKw0i13p /8Q1oMjwtsfkO3rRIpfxXS6sGPnmQWwNEhjCfg2Ivlv11xLbtFySBrGs0CUDFhziTe vTZpTIzzlXeRQzM2wPWtHYtdQCTWt7mOFn8EVKWc= From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Gregory CLEMENT List-Id: Cc: pali@kernel.org, soc@kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org, =?utf-8?q?Marek_Beh=C3=BAn?= , Gregory CLEMENT , Miquel Raynal Subject: [PATCH mvebu 3/3] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Date: Wed, 7 Oct 2020 21:35:22 +0200 Message-Id: <20201007193522.9265-4-kabel@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201007193522.9265-1-kabel@kernel.org> References: <20201007193522.9265-1-kabel@kernel.org> MIME-Version: 1.0 Remove the .set_parent method in clk_pm_cpu_ops. This method was supposed to be needed by the armada-37xx-cpufreq driver, but was never actually called due to wrong assumptions in the cpufreq driver. After this was fixed in the cpufreq driver, this method is not needed anymore. Signed-off-by: Marek Behún Fixes: 2089dc33ea0e ("clk: mvebu: armada-37xx-periph: add DVFS support for cpu clocks") Cc: Gregory CLEMENT Cc: Miquel Raynal --- drivers/clk/mvebu/armada-37xx-periph.c | 28 -------------------------- 1 file changed, 28 deletions(-) diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c index f5746f9ea929..6507bd2c5f31 100644 --- a/drivers/clk/mvebu/armada-37xx-periph.c +++ b/drivers/clk/mvebu/armada-37xx-periph.c @@ -440,33 +440,6 @@ static u8 clk_pm_cpu_get_parent(struct clk_hw *hw) return val; } -static int clk_pm_cpu_set_parent(struct clk_hw *hw, u8 index) -{ - struct clk_pm_cpu *pm_cpu = to_clk_pm_cpu(hw); - struct regmap *base = pm_cpu->nb_pm_base; - int load_level; - - /* - * We set the clock parent only if the DVFS is available but - * not enabled. - */ - if (IS_ERR(base) || armada_3700_pm_dvfs_is_enabled(base)) - return -EINVAL; - - /* Set the parent clock for all the load level */ - for (load_level = 0; load_level < LOAD_LEVEL_NR; load_level++) { - unsigned int reg, mask, val, - offset = ARMADA_37XX_NB_TBG_SEL_OFF; - - armada_3700_pm_dvfs_update_regs(load_level, ®, &offset); - - val = index << offset; - mask = ARMADA_37XX_NB_TBG_SEL_MASK << offset; - regmap_update_bits(base, reg, mask, val); - } - return 0; -} - static unsigned long clk_pm_cpu_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -592,7 +565,6 @@ static int clk_pm_cpu_set_rate(struct clk_hw *hw, unsigned long rate, static const struct clk_ops clk_pm_cpu_ops = { .get_parent = clk_pm_cpu_get_parent, - .set_parent = clk_pm_cpu_set_parent, .round_rate = clk_pm_cpu_round_rate, .set_rate = clk_pm_cpu_set_rate, .recalc_rate = clk_pm_cpu_recalc_rate,