From patchwork Fri Apr 7 11:02:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 748172 X-Patchwork-Delegate: jh80.chung@samsung.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vzxWl00RRz9s7s for ; Fri, 7 Apr 2017 21:03:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gx6mBLuX"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 966A0C21C5E; Fri, 7 Apr 2017 11:03:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D7981C21C48; Fri, 7 Apr 2017 11:03:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A25DEC21C48; Fri, 7 Apr 2017 11:03:06 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id 01963C21C3F for ; Fri, 7 Apr 2017 11:03:06 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 79so14848351pgf.0 for ; Fri, 07 Apr 2017 04:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=T0qKJ1v+QbJwxXpF1GkjEOVjhcQZljWFM1gWlNhSLD8=; b=gx6mBLuX7ccBDwC+VtKYsH167PG4tf8oTYQljuhdbyJ6AqGogCzw7XWov9nBTRGd6U Kj/jEyco0lrHDlAX2Y+BQeZiVXpMMGTpLvaS19/4zfvbPT76uK36eyckkf+8OWlkbDrC BCpN2NQLETPX2Jp9DwpSwpl0xkFY9rMMbqsKUC6Lx/mJKRPBrVRLR7JeyrTNtV21D2hV lTTGljdt0//LdFuk7gjF/q6okIPa0VQy/FePAVeIpgBD42GrRs3sbUUqiH3Nkm0g9zIq OX8eib7RnGyY9Z4MlFL7z6MT4JzjlguudzUH/4QcLnuuZSba55SCyVRBHgE2L5BwEPi9 FRYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=T0qKJ1v+QbJwxXpF1GkjEOVjhcQZljWFM1gWlNhSLD8=; b=HV/u0w+CAnz49gbzQskm9fnkbaklM3WB19dc/ZDHj8wRn9rez2IGe0Gzs6zPXZTz58 dZRmR885rXrUoEUIuenNJkOiMbAy1j0hrnRyuT/tOwyQyjppZwqhUfRi0Yiy/yzdkAxF oOtf/6emFPuyWwNrmJW3tlmR9y/JeHkaXwLLJiO9TBozX734wXwI1/0Fv4OQeCDb/saj 4xr469w3MLbsx2KFVZFEqhoQkyTS/0Ta4X5r9h6kEUrgcu6rgvE6LI5vKhMgoYof3PGT EqUHnK740d4khvNkVVMqOIi/8AGWmyT0ceUrtuU/VnKU4hPWdOXEQ2N1wZi/Dogg/QGy PhTg== X-Gm-Message-State: AFeK/H3inavhi4xVhS3T7b9SIgs7AIR5dwndnrD4AZU33RY+g5yHQwaCdF/+SbuQIpfFDg== X-Received: by 10.99.169.10 with SMTP id u10mr26779345pge.26.1491562984494; Fri, 07 Apr 2017 04:03:04 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id v143sm9017014pgb.57.2017.04.07.04.03.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Apr 2017 04:03:03 -0700 (PDT) From: Kever Yang To: sjg@chromium.org Date: Fri, 7 Apr 2017 19:02:56 +0800 Message-Id: <1491562976-21917-1-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 Cc: u-boot@lists.denx.de, zhangqing@rock-chips.com Subject: [U-Boot] [PATCH] power: regulator: pwm: support pwm polarity setting X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The latest kernel PWM drivers enable the polarity settings. When system run from U-Boot to kerenl, if there are differences in polarity set or duty cycle, the PMW will re-init: close -> set polarity and duty cycle -> enable the PWM. The power supply controled by pwm regulator may have voltage shaking, which lead to the system not stable. Signed-off-by: Kever Yang --- drivers/power/regulator/pwm_regulator.c | 12 ++++++++++-- drivers/pwm/pwm-uclass.c | 10 ++++++++++ drivers/pwm/rk_pwm.c | 17 ++++++++++++++++- include/pwm.h | 9 +++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index 4875238..f8a6712 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -24,6 +24,8 @@ struct pwm_regulator_info { int pwm_id; /* the period of one PWM cycle */ int period_ns; + /* the polarity of one PWM */ + int polarity; struct udevice *pwm; /* initialize voltage of regulator */ unsigned int init_voltage; @@ -49,7 +51,7 @@ static int pwm_voltage_to_duty_cycle_percentage(struct udevice *dev, int req_uV) int max_uV = priv->max_voltage; int diff = max_uV - min_uV; - return 100 - (((req_uV * 100) - (min_uV * 100)) / diff); + return ((req_uV * 100) - (min_uV * 100)) / diff; } static int pwm_regulator_get_voltage(struct udevice *dev) @@ -67,6 +69,12 @@ static int pwm_regulator_set_voltage(struct udevice *dev, int uvolt) duty_cycle = pwm_voltage_to_duty_cycle_percentage(dev, uvolt); + ret = pwm_set_init(priv->pwm, priv->pwm_id, priv->polarity); + if (ret) { + dev_err(dev, "Failed to init PWM\n"); + return ret; + } + ret = pwm_set_config(priv->pwm, priv->pwm_id, (priv->period_ns / 100) * duty_cycle, priv->period_ns); if (ret) { @@ -97,9 +105,9 @@ static int pwm_regulator_ofdata_to_platdata(struct udevice *dev) debug("%s: Cannot get PWM phandle: ret=%d\n", __func__, ret); return ret; } - /* TODO: pwm_id here from device tree if needed */ priv->period_ns = args.args[1]; + priv->polarity = args.args[2]; priv->init_voltage = fdtdec_get_int(blob, node, "regulator-init-microvolt", -1); diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c index c2200af..287a7f3 100644 --- a/drivers/pwm/pwm-uclass.c +++ b/drivers/pwm/pwm-uclass.c @@ -9,6 +9,16 @@ #include #include +int pwm_set_init(struct udevice *dev, uint channel, uint polarity) +{ + struct pwm_ops *ops = pwm_get_ops(dev); + + if (!ops->set_init) + return -ENOSYS; + + return ops->set_init(dev, channel, polarity); +} + int pwm_set_config(struct udevice *dev, uint channel, uint period_ns, uint duty_ns) { diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c index 9254f5b..5ff1e00 100644 --- a/drivers/pwm/rk_pwm.c +++ b/drivers/pwm/rk_pwm.c @@ -21,8 +21,22 @@ DECLARE_GLOBAL_DATA_PTR; struct rk_pwm_priv { struct rk3288_pwm *regs; ulong freq; + uint enable_conf; }; +static int rk_pwm_set_init(struct udevice *dev, uint channel, uint polarity) +{ + struct rk_pwm_priv *priv = dev_get_priv(dev); + + debug("%s: polarity=%u\n", __func__, polarity); + if (polarity) + priv->enable_conf |= PWM_DUTY_NEGATIVE | PWM_INACTIVE_POSTIVE; + else + priv->enable_conf |= PWM_DUTY_POSTIVE | PWM_INACTIVE_NEGATIVE; + + return 0; +} + static int rk_pwm_set_config(struct udevice *dev, uint channel, uint period_ns, uint duty_ns) { @@ -32,7 +46,7 @@ static int rk_pwm_set_config(struct udevice *dev, uint channel, uint period_ns, debug("%s: period_ns=%u, duty_ns=%u\n", __func__, period_ns, duty_ns); writel(PWM_SEL_SRC_CLK | PWM_OUTPUT_LEFT | PWM_LP_DISABLE | - PWM_CONTINUOUS | PWM_DUTY_POSTIVE | PWM_INACTIVE_POSTIVE | + PWM_CONTINUOUS | priv->enable_conf | RK_PWM_DISABLE, ®s->ctrl); @@ -83,6 +97,7 @@ static int rk_pwm_probe(struct udevice *dev) } static const struct pwm_ops rk_pwm_ops = { + .set_init = rk_pwm_set_init, .set_config = rk_pwm_set_config, .set_enable = rk_pwm_set_enable, }; diff --git a/include/pwm.h b/include/pwm.h index 851915e..a66ee1f 100644 --- a/include/pwm.h +++ b/include/pwm.h @@ -14,6 +14,15 @@ /* struct pwm_ops: Operations for the PWM uclass */ struct pwm_ops { /** + * set_init() - Set the PWM invert + * + * @dev: PWM device to update + * @channel: PWM channel to update + * @polarity: PWM invert polarity + * @return 0 if OK, -ve on error + */ + int (*set_init)(struct udevice *dev, uint channel, uint polarity); + /** * set_config() - Set the PWM configuration * * @dev: PWM device to update