shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: quilt series cleanup: drop obsolete patches

Browse Source 
- drivers: qcom: rpmh-rsc: modularize RSC controller driver
 - its revert

Change-Id: I2c12ebf20be032d8fbedf2b792da6b85e62deba3
Signed-off-by: Matthias Maennich <maennich@google.com>
This commit is contained in:
Matthias Maennich
2019-10-21 22:25:19 +01:00
parent 4e4e0a14a1
commit 867c8c8cff
3 changed files with 0 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
patches/Revert-drivers-qcom-rpmh-rsc-modularize-RSC-controller-driver.patch
View File

@@ -1,63 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Quentin Perret <qperret@google.com>
Date: Thu, 26 Sep 2019 12:30:35 +0100
Subject: Revert "drivers: qcom: rpmh-rsc: modularize RSC controller driver"
This reverts commit 7cbdcba442ed26b789f5b3ab18b97e3aa2686bf0.
It breaks allmodconfig:
drivers/soc/qcom/rpmhpd.o: In function `rpmhpd_aggregate_corner':
rpmhpd.c:(.text+0x8f8): undefined reference to `rpmh_write'
rpmhpd.c:(.text+0x900): undefined reference to `rpmh_write_async'
rpmhpd.c:(.text+0x9c4): undefined reference to `rpmh_write_async'
rpmhpd.c:(.text+0xa3c): undefined reference to `rpmh_write_async'
It is not obvious that QCOM_RPMH should be tristate in the first place
when QCOM_RPMHPD needs it compiled in.
Bug: 140224784
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: I154b2d2b369c3654c41595bad91abd5a47d15206
---
drivers/soc/qcom/Kconfig | 2 +-
drivers/soc/qcom/rpmh-rsc.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 119a38bf373e..661e47acc354 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -102,7 +102,7 @@ config QCOM_RMTFS_MEM
Say y here if you intend to boot the modem remoteproc.
config QCOM_RPMH
- tristate "Qualcomm Technologies, Inc. RPM-Hardened (RPMH) Communication driver"
+ bool "Qualcomm RPM-Hardened (RPMH) Communication"
depends on ARCH_QCOM && ARM64 || COMPILE_TEST
help
Support for communication with the hardened-RPM blocks in
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c
index d7d9e1b8a4f1..e278fc11fe5c 100644
--- a/drivers/soc/qcom/rpmh-rsc.c
+++ b/drivers/soc/qcom/rpmh-rsc.c
@@ -11,7 +11,6 @@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/list.h>
-#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
@@ -688,7 +687,9 @@ static struct platform_driver rpmh_driver = {
.of_match_table = rpmh_drv_match,
},
};
-builtin_platform_driver(rpmh_driver);
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("Qualcomm Technologies, Inc. RPMH communication driver");
+static int __init rpmh_driver_init(void)
+{
+ return platform_driver_register(&rpmh_driver);
+}
+arch_initcall(rpmh_driver_init);

57
patches/drivers-qcom-rpmh-rsc-modularize-RSC-controller-driver.patch
View File

@@ -1,57 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lina Iyer <ilina@codeaurora.org>
Date: Thu, 29 Aug 2019 14:27:59 -0600
Subject: drivers: qcom: rpmh-rsc: modularize RSC controller driver
Enable RSC controller driver to be compiled as modules. Since RPMH
communication is need for enabling/disabling critical clocks and busses
needed for the application processor, it is better to keep this module
enabled. Hence declare the driver as a builtin platform driver.
Signed-off-by: Hridya Valsaraju <hridya@google.com>
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
Change-Id: I5e90b68bbf2c7ed3a2666e0687ff4ade40b9c7a3
---
drivers/soc/qcom/Kconfig | 2 +-
drivers/soc/qcom/rpmh-rsc.c | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 661e47acc354..119a38bf373e 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -102,7 +102,7 @@ config QCOM_RMTFS_MEM
Say y here if you intend to boot the modem remoteproc.
config QCOM_RPMH
- bool "Qualcomm RPM-Hardened (RPMH) Communication"
+ tristate "Qualcomm Technologies, Inc. RPM-Hardened (RPMH) Communication driver"
depends on ARCH_QCOM && ARM64 || COMPILE_TEST
help
Support for communication with the hardened-RPM blocks in
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c
index e278fc11fe5c..d7d9e1b8a4f1 100644
--- a/drivers/soc/qcom/rpmh-rsc.c
+++ b/drivers/soc/qcom/rpmh-rsc.c
@@ -11,6 +11,7 @@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/list.h>
+#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
@@ -687,9 +688,7 @@ static struct platform_driver rpmh_driver = {
.of_match_table = rpmh_drv_match,
},
};
+builtin_platform_driver(rpmh_driver);
-static int __init rpmh_driver_init(void)
-{
- return platform_driver_register(&rpmh_driver);
-}
-arch_initcall(rpmh_driver_init);
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Qualcomm Technologies, Inc. RPMH communication driver");

2
patches/series
View File

@@ -167,7 +167,6 @@ ANDROID-GKI-enable-CONFIG_SPI-for-x86.patch
ANDROID-GKI-enable-CONFIG_TIPC-for-x86.patch
ANDROID-Catch-rockpi4_defconfig-up-with-gki_defconfig.patch
ANDROID-first-pass-cuttlefish-GKI-modularization.patch
drivers-qcom-rpmh-rsc-modularize-RSC-controller-driver.patch
staging-ion-fix-off-by-1-error-in-heap-search.patch
staging-ion-uapi-match-the-existing-heap-type-enums.patch
staging-ion-export-ion_free-for-ion_heaps.patch
@@ -228,7 +227,6 @@ ANDROID-gki_defconfig-enable-accelerated-AES-and-SHA-256.patch
ANDROID-gki_defconfig-enabled-CONFIG_TMPFS-explicitly.patch
gki_defconfig-Enable-CONFIG_DM_SNAPSHOT.patch
ANDROID-Fix-x86_64-allmodconfig-build.patch
Revert-drivers-qcom-rpmh-rsc-modularize-RSC-controller-driver.patch
clk-add-pre-and-post-change-rate-callbacks.patch
ANDROID-gki_defconfig-enable-fs-verity.patch
UPSTREAM-base-soc-Handle-custom-soc-information-sysfs-entries.patch