diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-23 18:12:32 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-23 18:12:32 +0200 |
| commit | 41c169d9ae2c890552044e129d101995b62c8a02 (patch) | |
| tree | c4d28be2ec8979fe6d8d59d9a7004cc9c7f2ef2c /MAINTAINERS | |
| parent | 71d47b53dee0a951417a1bc6d255a45c63cc51b1 (diff) | |
| parent | 785b5bb41b0a9b1d9173192dcdebe6e994d1f71a (diff) | |
Merge branch 'pm-avs'
* pm-avs:
PM: AVS: Drop the avs directory and the corresponding Kconfig
PM: AVS: qcom-cpr: Move the driver to the qcom specific drivers
PM: AVS: smartreflex Move driver to soc specific drivers
PM: AVS: rockchip-io: Move the driver to the rockchip specific drivers
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0f825bcc96bc..ef0964965d2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5395,11 +5395,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 <nm@ti.com> 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 @@ -14362,7 +14362,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 <ilia.lin@kernel.org> |