From patchwork Tue Nov 22 16:13:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 83436 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp2232820obn; Tue, 22 Nov 2016 08:16:32 -0800 (PST) X-Received: by 10.98.57.144 with SMTP id u16mr26352798pfj.142.1479831392691; Tue, 22 Nov 2016 08:16:32 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id m188si28411421pfc.211.2016.11.22.08.16.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 08:16:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9DiZ-0007CB-Vo; Tue, 22 Nov 2016 16:14:48 +0000 Received: from mail-wj0-x235.google.com ([2a00:1450:400c:c01::235]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9Di4-00074p-S2 for linux-arm-kernel@lists.infradead.org; Tue, 22 Nov 2016 16:14:20 +0000 Received: by mail-wj0-x235.google.com with SMTP id qp4so44568563wjc.3 for ; Tue, 22 Nov 2016 08:13:56 -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=+i0LZLvo20NJos3kcZ3BLSU+2tfOXMq+xcpUGy7qcTs=; b=G2VovjTpLGW1XTJ/6bc7/j6I7bfZDRQ+xQlh8JoFEN61PTULSBi+cgJ4QyAY5zztRn amRgZHfwe78zc499h/u/3DwffMN7ojuoQ/DfQGA5BJ4z866/olERaDlnGaxVzBMtqlsN yKXymy6rSsABHvSUn15QrEHBbYViAt7YCqug8= 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=+i0LZLvo20NJos3kcZ3BLSU+2tfOXMq+xcpUGy7qcTs=; b=dQ6Iv4J/vNmNzfDme/sH8mDaR6P5u5WpHi1i3bsAFR9D+jb7M2hDOYLoqiiAxY0DKy MqZ9GcJxZD3YAlIZ9+yVCXwzD8AmWTKZLeRZy2SUNqu4umoI9OvLtXfjvdtgbQTNxt5T WVj42JESi/EQ8ralBa58Wo1HHid7CDd450Jq1smINPf4c5IteJNji5dfnIC2zpbXuohH LqKghDSNGRBYDjvWTDJ7amalLaG38IGFapkpxM6jSo+lVfoUTwrsicQX4EcD8enoZawW tAMQKmNyr2XhE3QGR3jhVGTFvM/EwXGzhyz5F/HDfIdAYsY/gEzNwb4wv+SMi8OWWd8+ 3LHQ== X-Gm-Message-State: AKaTC00SA2lwBXZLunhsoVfrfsHxIfn91epqzUHmppGnDQMR+0CSVSOmA0/ewN/i3O2wZ6xF X-Received: by 10.194.96.110 with SMTP id dr14mr15132770wjb.209.1479831234727; Tue, 22 Nov 2016 08:13:54 -0800 (PST) Received: from lmenx321.st.com. ([80.215.80.240]) by smtp.gmail.com with ESMTPSA id v202sm3729369wmv.8.2016.11.22.08.13.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Nov 2016 08:13:54 -0800 (PST) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, alexandre.torgue@st.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/7] add MFD for stm32 timer IP Date: Tue, 22 Nov 2016 17:13:22 +0100 Message-Id: <1479831207-32699-3-git-send-email-benjamin.gaignard@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479831207-32699-1-git-send-email-benjamin.gaignard@st.com> References: <1479831207-32699-1-git-send-email-benjamin.gaignard@st.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161122_081417_275421_D2EF7AEA X-CRM114-Status: GOOD ( 19.00 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c01:0:0:0:235 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linaro-kernel@lists.linaro.org, Benjamin Gaignard , linus.walleij@linaro.org, arnaud.pouliquen@st.com, gerald.baeza@st.com, fabrice.gasnier@st.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org This hardware block could at used at same time for PWM generation and IIO timer for other IPs like DAC, ADC or other timers. PWM and IIO timer configuration are mixed in the same registers so we need a MFD to be able to share those registers. Signed-off-by: Benjamin Gaignard --- drivers/mfd/Kconfig | 10 ++ drivers/mfd/Makefile | 2 + drivers/mfd/stm32-mfd-timer.c | 236 ++++++++++++++++++++++++++++++++++++ include/linux/mfd/stm32-mfd-timer.h | 78 ++++++++++++ 4 files changed, 326 insertions(+) create mode 100644 drivers/mfd/stm32-mfd-timer.c create mode 100644 include/linux/mfd/stm32-mfd-timer.h -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index c6df644..63aee36 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1607,6 +1607,15 @@ config MFD_STW481X in various ST Microelectronics and ST-Ericsson embedded Nomadik series. +config MFD_STM32_TIMER + tristate "Support for STM32 multifunctions timer" + select MFD_CORE + select REGMAP + depends on ARCH_STM32 + depends on OF + help + Select multifunction driver (pwm, IIO trigger) for stm32 timers + menu "Multimedia Capabilities Port drivers" depends on ARCH_SA1100 @@ -1644,4 +1653,5 @@ config MFD_VEXPRESS_SYSREG on the ARM Ltd. Versatile Express board. endmenu + endif diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 9834e66..b348c3e 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -211,3 +211,5 @@ obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o obj-$(CONFIG_MFD_MT6397) += mt6397-core.o obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o + +obj-$(CONFIG_MFD_STM32_TIMER) += stm32-mfd-timer.o diff --git a/drivers/mfd/stm32-mfd-timer.c b/drivers/mfd/stm32-mfd-timer.c new file mode 100644 index 0000000..67e7db3 --- /dev/null +++ b/drivers/mfd/stm32-mfd-timer.c @@ -0,0 +1,236 @@ +/* + * stm32-timer.c + * + * Copyright (C) STMicroelectronics 2016 + * Author: Benjamin Gaignard for STMicroelectronics. + * License terms: GNU General Public License (GPL), version 2 + */ + +#include +#include +#include +#include + +#include + +static const struct stm32_mfd_timer_cfg mfd_cells_cfg[] = { + { + .pwm_name = "pwm1", + .pwm_compatible = "st,stm32-pwm1", + .trigger_name = "iiotimer1", + .trigger_compatible = "st,stm32-iio-timer1", + }, + { + .pwm_name = "pwm2", + .pwm_compatible = "st,stm32-pwm2", + .trigger_name = "iiotimer2", + .trigger_compatible = "st,stm32-iio-timer2", + }, + { + .pwm_name = "pwm3", + .pwm_compatible = "st,stm32-pwm3", + .trigger_name = "iiotimer3", + .trigger_compatible = "st,stm32-iio-timer3", + }, + { + .pwm_name = "pwm4", + .pwm_compatible = "st,stm32-pwm4", + .trigger_name = "iiotimer4", + .trigger_compatible = "st,stm32-iio-timer4", + }, + { + .pwm_name = "pwm5", + .pwm_compatible = "st,stm32-pwm5", + .trigger_name = "iiotimer5", + .trigger_compatible = "st,stm32-iio-timer5", + }, + { + .trigger_name = "iiotimer6", + .trigger_compatible = "st,stm32-iio-timer6", + }, + { + .trigger_name = "iiotimer7", + .trigger_compatible = "st,stm32-iio-timer7", + }, + { + .pwm_name = "pwm8", + .pwm_compatible = "st,stm32-pwm8", + .trigger_name = "iiotimer8", + .trigger_compatible = "st,stm32-iio-timer8", + }, + { + .pwm_name = "pwm9", + .pwm_compatible = "st,stm32-pwm9", + .trigger_name = "iiotimer9", + .trigger_compatible = "st,stm32-iio-timer9", + }, + { + .pwm_name = "pwm10", + .pwm_compatible = "st,stm32-pwm10", + }, + { + .pwm_name = "pwm11", + .pwm_compatible = "st,stm32-pwm11", + }, + { + .pwm_name = "pwm12", + .pwm_compatible = "st,stm32-pwm12", + .trigger_name = "iiotimer12", + .trigger_compatible = "st,stm32-iio-timer12", + }, + { + .pwm_name = "pwm13", + .pwm_compatible = "st,stm32-pwm13", + }, + { + .pwm_name = "pwm14", + .pwm_compatible = "st,stm32-pwm14", + }, +}; + +static const struct of_device_id stm32_timer_of_match[] = { + { + .compatible = "st,stm32-mfd-timer1", + .data = &mfd_cells_cfg[0], + }, + { + .compatible = "st,stm32-mfd-timer2", + .data = &mfd_cells_cfg[1], + }, + { + .compatible = "st,stm32-mfd-timer3", + .data = &mfd_cells_cfg[2], + }, + { + .compatible = "st,stm32-mfd-timer4", + .data = &mfd_cells_cfg[3], + }, + { + .compatible = "st,stm32-mfd-timer5", + .data = &mfd_cells_cfg[4], + }, + { + .compatible = "st,stm32-mfd-timer6", + .data = &mfd_cells_cfg[5], + }, + { + .compatible = "st,stm32-mfd-timer7", + .data = &mfd_cells_cfg[6], + }, + { + .compatible = "st,stm32-mfd-timer8", + .data = &mfd_cells_cfg[7], + }, + { + .compatible = "st,stm32-mfd-timer9", + .data = &mfd_cells_cfg[8], + }, + { + .compatible = "st,stm32-mfd-timer10", + .data = &mfd_cells_cfg[9], + }, + { + .compatible = "st,stm32-mfd-timer11", + .data = &mfd_cells_cfg[10], + }, + { + .compatible = "st,stm32-mfd-timer12", + .data = &mfd_cells_cfg[11], + }, + { + .compatible = "st,stm32-mfd-timer13", + .data = &mfd_cells_cfg[12], + }, + { + .compatible = "st,stm32-mfd-timer14", + .data = &mfd_cells_cfg[13], + }, +}; + +static const struct regmap_config stm32_timer_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = sizeof(u32), + .max_register = 0x400, + .fast_io = true, +}; + +static int stm32_mfd_timer_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; + struct stm32_mfd_timer_dev *mfd; + struct resource *res; + int ret, nb_cells = 0; + struct mfd_cell *cell = NULL; + void __iomem *mmio; + + mfd = devm_kzalloc(dev, sizeof(*mfd), GFP_KERNEL); + if (!mfd) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENOMEM; + + mmio = devm_ioremap_resource(dev, res); + if (IS_ERR(mmio)) + return PTR_ERR(mmio); + + mfd->regmap = devm_regmap_init_mmio_clk(dev, "mfd_timer_clk", mmio, + &stm32_timer_regmap_cfg); + if (IS_ERR(mfd->regmap)) + return PTR_ERR(mfd->regmap); + + mfd->clk = devm_clk_get(dev, NULL); + if (IS_ERR(mfd->clk)) + return PTR_ERR(mfd->clk); + + mfd->irq = platform_get_irq(pdev, 0); + if (mfd->irq < 0) + return -EINVAL; + + /* populate data structure depending on compatibility */ + if (!of_match_node(stm32_timer_of_match, np)->data) + return -EINVAL; + + mfd->cfg = + (struct stm32_mfd_timer_cfg *)of_match_node(stm32_timer_of_match, np)->data; + + if (mfd->cfg->pwm_name && mfd->cfg->pwm_compatible) { + cell = &mfd->cells[nb_cells++]; + cell->name = mfd->cfg->pwm_name; + cell->of_compatible = mfd->cfg->pwm_compatible; + cell->platform_data = mfd; + cell->pdata_size = sizeof(*mfd); + } + + if (mfd->cfg->trigger_name && mfd->cfg->trigger_compatible) { + cell = &mfd->cells[nb_cells++]; + cell->name = mfd->cfg->trigger_name; + cell->of_compatible = mfd->cfg->trigger_compatible; + cell->platform_data = mfd; + cell->pdata_size = sizeof(*mfd); + } + + ret = devm_mfd_add_devices(&pdev->dev, pdev->id, mfd->cells, + nb_cells, NULL, 0, NULL); + if (ret) + return ret; + + platform_set_drvdata(pdev, mfd); + + return 0; +} + +static struct platform_driver stm32_mfd_timer_driver = { + .probe = stm32_mfd_timer_probe, + .driver = { + .name = "stm32-mfd-timer", + .of_match_table = stm32_timer_of_match, + }, +}; +module_platform_driver(stm32_mfd_timer_driver); + +MODULE_DESCRIPTION("STMicroelectronics STM32 Timer MFD"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/mfd/stm32-mfd-timer.h b/include/linux/mfd/stm32-mfd-timer.h new file mode 100644 index 0000000..4a79c22 --- /dev/null +++ b/include/linux/mfd/stm32-mfd-timer.h @@ -0,0 +1,78 @@ +/* + * stm32-mfd-timer.h + * + * Copyright (C) STMicroelectronics 2016 + * Author: Benjamin Gaignard for STMicroelectronics. + * License terms: GNU General Public License (GPL), version 2 + */ + +#ifndef _LINUX_MFD_STM32_TIMER_H_ +#define _LINUX_MFD_STM32_TIMER_H_ + +#include +#include +#include +#include + +#define TIM_CR1 0x00 /* Control Register 1 */ +#define TIM_CR2 0x04 /* Control Register 2 */ +#define TIM_SMCR 0x08 /* Slave mode control reg */ +#define TIM_DIER 0x0C /* DMA/interrupt register */ +#define TIM_SR 0x10 /* Status register */ +#define TIM_EGR 0x14 /* Event Generation Reg */ +#define TIM_CCMR1 0x18 /* Capt/Comp 1 Mode Reg */ +#define TIM_CCMR2 0x1C /* Capt/Comp 2 Mode Reg */ +#define TIM_CCER 0x20 /* Capt/Comp Enable Reg */ +#define TIM_PSC 0x28 /* Prescaler */ +#define TIM_ARR 0x2c /* Auto-Reload Register */ +#define TIM_CCR1 0x34 /* Capt/Comp Register 1 */ +#define TIM_CCR2 0x38 /* Capt/Comp Register 2 */ +#define TIM_CCR3 0x3C /* Capt/Comp Register 3 */ +#define TIM_CCR4 0x40 /* Capt/Comp Register 4 */ +#define TIM_BDTR 0x44 /* Break and Dead-Time Reg */ + +#define TIM_CR1_CEN BIT(0) /* Counter Enable */ +#define TIM_CR1_ARPE BIT(7) /* Auto-reload Preload Ena */ +#define TIM_CR2_MMS (BIT(4) | BIT(5) | BIT(6)) /* Master mode selection */ +#define TIM_SMCR_SMS (BIT(0) | BIT(1) | BIT(2)) /* Slave mode selection */ +#define TIM_SMCR_TS (BIT(4) | BIT(5) | BIT(6)) /* Trigger selection */ +#define TIM_DIER_UIE BIT(0) /* Update interrupt */ +#define TIM_SR_UIF BIT(0) /* Update interrupt flag */ +#define TIM_EGR_UG BIT(0) /* Update Generation */ +#define TIM_CCMR_PE BIT(3) /* Channel Preload Enable */ +#define TIM_CCMR_M1 (BIT(6) | BIT(5)) /* Channel PWM Mode 1 */ +#define TIM_CCER_CC1E BIT(0) /* Capt/Comp 1 out Ena */ +#define TIM_CCER_CC1P BIT(1) /* Capt/Comp 1 Polarity */ +#define TIM_CCER_CC1NE BIT(2) /* Capt/Comp 1N out Ena */ +#define TIM_CCER_CC1NP BIT(3) /* Capt/Comp 1N Polarity */ +#define TIM_CCER_CCXE (BIT(0) | BIT(4) | BIT(8) | BIT(12)) +#define TIM_BDTR_BKE BIT(12) /* Break input enable */ +#define TIM_BDTR_BKP BIT(13) /* Break input polarity */ +#define TIM_BDTR_AOE BIT(14) /* Automatic Output Enable */ +#define TIM_BDTR_MOE BIT(15) /* Main Output Enable */ + +#define STM32_TIMER_CELLS 2 +#define MAX_TIM_PSC 0xFFFF + +struct stm32_mfd_timer_cfg { + const char *pwm_name; + const char *pwm_compatible; + const char *trigger_name; + const char *trigger_compatible; +}; + +struct stm32_mfd_timer_dev { + /* Device data */ + struct device *dev; + struct clk *clk; + int irq; + + /* Registers mapping */ + struct regmap *regmap; + + /* Private data */ + struct mfd_cell cells[STM32_TIMER_CELLS]; + struct stm32_mfd_timer_cfg *cfg; +}; + +#endif