bus/ti-pwmss: move TI PWMSS driver from PWM to bus subsystem

The TI PWMSS driver is a simple bus driver for providing power
power management for the PWM peripherals on TI AM33xx SoCs, namely
eCAP, eHRPWM and eQEP. The eQEP is a counter rather than a PWM, so
it does not make sense to have the bus driver in the PWM subsystem
since the PWMSS is not exclusive to PWM devices.

Signed-off-by: David Lechner <david@lechnology.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index 6b331061d34b895a7fd96a84e94cabf24c816685..3fab1dfd2e937d1ada6c6204055720b34f01a9e8 100644 (file)
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -150,6 +150,15 @@ config TEGRA_GMI
          Driver for the Tegra Generic Memory Interface bus which can be used
          to attach devices such as NOR, UART, FPGA and more.
 
+config  TI_PWMSS
+       bool
+       default y if (ARCH_OMAP2PLUS) && (PWM_TIECAP || PWM_TIEHRPWM)
+       help
+         PWM Subsystem driver support for AM33xx SOC.
+
+         PWM submodules require PWM config space access from submodule
+         drivers and require common parent driver support.
+
 config TI_SYSC
        bool "TI sysc interconnect target module driver"
        depends on ARCH_OMAP2PLUS

diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 16b43d3468c674653c1f422df4849fb6d7e9785d..1320bcf9fa9dcec42bb021403a44cdccfb173c91 100644 (file)
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_SUNXI_RSB)               += sunxi-rsb.o
 obj-$(CONFIG_SIMPLE_PM_BUS)    += simple-pm-bus.o
 obj-$(CONFIG_TEGRA_ACONNECT)   += tegra-aconnect.o
 obj-$(CONFIG_TEGRA_GMI)                += tegra-gmi.o
+obj-$(CONFIG_TI_PWMSS)         += ti-pwmss.o
 obj-$(CONFIG_TI_SYSC)          += ti-sysc.o
 obj-$(CONFIG_TS_NBUS)          += ts-nbus.o
 obj-$(CONFIG_UNIPHIER_SYSTEM_BUS)      += uniphier-system-bus.o

diff --git a/drivers/bus/ti-pwmss.c b/drivers/bus/ti-pwmss.c
new file mode 100644 (file)
index 0000000..e9c26c9
--- /dev/null
+++ b/drivers/bus/ti-pwmss.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * TI PWM Subsystem driver
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/pm_runtime.h>
+#include <linux/of_device.h>
+
+static const struct of_device_id pwmss_of_match[] = {
+       { .compatible   = "ti,am33xx-pwmss" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, pwmss_of_match);
+
+static int pwmss_probe(struct platform_device *pdev)
+{
+       int ret;
+       struct device_node *node = pdev->dev.of_node;
+
+       pm_runtime_enable(&pdev->dev);
+
+       /* Populate all the child nodes here... */
+       ret = of_platform_populate(node, NULL, NULL, &pdev->dev);
+       if (ret)
+               dev_err(&pdev->dev, "no child node found\n");
+
+       return ret;
+}
+
+static int pwmss_remove(struct platform_device *pdev)
+{
+       pm_runtime_disable(&pdev->dev);
+       return 0;
+}
+
+static struct platform_driver pwmss_driver = {
+       .driver = {
+               .name   = "pwmss",
+               .of_match_table = pwmss_of_match,
+       },
+       .probe  = pwmss_probe,
+       .remove = pwmss_remove,
+};
+
+module_platform_driver(pwmss_driver);
+
+MODULE_DESCRIPTION("PWM Subsystem driver");
+MODULE_AUTHOR("Texas Instruments");
+MODULE_LICENSE("GPL");

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index e3a2518503ed3ca769545dfe25df839204562b28..bd21655c37a6824d93b4c4ae23ec327a9370226c 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -508,15 +508,6 @@ config  PWM_TIEHRPWM
          To compile this driver as a module, choose M here: the module
          will be called pwm-tiehrpwm.
 
-config  PWM_TIPWMSS
-       bool
-       default y if (ARCH_OMAP2PLUS) && (PWM_TIECAP || PWM_TIEHRPWM)
-       help
-         PWM Subsystem driver support for AM33xx SOC.
-
-         PWM submodules require PWM config space access from submodule
-         drivers and require common parent driver support.
-
 config PWM_TWL
        tristate "TWL4030/6030 PWM support"
        depends on TWL4030_CORE

diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index 26326adf71d7bd088365ba2672923fb18302c2bb..9a475073dafcbb2a95d18bf499e65ff02b1a2a5d 100644 (file)
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_PWM_SUN4I)               += pwm-sun4i.o
 obj-$(CONFIG_PWM_TEGRA)                += pwm-tegra.o
 obj-$(CONFIG_PWM_TIECAP)       += pwm-tiecap.o
 obj-$(CONFIG_PWM_TIEHRPWM)     += pwm-tiehrpwm.o
-obj-$(CONFIG_PWM_TIPWMSS)      += pwm-tipwmss.o
 obj-$(CONFIG_PWM_TWL)          += pwm-twl.o
 obj-$(CONFIG_PWM_TWL_LED)      += pwm-twl-led.o
 obj-$(CONFIG_PWM_VT8500)       += pwm-vt8500.o

diff --git a/drivers/pwm/pwm-tipwmss.c b/drivers/pwm/pwm-tipwmss.c
deleted file mode 100644 (file)
index e9c26c9..0000000
--- a/drivers/pwm/pwm-tipwmss.c
+++ /dev/null
@@ -1,55 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * TI PWM Subsystem driver
- *
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/err.h>
-#include <linux/pm_runtime.h>
-#include <linux/of_device.h>
-
-static const struct of_device_id pwmss_of_match[] = {
-       { .compatible   = "ti,am33xx-pwmss" },
-       {},
-};
-MODULE_DEVICE_TABLE(of, pwmss_of_match);
-
-static int pwmss_probe(struct platform_device *pdev)
-{
-       int ret;
-       struct device_node *node = pdev->dev.of_node;
-
-       pm_runtime_enable(&pdev->dev);
-
-       /* Populate all the child nodes here... */
-       ret = of_platform_populate(node, NULL, NULL, &pdev->dev);
-       if (ret)
-               dev_err(&pdev->dev, "no child node found\n");
-
-       return ret;
-}
-
-static int pwmss_remove(struct platform_device *pdev)
-{
-       pm_runtime_disable(&pdev->dev);
-       return 0;
-}
-
-static struct platform_driver pwmss_driver = {
-       .driver = {
-               .name   = "pwmss",
-               .of_match_table = pwmss_of_match,
-       },
-       .probe  = pwmss_probe,
-       .remove = pwmss_remove,
-};
-
-module_platform_driver(pwmss_driver);
-
-MODULE_DESCRIPTION("PWM Subsystem driver");
-MODULE_AUTHOR("Texas Instruments");
-MODULE_LICENSE("GPL");