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 From patchwork Tue Oct 6 16:05:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 314110 Delivered-To: patches@linaro.org Received: by 2002:a92:d603:0:0:0:0:0 with SMTP id w3csp710347ilm; Tue, 6 Oct 2020 09:05:31 -0700 (PDT) X-Received: by 2002:a2e:7e10:: with SMTP id z16mr2079236ljc.439.1602000330917; Tue, 06 Oct 2020 09:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602000330; cv=none; d=google.com; s=arc-20160816; b=Uk3cTNY6QQ3kPj1UMmPDWSCO3yjQlA3IX7q7/0B1G5Ik4oRroPHwnIG/o7IOGDiJKR J54vah2efBqbNst6OR5FrVdhohLJ8O5Q8ImY2u6arKMyNdxKQXUyaHJx0gkGbYPMfBw9 J1X7qbgRY3l93MayCUUdDniVrEbj0aZlsUT4zMqPbgMn3fzQXmX4yUrwsvy1pOnxz+C8 7zXn9hacyKnu8sdpssq+pVtc+TJKzMe8r7q4Q5isW1NWeaW3SwDrv4vCcxm+mt9lO7c1 z+C/s7hNBETuXmxg2K+wB6qCMP3/qQYRSnfkpi7hNzlmsio9yKYz1uH6QaCm4WfUxKtG jHdQ== 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=NF7N2mRAW3S3z+E29H9n2GJWFQgwjLjZu6wXpmNrAjA=; b=qAg7CfWX6BtJWjzG/NN26eeipvlGF2In7C0Gm5GSXsIQGyRQF3NN/WmIHNfqwHiseC JEsw2DG+sbvKoMyUkxStmaeZcBRbyP56yQ5LcK/TRGfQ+d+cDII8XTn+ixJ9Jo+2BnP/ 9dN7Qf5Umxwo9tgOrkknZIuLPVdnumiHHPAXRNi6t56wtY5ig13+2hFntPVG2FeMu6eM CvJ8R93Ls9yOmdADEuHedq0qxe1CKt9VsxhbRmJCF1Zhd5Z2cWXhEzm2eFT70x9SKwQe hx9OWx73xBBqNgJz4XeZ1OKAs83VbDjrIYjbHjmibNDqklFp2LfkB5um6UTbTPeqZsTu LF8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QnuSjKv9; 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 u5sor1552004lji.47.2020.10.06.09.05.30 for (Google Transport Security); Tue, 06 Oct 2020 09:05:30 -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=QnuSjKv9; 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=NF7N2mRAW3S3z+E29H9n2GJWFQgwjLjZu6wXpmNrAjA=; b=QnuSjKv9RKJSS9usSHdc3csUNh37+SWBojV0KbiqRB/uUTyHw3PUCuPMbBoNLbSxch ctAIEo0CDVjKJevPf8p4VuE6HubydpRxVZc5eeZYpcPCPuuydsALWD1AsCayyx2NYnUO zyaCyTWKvoPYy/StmNcDNA20FouWPO/eLpEL/w6uUaDJl/xgZVobJnAY/bclDGlibLEB VhtT98t14R2Wn5t2aOyfegJrVQG58LgYY1pesyCRO2hrouJk5XVsSuFAKCVmAJa/CaGL P0BTqIS0stb/5p33JCdbJ1247LON+riDWu/XaHSTEniorXOPZ7QsRmYRWlyd2qbVXntJ 5AMA== 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=NF7N2mRAW3S3z+E29H9n2GJWFQgwjLjZu6wXpmNrAjA=; b=b7q+xGEOd6UhQ9t3IoUT7ul9wmdPiUqSYwf7YGSg7a+E1kVMNBBsPgp6ofP6uDbEUb 6V7EZi2SdpVY7UB07CD5qqTf73BOaTouo5WLMHSB47qpYXBVZ4j3UoemwAtC4yr4ekOd AYh8gncsESalLDYXerYdwQpsYkVsM1iQwEbQT5/N58ZYOEMYMC6qxSRJ2ZDwpfD8XD6Y HCvpkBV68p4iWb0YpkEze3f4fG2bNDNcoec/9NLFI3Tl0547vo0CUw25j/pYIKI6x4ay 2qBB2BWgzftDD4zPSxKCOVpG5sc4u9w+iLLFyM3EHoaWmHg+hDSYqytyms+ro+PDWKr8 v3gw== X-Gm-Message-State: AOAM532Biz7ilQh3w1BLHBZyIFHktbHDmmGkwyF1t47m9btO1F8rWaCw Z0Oy5r/OzY/+2CRxs9wWhqXljcx8 X-Google-Smtp-Source: ABdhPJzFR1bW78+ImmzRtpoOmMSKfadbIQz9q34xFBp+SWTiAX3i+KDBgDh1vUYYVDcwMdNCwHBdFQ== X-Received: by 2002:a2e:97c1:: with SMTP id m1mr2005098ljj.289.1602000330485; Tue, 06 Oct 2020 09:05:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 09:05:29 -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-rockchip@lists.infradead.org Subject: [PATCH 2/4] power: avs: rockchip-io: Move the driver to the rockchip specific drivers Date: Tue, 6 Oct 2020 18:05:14 +0200 Message-Id: <20201006160516.319830-3-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 rockchip-io driver to the rockchip directory. Cc: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org Signed-off-by: Ulf Hansson --- drivers/power/avs/Kconfig | 8 -------- drivers/power/avs/Makefile | 1 - drivers/soc/rockchip/Kconfig | 8 ++++++++ drivers/soc/rockchip/Makefile | 1 + .../avs/rockchip-io-domain.c => soc/rockchip/io-domain.c} | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename drivers/{power/avs/rockchip-io-domain.c => soc/rockchip/io-domain.c} (100%) -- 2.25.1 Acked-by: Heiko Stuebner diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig index 089b6244b716..9dde5a7e75c9 100644 --- a/drivers/power/avs/Kconfig +++ b/drivers/power/avs/Kconfig @@ -11,11 +11,3 @@ menuconfig POWER_AVS AVS is also called SmartReflex on OMAP devices. Say Y here to enable Adaptive Voltage Scaling class support. - -config ROCKCHIP_IODOMAIN - tristate "Rockchip IO domain support" - depends on POWER_AVS && ARCH_ROCKCHIP && OF - help - Say y here to enable support io domains on Rockchip SoCs. It is - necessary for the io domain setting of the SoC to match the - voltage supplied by the regulators. diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile index a1b8cd453f19..d541d436f01d 100644 --- a/drivers/power/avs/Makefile +++ b/drivers/power/avs/Makefile @@ -1,3 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o -obj-$(CONFIG_ROCKCHIP_IODOMAIN) += rockchip-io-domain.o diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig index b71b73bf5fc5..2c13bf4dd5db 100644 --- a/drivers/soc/rockchip/Kconfig +++ b/drivers/soc/rockchip/Kconfig @@ -14,6 +14,14 @@ config ROCKCHIP_GRF In a lot of cases there also need to be default settings initialized to make some of them conform to expectations of the kernel. +config ROCKCHIP_IODOMAIN + tristate "Rockchip IO domain support" + depends on OF + help + Say y here to enable support io domains on Rockchip SoCs. It is + necessary for the io domain setting of the SoC to match the + voltage supplied by the regulators. + config ROCKCHIP_PM_DOMAINS bool "Rockchip generic power domain" depends on PM diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile index afca0a4c4b72..875032f7344e 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -3,4 +3,5 @@ # Rockchip Soc drivers # obj-$(CONFIG_ROCKCHIP_GRF) += grf.o +obj-$(CONFIG_ROCKCHIP_IODOMAIN) += io-domain.o obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm_domains.o diff --git a/drivers/power/avs/rockchip-io-domain.c b/drivers/soc/rockchip/io-domain.c similarity index 100% rename from drivers/power/avs/rockchip-io-domain.c rename to drivers/soc/rockchip/io-domain.c From patchwork Tue Oct 6 16:05:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 286837 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 E944DC4727D for ; Tue, 6 Oct 2020 16:05:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A419220760 for ; Tue, 6 Oct 2020 16:05:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XTuI/Ivr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726482AbgJFQFi (ORCPT ); Tue, 6 Oct 2020 12:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726476AbgJFQFe (ORCPT ); Tue, 6 Oct 2020 12:05:34 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09CEAC0613D2 for ; Tue, 6 Oct 2020 09:05:34 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id i2so383913ljg.4 for ; Tue, 06 Oct 2020 09:05:33 -0700 (PDT) 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=UmR0SlEWURAW2elKIdEQMMvc/1QuzUmp8HMEYH38pRg=; b=XTuI/IvrPTmTwnj0muDXHYNo+Knzu3pD/1v+EPUlOhh8MomeTzxfWg9rRWDAC1wq65 Bofwwo8Kgj+Hk8HfSeZzbpJ+x7QwK2pe5tRbIbSScidtLDaUberFDDPilHpn96Qrwc8L ziHnESuMxpDuWb0JudgWCK/8+/OlICRZsvJxcyJQNn1NkNdUNv4UHeVVzm5fP3jWzejO +FU3HB866iJKKCzL3Hj7hP1uiQk53lIWWKaOLOj+y1yNcQANV1F0HPk7acpOOjFAqjAY SzED3epUcCQcaZIgKJBFpfaOpjoX8RmNSRDsb/BEwCs1tw2bhnpv3m79AIEdaQoNroiJ nvbQ== 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=UmR0SlEWURAW2elKIdEQMMvc/1QuzUmp8HMEYH38pRg=; b=CbWREk8JVjYeOXr1WziBKrF4ANFU/ZW8fElxUGg4okEIUn3K3mTOnLgb0hloFqSzcH tUR3wQvzDeth73axsdLQ3Ny455HgEZPPGi9xctWflETUYtzTf2jPE58lE1ZrTqWBxfgy mrzPUQZin99PhEw0XpCkJ28xecCwlIQ4aDmpWIf8Da60aI8F98a4LI58ag6bRUwyOsCM nQUJ/1m+67X3JAxagCgot3ZiZz2C1Q+5u0r8X8sRsHdQMoqd28MUNp/b2ZKwiJXtn2so 8Mf8esPVi6HwxLsoBThykT7DwN0t5bpiMnBA8l6K/LIG0LFn5lIZgOVKZJuKGAnlq4bw NKUQ== X-Gm-Message-State: AOAM531ilJpG1hEjeaR5/PuQuIk7BJ2FKGznkdLrNfo2CIBSAanNBmhY YXcoJCjtfa/VNDH8eLTHzh6ygw== X-Google-Smtp-Source: ABdhPJyi6RdtOBXKlyt4bbuOXMx88hSWlD9kRRFs5wMLr4ncUfI/9TRNKYoh8EIsD5SFS161i+uVkQ== X-Received: by 2002:a2e:7404:: with SMTP id p4mr2203467ljc.360.1602000332417; Tue, 06 Oct 2020 09:05:32 -0700 (PDT) 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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 09:05:31 -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-omap@vger.kernel.org Subject: [PATCH 3/4] power: avs: smartreflex Move driver to soc specific drivers Date: Tue, 6 Oct 2020 18:05:15 +0200 Message-Id: <20201006160516.319830-4-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 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 smartreflex driver for OMAP to the ti directory. Cc: Nishanth Menon Cc: Aaro Koskinen Cc: Tony Lindgren Cc: linux-omap@vger.kernel.org Signed-off-by: Ulf Hansson Reviewed-by: Nishanth Menon --- MAINTAINERS | 4 ++-- arch/arm/plat-omap/Kconfig | 2 +- drivers/power/avs/Kconfig | 12 ------------ drivers/power/avs/Makefile | 1 - drivers/soc/ti/Makefile | 1 + drivers/{power/avs => soc/ti}/smartreflex.c | 0 6 files changed, 4 insertions(+), 16 deletions(-) rename drivers/{power/avs => soc/ti}/smartreflex.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f51dd1944fe6..040f0506d1c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5379,11 +5379,11 @@ F: include/linux/debugfs.h F: include/linux/kobj* F: lib/kobj* -DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS) +DRIVERS FOR OMAP ADAPTIVE VOLTAGE SCALING (AVS) M: Nishanth Menon L: linux-pm@vger.kernel.org S: Maintained -F: drivers/power/avs/ +F: drivers/soc/ti/smartreflex.c F: include/linux/power/smartreflex.h DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 93fd7fc537cf..272670ef1e92 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -23,7 +23,7 @@ config OMAP_DEBUG_LEDS config POWER_AVS_OMAP bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" - depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM + depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM select POWER_SUPPLY help Say Y to enable AVS(Adaptive Voltage Scaling) diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig index 9dde5a7e75c9..a4e40e534e6a 100644 --- a/drivers/power/avs/Kconfig +++ b/drivers/power/avs/Kconfig @@ -1,13 +1 @@ # SPDX-License-Identifier: GPL-2.0-only -menuconfig POWER_AVS - bool "Adaptive Voltage Scaling class support" - help - AVS is a power management technique which finely controls the - operating voltage of a device in order to optimize (i.e. reduce) - its power consumption. - At a given operating point the voltage is adapted depending on - static factors (chip manufacturing process) and dynamic factors - (temperature depending performance). - AVS is also called SmartReflex on OMAP devices. - - Say Y here to enable Adaptive Voltage Scaling class support. diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile index d541d436f01d..a4e40e534e6a 100644 --- a/drivers/power/avs/Makefile +++ b/drivers/power/avs/Makefile @@ -1,2 +1 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index 1110e5c98685..5463431ec96c 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_TI_SCI_PM_DOMAINS) += ti_sci_pm_domains.o obj-$(CONFIG_TI_SCI_INTA_MSI_DOMAIN) += ti_sci_inta_msi.o obj-$(CONFIG_TI_K3_RINGACC) += k3-ringacc.o obj-$(CONFIG_TI_K3_SOCINFO) += k3-socinfo.o +obj-$(CONFIG_POWER_AVS_OMAP) += smartreflex.o diff --git a/drivers/power/avs/smartreflex.c b/drivers/soc/ti/smartreflex.c similarity index 100% rename from drivers/power/avs/smartreflex.c rename to drivers/soc/ti/smartreflex.c From patchwork Tue Oct 6 16:05:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 286836 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 79D51C41604 for ; Tue, 6 Oct 2020 16:05:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 39EF920789 for ; Tue, 6 Oct 2020 16:05:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IP0AxjwD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbgJFQFh (ORCPT ); Tue, 6 Oct 2020 12:05:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726482AbgJFQFh (ORCPT ); Tue, 6 Oct 2020 12:05:37 -0400 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2469C0613D5 for ; Tue, 6 Oct 2020 09:05:35 -0700 (PDT) Received: by mail-lf1-x143.google.com with SMTP id a9so6260031lfc.7 for ; Tue, 06 Oct 2020 09:05:35 -0700 (PDT) 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=3sbRqka7VOpWJvR8NFku+h5QvbiHvJEFttxv9N2qOng=; b=IP0AxjwDsHlI6+fSO0IUC3LWgmNJ5GLuT544dFAtlVKq1qD3XPtIVFUpEi7yHfS6Xj BGRxyBBD9nrwbW+23IcFzr913gf27EXknEneMDMSmJJBhhxuELEp4V+lW9hx93fl4CHI E7QMdwustdUqe4jXudHTP5mh8WZ9eIpP+BxaLJQvKCj2aB6fvdBId4y3Wevv72/RgcFa 7uPkHNZOK9h5WaAQt+pGyzs/Fe9o3CBGv9JhAf/fQD5oYHdQyEUC56poI+3fx5kcYM6E 0A6+Lj7izWYQaZPwS8hHTI+cN0P/MjZ8/+uI5qMieARE2sGFI9iLwxHlgUMWgmIQXnDE GcRw== 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=3sbRqka7VOpWJvR8NFku+h5QvbiHvJEFttxv9N2qOng=; b=kPnY3wGQnnPVYm8d9koQMX+ZYUWxpjmUVvMC0LCyx9rOF9FXpl7ZO3oaGKVdFFisoX fcBRzC878YWvYSVtTw8pZYmkEoOGbASvgWW/c4HAu+2h1kl7ms0AlZ2dSx2SBSrhChN+ xT9x8tOZ+4zVWqg+vtXhiOvlckMD6mlVX5QUmMBXRVh3ujyHIQDCsxw0sh/wsMy2OFga 4mf6A9cP+nMAnJhr3yE9zIHMtiyytBBSKFzNmAE1A+vgnVB8SxEwcIWvmhi5d//nacXf e0Vi3AUNzWgFXK1bFFtFUPmMmT632PwRC4ZbjYTYv6rZ5n8XrmK08atsIUFcuYT1CddT zj3w== X-Gm-Message-State: AOAM530thBtfKKwfvThppgD/cmiNMX0tnUOUKoCOTVcafna/iBeisubF piEk2aGCx6PdGVByF7u/Ey7TQw== X-Google-Smtp-Source: ABdhPJyPCOhGePPMb/XByxcKzn/y0EtL47PskUp7B2kWgWNliuG/yslxxaxmERCk5i9tfPa/xyg9lw== X-Received: by 2002:ac2:5496:: with SMTP id t22mr723232lfk.43.1602000334219; Tue, 06 Oct 2020 09:05:34 -0700 (PDT) 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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 09:05:33 -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 Subject: [PATCH 4/4] power: avs: Drop the avs directory and the corresponding Kconfig Date: Tue, 6 Oct 2020 18:05:16 +0200 Message-Id: <20201006160516.319830-5-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 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org All avs drivers have now been moved to their corresponding soc specific directories. Additionally, they don't depend on the POWER_AVS Kconfig anymore. Therefore, let's simply drop the drivers/power/avs directory altogether. Cc: Nishanth Menon Signed-off-by: Ulf Hansson Reviewed-by: Nishanth Menon --- drivers/power/Kconfig | 1 - drivers/power/Makefile | 1 - drivers/power/avs/Kconfig | 1 - drivers/power/avs/Makefile | 1 - 4 files changed, 4 deletions(-) delete mode 100644 drivers/power/avs/Kconfig delete mode 100644 drivers/power/avs/Makefile diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index ff0350ca3b74..696bf77a7042 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -source "drivers/power/avs/Kconfig" source "drivers/power/reset/Kconfig" source "drivers/power/supply/Kconfig" diff --git a/drivers/power/Makefile b/drivers/power/Makefile index b7c2e372186b..effbf0377f32 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_POWER_AVS) += avs/ obj-$(CONFIG_POWER_RESET) += reset/ obj-$(CONFIG_POWER_SUPPLY) += supply/ diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig deleted file mode 100644 index a4e40e534e6a..000000000000 --- a/drivers/power/avs/Kconfig +++ /dev/null @@ -1 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile deleted file mode 100644 index a4e40e534e6a..000000000000 --- a/drivers/power/avs/Makefile +++ /dev/null @@ -1 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only