From patchwork Thu Aug 21 16:23:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 4759191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D6A179F2E8 for ; Thu, 21 Aug 2014 16:26:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAA292018A for ; Thu, 21 Aug 2014 16:26:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97B0F20172 for ; Thu, 21 Aug 2014 16:26:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XKV9k-0003IF-9I; Thu, 21 Aug 2014 16:24:08 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XKV9X-0003C1-Id for linux-arm-kernel@lists.infradead.org; Thu, 21 Aug 2014 16:23:56 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s7LGNVPS022084; Thu, 21 Aug 2014 11:23:31 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7LGNV27022140; Thu, 21 Aug 2014 11:23:31 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Thu, 21 Aug 2014 11:23:31 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s7LGNUBR006693; Thu, 21 Aug 2014 11:23:30 -0500 From: Grygorii Strashko To: Linus Walleij , , Alexander Shiyan , Subject: [PATCH v2 2/3] gpio: syscon: reuse for keystone 2 socs Date: Thu, 21 Aug 2014 19:23:22 +0300 Message-ID: <1408638203-8246-3-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1408638203-8246-1-git-send-email-grygorii.strashko@ti.com> References: <53ECE9B1.4060303@ti.com> <1408638203-8246-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140821_092355_766659_53C60256 X-CRM114-Status: GOOD ( 14.55 ) X-Spam-Score: -5.7 (-----) Cc: Alexandre Courbot , Grygorii Strashko , Rob Herring , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Keystone SOCs, ARM host can send interrupts to DSP cores using the DSP GPIO controller IP. Each DSP GPIO controller provides 28 IRQ signals for each DSP core. This is one of the component used by the IPC mechanism used on Keystone SOCs. Keystone 2 DSP GPIO controller has specific features: - each GPIO can be configured only as output pin; - setting GPIO value to 1 causes IRQ generation on target DSP core; - reading pin value returns 0 - if IRQ was handled or 1 - IRQ is still pending. This patch updates gpio-syscon driver to be reused by Keystone 2 SoCs, because the Keystone 2 DSP GPIO controller is controlled through Syscon devices and, as requested by Linus Walleij, such kind of GPIO controllers should be integrated with drivers/gpio/gpio-syscon.c driver. Signed-off-by: Grygorii Strashko --- .../bindings/gpio/gpio-mctrl-keystone.txt | 42 +++++++ drivers/gpio/gpio-syscon.c | 131 ++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-mctrl-keystone.txt diff --git a/Documentation/devicetree/bindings/gpio/gpio-mctrl-keystone.txt b/Documentation/devicetree/bindings/gpio/gpio-mctrl-keystone.txt new file mode 100644 index 0000000..d3858aa --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/gpio-mctrl-keystone.txt @@ -0,0 +1,42 @@ +Keystone 2 DSP GPIO controller bindings + +HOST OS userland running on ARM can send interrupts to DSP cores using +the DSP GPIO controller IP. It provides 28 IRQ signals per each DSP core. +This is one of the component used by the IPC mechanism used on Keystone SOCs. + +For example TCI6638K2K SoC has 8 DSP GPIO controllers: + - 8 for C66x CorePacx CPUs 0-7 + +Keystone 2 DSP GPIO controller has specific features: +- each GPIO can be configured only as output pin; +- setting GPIO value to 1 causes IRQ generation on target DSP core; +- reading pin value returns 0 - if IRQ was handled or 1 - IRQ is still + pending. + +Required Properties: +- compatible: should be "ti,keystone-dsp-gpio0" or + "ti,keystone-dsp-gpio1" or + "ti,keystone-dsp-gpio2" or + "ti,keystone-dsp-gpio3" or + "ti,keystone-dsp-gpio4" or + "ti,keystone-dsp-gpio5" or + "ti,keystone-dsp-gpio6" or + "ti,keystone-dsp-gpio7" or +- gpio-controller: Marks the device node as a gpio controller. +- #gpio-cells: Should be 2. + +Please refer to gpio.txt in this directory for details of the common GPIO +bindings used by client devices. + +Example: + dspgpio0: keystone_dsp_gpio@02620240 { + compatible = "ti,keystone-mctrl-gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + dsp0: dsp0 { + compatible = "linux,rproc-user"; + ... + kick-gpio = <&dspgpio0 27>; + }; diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c index 03b4699..0b5f998 100644 --- a/drivers/gpio/gpio-syscon.c +++ b/drivers/gpio/gpio-syscon.c @@ -133,11 +133,142 @@ static const struct syscon_gpio_data clps711x_mctrl_gpio = { .dat_bit_offset = 0x40 * 8 + 8, }; +#ifdef CONFIG_ARCH_KEYSTONE +#define KEYSTONE_LOCK_BIT BIT(0) + +static void keystone_gpio_set(struct gpio_chip *chip, unsigned offset, int val) +{ + struct syscon_gpio_priv *priv = to_syscon_gpio(chip); + unsigned int offs; + int ret; + + offs = priv->data->dat_bit_offset + offset; + + if (!val) + return; + + ret = regmap_update_bits( + priv->syscon, + (offs / SYSCON_REG_BITS) * SYSCON_REG_SIZE, + BIT(offs % SYSCON_REG_BITS) | KEYSTONE_LOCK_BIT, + BIT(offs % SYSCON_REG_BITS) | KEYSTONE_LOCK_BIT); + if (ret < 0) + dev_err(chip->dev, "gpio write failed ret(%d)\n", ret); +} + +static const struct syscon_gpio_data keystone_dsp_gpio0 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x240 * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio1 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x244 * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio2 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x248 * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio3 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x24c * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio4 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x250 * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio5 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x254 * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio6 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x258 * 8 + 4, + .set = keystone_gpio_set, +}; + +static const struct syscon_gpio_data keystone_dsp_gpio7 = { + /* ARM Keystone 2 */ + .compatible = "ti,keystone-devctrl", + .flags = GPIO_SYSCON_FEAT_OUT, + .bit_count = 28, + .dat_bit_offset = 0x25c * 8 + 4, + .set = keystone_gpio_set, +}; + +#endif + static const struct of_device_id syscon_gpio_ids[] = { { .compatible = "cirrus,clps711x-mctrl-gpio", .data = &clps711x_mctrl_gpio, }, +#ifdef CONFIG_ARCH_KEYSTONE + { + .compatible = "ti,keystone-dsp-gpio0", + .data = &keystone_dsp_gpio0, + }, + { + .compatible = "ti,keystone-dsp-gpio1", + .data = &keystone_dsp_gpio1, + }, + { + .compatible = "ti,keystone-dsp-gpio2", + .data = &keystone_dsp_gpio2, + }, + { + .compatible = "ti,keystone-dsp-gpio3", + .data = &keystone_dsp_gpio3, + }, + { + .compatible = "ti,keystone-dsp-gpio4", + .data = &keystone_dsp_gpio5, + }, + { + .compatible = "ti,keystone-dsp-gpio5", + .data = &keystone_dsp_gpio6, + }, + { + .compatible = "ti,keystone-dsp-gpio6", + .data = &keystone_dsp_gpio6, + }, + { + .compatible = "ti,keystone-dsp-gpio7", + .data = &keystone_dsp_gpio7, + }, +#endif { } }; MODULE_DEVICE_TABLE(of, syscon_gpio_ids);