Merge back staging AVS changes for v4.21. (c76aa322) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/power/avs/smartreflex.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@
		static LIST_HEAD(sr_list);

		static struct omap_sr_class_data *sr_class;
		static struct omap_sr_pmic_data *sr_pmic_data;
		static struct dentry *sr_dbg_dir;

		static inline void sr_write_reg(struct omap_sr *sr, unsigned offset, u32 value)
		@@ -780,25 +779,6 @@ void omap_sr_disable_reset_volt(struct voltagedomain *voltdm)
		sr_class->disable(sr, 1);
		}

		/**
		* omap_sr_register_pmic() - API to register pmic specific info.
		* @pmic_data: The structure containing pmic specific data.
		*
		* This API is to be called from the PMIC specific code to register with
		* smartreflex driver pmic specific info. Currently the only info required
		* is the smartreflex init on the PMIC side.
		*/
		void omap_sr_register_pmic(struct omap_sr_pmic_data *pmic_data)
		{
		if (!pmic_data) {
		pr_warn("%s: Trying to register NULL PMIC data structure with smartreflex\n",
		__func__);
		return;
		}

		sr_pmic_data = pmic_data;
		}

		/* PM Debug FS entries to enable and disable smartreflex. */
		static int omap_sr_autocomp_show(void data, u64 val)
		{
		@@ -1065,17 +1045,6 @@ static int __init sr_init(void)
		{
		int ret = 0;

		/*
		* sr_init is a late init. If by then a pmic specific API is not
		* registered either there is no need for anything to be done on
		* the PMIC side or somebody has forgotten to register a PMIC
		* handler. Warn for the second condition.
		*/
		if (sr_pmic_data && sr_pmic_data->sr_pmic_init)
		sr_pmic_data->sr_pmic_init();
		else
		pr_warn("%s: No PMIC hook to init smartreflex\n", __func__);

		ret = platform_driver_register(&smartreflex_driver);
		if (ret) {
		pr_err("%s: platform driver register failed for SR\n",

include/linux/power/smartreflex.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -303,9 +303,6 @@ void omap_sr_enable(struct voltagedomain *voltdm);
		void omap_sr_disable(struct voltagedomain *voltdm);
		void omap_sr_disable_reset_volt(struct voltagedomain *voltdm);

		/* API to register the pmic specific data with the smartreflex driver. */
		void omap_sr_register_pmic(struct omap_sr_pmic_data *pmic_data);

		/* Smartreflex driver hooks to be called from Smartreflex class driver */
		int sr_enable(struct omap_sr *sr, unsigned long volt);
		void sr_disable(struct omap_sr *sr);
		@@ -320,7 +317,5 @@ static inline void omap_sr_enable(struct voltagedomain *voltdm) {}
		static inline void omap_sr_disable(struct voltagedomain *voltdm) {}
		static inline void omap_sr_disable_reset_volt(
		struct voltagedomain *voltdm) {}
		static inline void omap_sr_register_pmic(
		struct omap_sr_pmic_data *pmic_data) {}
		#endif
		#endif