From patchwork Tue Oct 6 16:05:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 314109 Delivered-To: patches@linaro.org Received: by 2002:a92:d603:0:0:0:0:0 with SMTP id w3csp710313ilm; Tue, 6 Oct 2020 09:05:29 -0700 (PDT) X-Received: by 2002:a2e:b5d1:: with SMTP id g17mr1958771ljn.230.1602000328996; Tue, 06 Oct 2020 09:05:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602000328; cv=none; d=google.com; s=arc-20160816; b=s28Fd6r6JT4dQR6r+OTBr5tc58+aR5OX479pvU4ZxvHgQaHzPBsjty/LCaPeejoIgg Pi3N7M7kVXIqDDWvirpylvw/tPxUUGnU0pEEai5FotSwMvfMO3gtlXdgE3qxnh4mWU6y W/WfES3ZowZT7gTwblNwrzeNJpnfgtnA0tST0FlD9gBpiN5M8entWBGlNF8maU0cmQX0 3cePs8apo4Y4ZhHv/AShXaVFo7R2sfVRArnagyhsLY7VPD2FrKpJlHjuVbmkVk5kFEsx 4I2Wu9AUhpHBuyLqsBZE1NHUTwIxlHHKgHqXzBNRyBnNPJ4QScl8HOxv85UUO94Iw1oB CbLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OwoCSmfxLGjvt1o0N+0EiCnK4lbyycGM//QYdUZDGlU=; b=G8uvXWLUvhkChnItnfW/iHdziKgsRc1+cspJ95pTIT0Z6z0AIap7EI57yN7nhcPVMz iPrki1mAqA04RvZpRpX3B4zx6TTk/p5+jx4TMayR+8n9Pfqi/7GitTAIcFW1q9Uk47qt dVnzJcnKHjoVFAUygb3scq1jXEeSROXXujo1Qcjlr+qJPd5EDtnmR2UAkEt6jHauaZrk SKKg82tijePLo/YHn7Od4bTxhOo63CKMeXuoLxr+XABvH9UPaSL2mG0hnUOhYf/tkJYF qG4Pcjm5A10yyqplITAVeca3sBXPhm+a7rpr1THDidJ4Ina9akc4BUceJBc9iDjWEpQa mWpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oTF8UsYm; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 2sor1595430ljq.56.2020.10.06.09.05.28 for (Google Transport Security); Tue, 06 Oct 2020 09:05:28 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oTF8UsYm; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OwoCSmfxLGjvt1o0N+0EiCnK4lbyycGM//QYdUZDGlU=; b=oTF8UsYmfg+TFpK0V8akH8qv2XJgpNyqWeUQHdVUXkNtf132IjWE4EF5DiVDrzjuKC ha5LTVMufN2CjeKbR816/JtDpe6AQ6z66HjBxvLrQxYONwiJypn2wlIG6dTxI50APNk5 0rqmDQEcmwTWZyYDrJRFNKSFX9dZHt5xXxwNEN+QmJH7GgdzGStfeGMIpEuanZNwINGb e+3GMnQoyLbFn70Wg3zpnIOVPbrcxJr1NjzjqJVFakMNwRJGRhTruq6R/VSqg+FAViJ1 opKd4lFS63d6n5FrmRvd9a6GDlwAeyvdxbXZb/8QrHLa/4nqRBVnNL7urnUg0h/Gc0DD nLCQ== 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:mime-version:content-transfer-encoding; bh=OwoCSmfxLGjvt1o0N+0EiCnK4lbyycGM//QYdUZDGlU=; b=o9I5Wf6QN04SOlhXAeGxoxEHxcUWFrQeWZ9pcwu2scqEYmn7YJpI+2hpQgy/M/MTUW nKQ2Qgda2tjxTiUfzGZ43F0lVqB1mlZxBKfV55Z/6c7afn7FZBTwogy+E9g4KasIlhGP kw28gQq2bPV8DRdoR+uzHuI8Fq+2lVb/jUW4SIUU1T/SS6NM4Qii2nGk340kbJlzJs7n 3qYuxbdZT3CQG/1Rf2s9D+bRW7YgZ1kozs10z0KfIc19fU6GZOtRD8qY4GnGfG2l/KH3 RHERFpBnPxr4k+SahbCL7iL/+uX3d31JjjHJho0P/JQg/LOTsyO5j8Ql3Kq4aUsPEh83 VuGw== X-Gm-Message-State: AOAM533dHcljri0IyyGt2qrP0+zY8eFMgKnfQ8ik8RtF2/MAYs64HEhN fZ2YTNJVGsU8KOE3fG89dSIryhGc X-Google-Smtp-Source: ABdhPJyK6GFnxxaPzlRZzyqp1dUcsyX1BZVo9YC5jkTtBCuubAbjnNvASa8/UOvQO+5ydWM8eAcE4A== X-Received: by 2002:a05:651c:10cc:: with SMTP id l12mr1934994ljn.351.1602000328219; Tue, 06 Oct 2020 09:05:28 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-180-91.NA.cust.bahnhof.se. [98.128.180.91]) by smtp.gmail.com with ESMTPSA id c16sm640925lfc.304.2020.10.06.09.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 09:05:27 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Nishanth Menon , linux-pm@vger.kernel.org Cc: Aaro Koskinen , Tony Lindgren , Andy Gross , Bjorn Andersson , Niklas Cassel , Heiko Stuebner , Ulf Hansson , Kevin Hilman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 1/4] power: avs: qcom-cpr: Move the driver to the qcom specific drivers Date: Tue, 6 Oct 2020 18:05:13 +0200 Message-Id: <20201006160516.319830-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201006160516.319830-1-ulf.hansson@linaro.org> References: <20201006160516.319830-1-ulf.hansson@linaro.org> MIME-Version: 1.0 The avs drivers are all SoC specific drivers that doesn't share any code. Instead they are located in a directory, mostly to keep similar functionality together. From a maintenance point of view, it makes better sense to collect SoC specific drivers like these, into the SoC specific directories. Therefore, let's move the qcom-cpr driver to the qcom directory. Cc: Niklas Cassel Cc: Bjorn Andersson Cc: Andy Gross Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Ulf Hansson --- MAINTAINERS | 2 +- drivers/power/avs/Kconfig | 16 ---------------- drivers/power/avs/Makefile | 1 - drivers/soc/qcom/Kconfig | 16 ++++++++++++++++ drivers/soc/qcom/Makefile | 1 + drivers/{power/avs/qcom-cpr.c => soc/qcom/cpr.c} | 0 6 files changed, 18 insertions(+), 18 deletions(-) rename drivers/{power/avs/qcom-cpr.c => soc/qcom/cpr.c} (100%) -- 2.25.1 Acked-by: Bjorn Andersson Acked-by: Niklas Cassel diff --git a/MAINTAINERS b/MAINTAINERS index 4f1a56f6efaa..f51dd1944fe6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14337,7 +14337,7 @@ L: linux-pm@vger.kernel.org L: linux-arm-msm@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/power/avs/qcom,cpr.txt -F: drivers/power/avs/qcom-cpr.c +F: drivers/soc/qcom/cpr.c QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096 M: Ilia Lin diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig index cdb4237bfd02..089b6244b716 100644 --- a/drivers/power/avs/Kconfig +++ b/drivers/power/avs/Kconfig @@ -12,22 +12,6 @@ menuconfig POWER_AVS Say Y here to enable Adaptive Voltage Scaling class support. -config QCOM_CPR - tristate "QCOM Core Power Reduction (CPR) support" - depends on POWER_AVS && HAS_IOMEM - select PM_OPP - select REGMAP - help - Say Y here to enable support for the CPR hardware found on Qualcomm - SoCs like QCS404. - - This driver populates CPU OPPs tables and makes adjustments to the - tables based on feedback from the CPR hardware. If you want to do - CPUfrequency scaling say Y here. - - To compile this driver as a module, choose M here: the module will - be called qcom-cpr - config ROCKCHIP_IODOMAIN tristate "Rockchip IO domain support" depends on POWER_AVS && ARCH_ROCKCHIP && OF diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile index 9007d05853e2..a1b8cd453f19 100644 --- a/drivers/power/avs/Makefile +++ b/drivers/power/avs/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o -obj-$(CONFIG_QCOM_CPR) += qcom-cpr.o obj-$(CONFIG_ROCKCHIP_IODOMAIN) += rockchip-io-domain.o diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 3dc3e3d61ea3..6a3b69b43ad5 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -26,6 +26,22 @@ config QCOM_COMMAND_DB resource on a RPM-hardened platform must use this database to get SoC specific identifier and information for the shared resources. +config QCOM_CPR + tristate "QCOM Core Power Reduction (CPR) support" + depends on ARCH_QCOM && HAS_IOMEM + select PM_OPP + select REGMAP + help + Say Y here to enable support for the CPR hardware found on Qualcomm + SoCs like QCS404. + + This driver populates CPU OPPs tables and makes adjustments to the + tables based on feedback from the CPR hardware. If you want to do + CPUfrequency scaling say Y here. + + To compile this driver as a module, choose M here: the module will + be called qcom-cpr + config QCOM_GENI_SE tristate "QCOM GENI Serial Engine Driver" depends on ARCH_QCOM || COMPILE_TEST diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 93392d9dc7f7..ad675a6593d0 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -3,6 +3,7 @@ CFLAGS_rpmh-rsc.o := -I$(src) obj-$(CONFIG_QCOM_AOSS_QMP) += qcom_aoss.o obj-$(CONFIG_QCOM_GENI_SE) += qcom-geni-se.o obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o +obj-$(CONFIG_QCOM_CPR) += cpr.o obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o obj-$(CONFIG_QCOM_OCMEM) += ocmem.o diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/soc/qcom/cpr.c similarity index 100% rename from drivers/power/avs/qcom-cpr.c rename to drivers/soc/qcom/cpr.c