2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 0e0bfa035083..115b64453493 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -147,8 +147,7 @@ config PWM_TEGRA
 
 config  PWM_TIECAP
         tristate "ECAP PWM support"
-        depends on SOC_AM33XX
-        select PWM_TIPWMSS
+        depends on SOC_AM33XX || ARCH_DAVINCI_DA8XX
         help
           PWM driver support for the ECAP APWM controller found on AM33XX
           TI SOC
@@ -158,8 +157,7 @@ config  PWM_TIECAP
 
 config  PWM_TIEHRPWM
         tristate "EHRPWM PWM support"
-        depends on SOC_AM33XX
-        select PWM_TIPWMSS
+        depends on SOC_AM33XX || ARCH_DAVINCI_DA8XX
         help
           PWM driver support for the EHRPWM controller found on AM33XX
           TI SOC
@@ -169,7 +167,7 @@ config  PWM_TIEHRPWM
 
 config  PWM_TIPWMSS
         bool
-        depends on SOC_AM33XX && (PWM_TIEHRPWM || PWM_TIECAP)
+        default y if SOC_AM33XX && (PWM_TIECAP || PWM_TIEHRPWM)
         help
           PWM Subsystem driver support for AM33xx SOC.
 
diff --git a/drivers/pwm/pwm-tipwmss.h b/drivers/pwm/pwm-tipwmss.h
index 11f76a1e266b..10ad8040408b 100644
--- a/drivers/pwm/pwm-tipwmss.h
+++ b/drivers/pwm/pwm-tipwmss.h
@@ -18,7 +18,6 @@
 #ifndef __TIPWMSS_H
 #define __TIPWMSS_H
 
-#ifdef CONFIG_PWM_TIPWMSS
 /* PWM substem clock gating */
 #define PWMSS_ECAPCLK_EN        BIT(0)
 #define PWMSS_ECAPCLK_STOP_REQ  BIT(1)
@@ -28,6 +27,7 @@
 #define PWMSS_ECAPCLK_EN_ACK    BIT(0)
 #define PWMSS_EPWMCLK_EN_ACK    BIT(8)
 
+#ifdef CONFIG_PWM_TIPWMSS
 extern u16 pwmss_submodule_state_change(struct device *dev, int set);
 #else
 static inline u16 pwmss_submodule_state_change(struct device *dev, int set)