From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 F2DADC4332D for ; Thu, 14 Jan 2021 12:41:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D8522239FD for ; Thu, 14 Jan 2021 12:41:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728266AbhANMlp (ORCPT ); Thu, 14 Jan 2021 07:41:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:59094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726376AbhANMlg (ORCPT ); Thu, 14 Jan 2021 07:41:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6AA8823A59; Thu, 14 Jan 2021 12:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610628055; bh=d2Z8NCxe2fjDv1yv6SP6SbppuTV2JP+64LTQ3exydYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XpszY4+xUiS/+/IDkKJ6WZutQaQ/A0jvizbsHLlVMcTwiG0zbTq3A5fdNG5r65JmC eFiFYqpCvMm4tD2fjMV8czwCXDij++99NbQ1vxLpG7yYkehAakH/wKl2Y9oSe5S1sN 1d7aYm/mlyP6qDoI/3EVyLsU86Gs0CrLMRkOwmnkmpw+40NTZ134TfME15Al53N3oD ubmOcPhzL9aEf6aZSqyBi7ZXWPMlK6I6FCjYxkY6BpsRbvgAmm3IpukXUcleayFLxM NG17j+cZWKY4qcl11iM0g4TuitciGOa0xg75k3HYn979RIKv12oPjQ+WIhJ0YVMh2/ FLZgvhERio6cQ== Received: by pali.im (Postfix) id 8A18B7CA; Thu, 14 Jan 2021 13:40:53 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Gregory Clement , Andrew Lunn , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , "Miquel Raynal" , "Tomasz Maciej Nowak" , "Luka Perkov" , "Andre Heider" , "Vladimir Vid" , "Russell King" , =?UTF-8?q?G=C3=A9rald=20Kerma?= , "Konstantin Porotchkin" Subject: [PATCH mvebu v2 03/10] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Date: Thu, 14 Jan 2021 13:40:25 +0100 Message-Id: <20210114124032.12765-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210114124032.12765-1-pali@kernel.org> References: <20210114124032.12765-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org From: Marek Behún 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, -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 4620FC433E6 for ; Thu, 14 Jan 2021 12:42:58 +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 1206023A53 for ; Thu, 14 Jan 2021 12:42:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1206023A53 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=b4NJ3Ip+KuBbAR96qemIa04/bZfLgRkTgmRcIIeYAf4=; b=sFqOnm2ymEJehNvBg+8VkBJaI g048PMLhF5MpZo3MkIQVpoEs+CkQFrM7Pe6+PjG/WN7qeID9IKXWw4w3MtPSQnurEedG8YknRZPxj ylrSiEmf+wwYcOEnUVjd4tbPe1s5LHqJKsTtzxqQUXuw3UYVo4CRw4SvTn3hHY5G85eg1efdQsZ+E Yp5xMksVhVusBlWqLj+uDXqsvvYLUBMPJgHhDx7BLHjFDMoegtpr8/JzIj9lSKIJZIdX2TI+ckZb7 KFrvdAPs54kbwty4/jAZ+BDB8Emo5Q+lt8ylnjPkWPjNxcWdT1mvnbuPK/4cCTWl0swChMmtph3Pp doHgiatcA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l01w1-0001id-0Z; Thu, 14 Jan 2021 12:41:05 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l01vs-0001fG-7M for linux-arm-kernel@lists.infradead.org; Thu, 14 Jan 2021 12:40:58 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6AA8823A59; Thu, 14 Jan 2021 12:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1610628055; bh=d2Z8NCxe2fjDv1yv6SP6SbppuTV2JP+64LTQ3exydYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XpszY4+xUiS/+/IDkKJ6WZutQaQ/A0jvizbsHLlVMcTwiG0zbTq3A5fdNG5r65JmC eFiFYqpCvMm4tD2fjMV8czwCXDij++99NbQ1vxLpG7yYkehAakH/wKl2Y9oSe5S1sN 1d7aYm/mlyP6qDoI/3EVyLsU86Gs0CrLMRkOwmnkmpw+40NTZ134TfME15Al53N3oD ubmOcPhzL9aEf6aZSqyBi7ZXWPMlK6I6FCjYxkY6BpsRbvgAmm3IpukXUcleayFLxM NG17j+cZWKY4qcl11iM0g4TuitciGOa0xg75k3HYn979RIKv12oPjQ+WIhJ0YVMh2/ FLZgvhERio6cQ== Received: by pali.im (Postfix) id 8A18B7CA; Thu, 14 Jan 2021 13:40:53 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Gregory Clement , Andrew Lunn , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH mvebu v2 03/10] clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock Date: Thu, 14 Jan 2021 13:40:25 +0100 Message-Id: <20210114124032.12765-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210114124032.12765-1-pali@kernel.org> References: <20210114124032.12765-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210114_074056_478984_8E66017C X-CRM114-Status: GOOD ( 13.15 ) 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: =?UTF-8?q?Marek=20Beh=C3=BAn?= , Tomasz Maciej Nowak , Luka Perkov , Andre Heider , Vladimir Vid , Russell King , =?UTF-8?q?G=C3=A9rald=20Kerma?= , Miquel Raynal , Konstantin Porotchkin Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogTWFyZWsgQmVow7puIDxrYWJlbEBrZXJuZWwub3JnPgoKUmVtb3ZlIHRoZSAuc2V0X3Bh cmVudCBtZXRob2QgaW4gY2xrX3BtX2NwdV9vcHMuCgpUaGlzIG1ldGhvZCB3YXMgc3VwcG9zZWQg dG8gYmUgbmVlZGVkIGJ5IHRoZSBhcm1hZGEtMzd4eC1jcHVmcmVxIGRyaXZlciwKYnV0IHdhcyBu ZXZlciBhY3R1YWxseSBjYWxsZWQgZHVlIHRvIHdyb25nIGFzc3VtcHRpb25zIGluIHRoZSBjcHVm cmVxCmRyaXZlci4gQWZ0ZXIgdGhpcyB3YXMgZml4ZWQgaW4gdGhlIGNwdWZyZXEgZHJpdmVyLCB0 aGlzIG1ldGhvZCBpcyBub3QKbmVlZGVkIGFueW1vcmUuCgpTaWduZWQtb2ZmLWJ5OiBNYXJlayBC ZWjDum4gPGthYmVsQGtlcm5lbC5vcmc+CkZpeGVzOiAyMDg5ZGMzM2VhMGUgKCJjbGs6IG12ZWJ1 OiBhcm1hZGEtMzd4eC1wZXJpcGg6IGFkZCBEVkZTIHN1cHBvcnQgZm9yIGNwdSBjbG9ja3MiKQpD YzogR3JlZ29yeSBDTEVNRU5UIDxncmVnb3J5LmNsZW1lbnRAYm9vdGxpbi5jb20+CkNjOiBNaXF1 ZWwgUmF5bmFsIDxtaXF1ZWwucmF5bmFsQGJvb3RsaW4uY29tPgotLS0KIGRyaXZlcnMvY2xrL212 ZWJ1L2FybWFkYS0zN3h4LXBlcmlwaC5jIHwgMjggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Ns ay9tdmVidS9hcm1hZGEtMzd4eC1wZXJpcGguYyBiL2RyaXZlcnMvY2xrL212ZWJ1L2FybWFkYS0z N3h4LXBlcmlwaC5jCmluZGV4IGY1NzQ2ZjllYTkyOS4uNjUwN2JkMmM1ZjMxIDEwMDY0NAotLS0g YS9kcml2ZXJzL2Nsay9tdmVidS9hcm1hZGEtMzd4eC1wZXJpcGguYworKysgYi9kcml2ZXJzL2Ns ay9tdmVidS9hcm1hZGEtMzd4eC1wZXJpcGguYwpAQCAtNDQwLDMzICs0NDAsNiBAQCBzdGF0aWMg dTggY2xrX3BtX2NwdV9nZXRfcGFyZW50KHN0cnVjdCBjbGtfaHcgKmh3KQogCXJldHVybiB2YWw7 CiB9CiAKLXN0YXRpYyBpbnQgY2xrX3BtX2NwdV9zZXRfcGFyZW50KHN0cnVjdCBjbGtfaHcgKmh3 LCB1OCBpbmRleCkKLXsKLQlzdHJ1Y3QgY2xrX3BtX2NwdSAqcG1fY3B1ID0gdG9fY2xrX3BtX2Nw dShodyk7Ci0Jc3RydWN0IHJlZ21hcCAqYmFzZSA9IHBtX2NwdS0+bmJfcG1fYmFzZTsKLQlpbnQg bG9hZF9sZXZlbDsKLQotCS8qCi0JICogV2Ugc2V0IHRoZSBjbG9jayBwYXJlbnQgb25seSBpZiB0 aGUgRFZGUyBpcyBhdmFpbGFibGUgYnV0Ci0JICogbm90IGVuYWJsZWQuCi0JICovCi0JaWYgKElT X0VSUihiYXNlKSB8fCBhcm1hZGFfMzcwMF9wbV9kdmZzX2lzX2VuYWJsZWQoYmFzZSkpCi0JCXJl dHVybiAtRUlOVkFMOwotCi0JLyogU2V0IHRoZSBwYXJlbnQgY2xvY2sgZm9yIGFsbCB0aGUgbG9h ZCBsZXZlbCAqLwotCWZvciAobG9hZF9sZXZlbCA9IDA7IGxvYWRfbGV2ZWwgPCBMT0FEX0xFVkVM X05SOyBsb2FkX2xldmVsKyspIHsKLQkJdW5zaWduZWQgaW50IHJlZywgbWFzaywgIHZhbCwKLQkJ CW9mZnNldCA9IEFSTUFEQV8zN1hYX05CX1RCR19TRUxfT0ZGOwotCi0JCWFybWFkYV8zNzAwX3Bt X2R2ZnNfdXBkYXRlX3JlZ3MobG9hZF9sZXZlbCwgJnJlZywgJm9mZnNldCk7Ci0KLQkJdmFsID0g aW5kZXggPDwgb2Zmc2V0OwotCQltYXNrID0gQVJNQURBXzM3WFhfTkJfVEJHX1NFTF9NQVNLIDw8 IG9mZnNldDsKLQkJcmVnbWFwX3VwZGF0ZV9iaXRzKGJhc2UsIHJlZywgbWFzaywgdmFsKTsKLQl9 Ci0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyB1bnNpZ25lZCBsb25nIGNsa19wbV9jcHVfcmVjYWxj X3JhdGUoc3RydWN0IGNsa19odyAqaHcsCiAJCQkJCSAgICB1bnNpZ25lZCBsb25nIHBhcmVudF9y YXRlKQogewpAQCAtNTkyLDcgKzU2NSw2IEBAIHN0YXRpYyBpbnQgY2xrX3BtX2NwdV9zZXRfcmF0 ZShzdHJ1Y3QgY2xrX2h3ICpodywgdW5zaWduZWQgbG9uZyByYXRlLAogCiBzdGF0aWMgY29uc3Qg c3RydWN0IGNsa19vcHMgY2xrX3BtX2NwdV9vcHMgPSB7CiAJLmdldF9wYXJlbnQgPSBjbGtfcG1f Y3B1X2dldF9wYXJlbnQsCi0JLnNldF9wYXJlbnQgPSBjbGtfcG1fY3B1X3NldF9wYXJlbnQsCiAJ LnJvdW5kX3JhdGUgPSBjbGtfcG1fY3B1X3JvdW5kX3JhdGUsCiAJLnNldF9yYXRlID0gY2xrX3Bt X2NwdV9zZXRfcmF0ZSwKIAkucmVjYWxjX3JhdGUgPSBjbGtfcG1fY3B1X3JlY2FsY19yYXRlLAot LSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtYXJtLWtlcm5lbAo=