Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit babfa388 authored by Quentin Perret's avatar Quentin Perret Committed by Alistair Delva
Browse files

Revert "drivers: qcom: rpmh-rsc: modularize RSC controller driver" 



This reverts commit 7cbdcba4.
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: default avatarQuentin Perret <qperret@google.com>
Change-Id: I154b2d2b369c3654c41595bad91abd5a47d15206
parent bacc1ef5

drivers/soc/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/soc/qcom/rpmh-rsc.c

+5 −4
Original line number Diff line number Diff line
@@ -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);