Skip to contentSkip to conversation

spmi: pmic_arb: make selectable on ARCH_QCOM

PATCH In review Josh Cartwright 2 participants 3 messages Mar 3, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 spmi: pmic_arb: make selectable on ARCH_QCOM

With the split of Qualcomm MSM support into legacy and multiplatform, the SPMI PMIC arb driver is only relevant on the multiplatform supported SoCs. Switch the Kconfig depends to ARCH_QCOM.

---
 drivers/spmi/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spmi/Kconfig +2 -2
index 075bd79..bf1295e 100644
@@ -14,8 +14,8 @@ config SPMI_MSM_PMIC_ARB
 	tristate "Qualcomm MSM SPMI Controller (PMIC Arbiter)"
 	depends on ARM
 	depends on IRQ_DOMAIN
-	depends on ARCH_MSM || COMPILE_TEST
-	default ARCH_MSM
+	depends on ARCH_QCOM || COMPILE_TEST
+	default ARCH_QCOM
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in SPMI PMIC Arbiter interface on Qualcomm MSM family
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw

PATCH 2/2 spmi: pm: drop bus-level PM suspend/resume routines

SPMI defines the behavior of a device in the "SLEEP" state as being "user-defined or specified by the device manufacturer". Without clearly-defined bus-level semantics for low-power states, push the responsibility of transitioning a device into/out of "SLEEP" into SPMI device drivers.

---
 drivers/spmi/spmi.c | 35 -----------------------------------
 1 file changed, 35 deletions(-)
drivers/spmi/spmi.c +0 -35
index 6122c8f..3b57807 100644
@@ -46,40 +46,6 @@ static const struct device_type spmi_ctrl_type = {
 	.release	= spmi_ctrl_release,
 };
 
-#ifdef CONFIG_PM_RUNTIME
-static int spmi_runtime_suspend(struct device *dev)
-{
-	struct spmi_device *sdev = to_spmi_device(dev);
-	int err;
-
-	err = pm_generic_runtime_suspend(dev);
-	if (err)
-		return err;
-
-	return spmi_command_sleep(sdev);
-}
-
-static int spmi_runtime_resume(struct device *dev)
-{
-	struct spmi_device *sdev = to_spmi_device(dev);
-	int err;
-
-	err = spmi_command_wakeup(sdev);
-	if (err)
-		return err;
-
-	return pm_generic_runtime_resume(dev);
-}
-#endif
-
-static const struct dev_pm_ops spmi_pm_ops = {
-	SET_RUNTIME_PM_OPS(
-		spmi_runtime_suspend,
-		spmi_runtime_resume,
-		NULL
-	)
-};
-
 static int spmi_device_match(struct device *dev, struct device_driver *drv)
 {
 	if (of_driver_match_device(dev, drv))
@@ -391,7 +357,6 @@ static int spmi_drv_remove(struct device *dev)
 static struct bus_type spmi_bus_type = {
 	.name		= "spmi",
 	.match		= spmi_device_match,
-	.pm		= &spmi_pm_ops,
 	.probe		= spmi_drv_probe,
 	.remove		= spmi_drv_remove,
 };
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
Acked-by on v1 1/2
#2 lore raw
In reply to Josh Cartwright
Quoted 15 lines · Josh Cartwright

With the split of Qualcomm MSM support into legacy and multiplatform, the SPMI PMIC arb driver is only relevant on the multiplatform supported SoCs. Switch the Kconfig depends to ARCH_QCOM.

---
drivers/spmi/Kconfig | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spmi/Kconfig +0 -0
index 075bd79..bf1295e 100644

drivers/spmi/Kconfig config SPMI_MSM_PMIC_ARB · line 21

Quoted 10 lines
drivers/spmi/Kconfig +2 -2
@@ -14,8 +14,8 @@ config SPMI_MSM_PMIC_ARB
 	tristate "Qualcomm MSM SPMI Controller (PMIC Arbiter)"
 	depends on ARM
 	depends on IRQ_DOMAIN
-	depends on ARCH_MSM || COMPILE_TEST
-	default ARCH_MSM
+	depends on ARCH_QCOM || COMPILE_TEST
+	default ARCH_QCOM
 	help
 	  If you say yes to this option, support will be included for the
 	  built-in SPMI PMIC Arbiter interface on Qualcomm MSM family

- k

Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation