Merge branch 'for-4.3-rc/ti-clk-fixes' of https://github.com/t-kristo/linux-pm into clk-fixes

Pull fixes from Tero Kristo:

"A few TI clock driver fixes to pull against 4.3-rc"

* 'for-4.3-rc/ti-clk-fixes' of https://github.com/t-kristo/linux-pm: (3 commits)
  clk: ti: dflt: fix enable_reg validity check
  clk: ti: fix dual-registration of uart4_ick
  clk: ti: clk-7xx: Remove hardwired ABE clock configuration

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 66d6f0c5c421..d600fd5cd4ba 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -114,7 +114,7 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
         unsigned long long c;
         unsigned long period_cycles, duty_cycles, prescale;
         unsigned int period_ms;
-        bool enable = test_bit(PWMF_ENABLED, &pwm->flags);
+        bool enable = pwm_is_enabled(pwm);
         int wait_count = 0, fifoav;
         u32 cr, sr;
 
@@ -129,7 +129,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
                 sr = readl(imx->mmio_base + MX3_PWMSR);
                 fifoav = sr & MX3_PWMSR_FIFOAV_MASK;
                 if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
-                        period_ms = DIV_ROUND_UP(pwm->period, NSEC_PER_MSEC);
+                        period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
+                                                 NSEC_PER_MSEC);
                         msleep(period_ms);
 
                         sr = readl(imx->mmio_base + MX3_PWMSR);