From patchwork Wed Feb 10 13:02:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 61648 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2630011lbl; Wed, 10 Feb 2016 05:04:53 -0800 (PST) X-Received: by 10.66.100.135 with SMTP id ey7mr59115294pab.108.1455109493722; Wed, 10 Feb 2016 05:04:53 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wc6si5059179pab.33.2016.02.10.05.04.53; Wed, 10 Feb 2016 05:04:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751493AbcBJNEp (ORCPT + 30 others); Wed, 10 Feb 2016 08:04:45 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:38031 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbcBJNEl (ORCPT ); Wed, 10 Feb 2016 08:04:41 -0500 Received: by mail-wm0-f47.google.com with SMTP id p63so25555515wmp.1 for ; Wed, 10 Feb 2016 05:04:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IFESZwlOLqSbn4OrxWQ3nTTQplgmzwcWRWqqbuq2VBo=; b=gSrS/a6gJUIZCXE5eeGxRRSmrMt0DFgvtjLH7Swy0pvsYV4jEEiegFUS98bHjEx1tg 6435QY16LSZiYtG5/62YCeQxanCLxvEnRUS9Urw1cx45WD8+SMSEmvFr/A6khYypqjdd NowxUqI5EtYdWm59stRn/Tk/uiFJH6KNk6qr4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IFESZwlOLqSbn4OrxWQ3nTTQplgmzwcWRWqqbuq2VBo=; b=NkQcYN/kFG3jRE8f+1wNuuCF/8ivDLiAijRnlD5Qz68S/gz+bN3Twb4NOlhKsaWoUm DUbjdh8FHqXI/kACmg2jc955bIpttmNH7y+IygQgL0gMFvcks1wCGEjCoWHhujB6dkzp QNRp+auSiZlz+qHHYLwXcLljRbwJvej6T7auIsOmLKKCpMwM6YpfFiL5Yn4S0Hj6izap FvrN8XoJf0GaxONrmPehG6fLjOxEt/nl84oLhOV6GH0BugUaHrivFYLk5K2GkJv/H7oy w4uOdGm1kK3BBAlH5+JH9nLP9Ib2FxtWbBcCUOKmgwpmteXY8w8fEWke3spUiXtuqizs Y9Cg== X-Gm-Message-State: AG10YOTPN6z80nA0bStmV+Tble8f5vgteWfPlMrFqSqe6SSFA+J6Q1bofIZxXK8R+Fu4D0e2 X-Received: by 10.194.22.132 with SMTP id d4mr40134234wjf.174.1455109480119; Wed, 10 Feb 2016 05:04:40 -0800 (PST) Received: from localhost.localdomain (host81-129-170-149.range81-129.btcentralplus.com. [81.129.170.149]) by smtp.gmail.com with ESMTPSA id q75sm22429319wmd.6.2016.02.10.05.04.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 05:04:39 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com Cc: kernel@stlinux.com, maxime.coquelin@st.com, Lee Jones Subject: [PATCH 05/11] pwm: sti: Supply PWM Capture register addresses and bit locations Date: Wed, 10 Feb 2016 13:02:22 +0000 Message-Id: <1455109348-32767-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> References: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 1.9.1 diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index aa217e2..2336bac 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -22,26 +22,48 @@ #include #define PWM_OUT_VAL(x) (0x00 + (4 * (x))) /* Channel's Duty Cycle register */ +#define PWM_CPT_VAL(x) (0x10 + (4 * (x))) /* Capture value */ +#define PWM_CPT_EDGE(x) (0x30 + (4 * (x))) /* Edge to capture on */ #define STI_PWM_CTRL 0x50 /* Control/Config register */ #define STI_INT_EN 0x54 /* Interrupt Enable/Disable register */ +#define STI_INT_STA 0x58 /* Interrupt Status register */ +#define PWM_INT_ACK 0x5c #define PWM_PRESCALE_LOW_MASK 0x0f #define PWM_PRESCALE_HIGH_MASK 0xf0 +#define PWM_CPT_EDGE_MASK 0x03 +#define PWM_INT_ACK_MASK 0x1ff + +#define STI_MAX_CPT_CHANS 4 +#define CPT_DC_MAX 0xff /* Regfield IDs */ enum { /* Bits in PWM_CTRL*/ PWMCLK_PRESCALE_LOW, PWMCLK_PRESCALE_HIGH, + CPTCLK_PRESCALE, PWM_OUT_EN, + PWM_CPT_EN, PWM_CPT_INT_EN, + PWM_CPT_INT_STAT, /* Keep last */ MAX_REGFIELDS }; +/* Each capture input can be programmed to detect rising-edge, falling-edge, + * either edge or neither egde + */ +enum sti_cpt_edge { + CPT_EDGE_DISABLED, + CPT_EDGE_RISING, + CPT_EDGE_FALLING, + CPT_EDGE_BOTH, +}; + struct sti_pwm_compat_data { const struct reg_field *reg_fields; unsigned int num_chan; @@ -69,8 +91,11 @@ struct sti_pwm_chip { static const struct reg_field sti_pwm_regfields[MAX_REGFIELDS] = { [PWMCLK_PRESCALE_LOW] = REG_FIELD(STI_PWM_CTRL, 0, 3), [PWMCLK_PRESCALE_HIGH] = REG_FIELD(STI_PWM_CTRL, 11, 14), + [CPTCLK_PRESCALE] = REG_FIELD(STI_PWM_CTRL, 4, 8), [PWM_OUT_EN] = REG_FIELD(STI_PWM_CTRL, 9, 9), + [PWM_CPT_EN] = REG_FIELD(STI_PWM_CTRL, 10, 10), [PWM_CPT_INT_EN] = REG_FIELD(STI_INT_EN, 1, 4), + [PWM_CPT_INT_STAT] = REG_FIELD(STI_INT_STA, 1, 4), }; static inline struct sti_pwm_chip *to_sti_pwmchip(struct pwm_chip *chip)