From: Zhou weixin <zwx@rock-chips.com>
Date: Wed, 17 Aug 2016 02:18:30 +0000 (+0800)
Subject: pwm: rockchip: Make pwm polarity to be configured correctly
X-Git-Tag: firefly_0821_release~1696
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=487c53d3b909cbee287e153bc19885637235f495;p=firefly-linux-kernel-4.4.55.git

pwm: rockchip: Make pwm polarity to be configured correctly

If pwm polarity was configured with different values at uboot,
the enable_conf would not be configured correctly.

Change-Id: I55b9ccc262382951a8a82810f1be74ce9460f266
Signed-off-by: Zhou weixin <zwx@rock-chips.com>
---

diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index f11e1fc9f97b..beab624fb9d9 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -89,6 +89,7 @@ static void rockchip_pwm_set_enable_v2(struct pwm_chip *chip,
 		enable_conf |= PWM_DUTY_POSITIVE | PWM_INACTIVE_NEGATIVE;
 
 	val = readl_relaxed(pc->base + pc->data->regs.ctrl);
+	val &= ~(GENMASK(5, 0) | BIT(8));
 
 	if (enable)
 		val |= enable_conf;