From patchwork Fri Mar 10 03:55:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Balean X-Patchwork-Id: 737255 X-Patchwork-Delegate: sjg@chromium.org 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 3vfYNY1L5Lz9s7f for ; Fri, 10 Mar 2017 14:56:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=balean.com.au header.i=@balean.com.au header.b="OnSAB+jU"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id D9C9EC21C6D; Fri, 10 Mar 2017 03:56:40 +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 21B32C21C36; Fri, 10 Mar 2017 03:56:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F1FCBC21C36; Fri, 10 Mar 2017 03:56:34 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 1A2E0C21C30 for ; Fri, 10 Mar 2017 03:56:34 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id 25so8835076pgy.3 for ; Thu, 09 Mar 2017 19:56:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=balean.com.au; s=google; h=from:to:cc:subject:date:message-id; bh=7oB7JTNd1tsdmc7cbiod0i2OcX/2EjLE4dlgbI18b2g=; b=OnSAB+jU6B/p26hirWFncRBmzZzc6UmIVOT1vJeAeDhXq0/hQ0QKmSnQXNiHLnzdNr 2N4cPOd9O1Jb+uEZtfgSz3M6y9mPv0q/VX187xkQVjxlMMsSjC9U/VJn9eD6n/8LOyMJ fJ+xj+bmOh9En+IgEwmnvWXPK228p88im8Hwo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7oB7JTNd1tsdmc7cbiod0i2OcX/2EjLE4dlgbI18b2g=; b=gVq9aDXzOzQ9eYyJZymCdxq9gpghQPi5bp5wzybJvYJWZOPOBKJu2dc50wizNx2uHY LRgz6Wljb+lAXj5qJibJ3lNnoqAKNz8+IXBYiEajs8liUdMYzDdND6/wCFkXJ6tI+pcz 1L1Hc74Adq0yhI/6irrSjY2+2aPq3Lx6L+TOYi+DZr4r6LZ+OOl3a+Kx7PHlygP1pPfW IHxdI4mphtcKU/cirw7oxx8PQKoQyIY5y26xrr3VMONRf2BX89heDiPAKUnB9fcveiMn 90mczq+9cZwAh89+FquPUvwOxrh4oe41/HcVDTUQMk2ccKHsDYZALodf+7+sFzvICDKD TPpA== X-Gm-Message-State: AMke39knq5+XUu/69GlFgbYbX7dYPcr8OP7FoTmvfOMk6oFL9MdnAYwhirLgtkNIjCGqQw== X-Received: by 10.98.157.12 with SMTP id i12mr18510674pfd.166.1489118192432; Thu, 09 Mar 2017 19:56:32 -0800 (PST) Received: from logic.local (249.120.96.58.static.exetel.com.au. [58.96.120.249]) by smtp.gmail.com with ESMTPSA id p77sm15081773pfj.99.2017.03.09.19.56.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 19:56:31 -0800 (PST) From: James Balean To: u-boot@lists.denx.de Date: Thu, 9 Mar 2017 21:55:44 -0600 Message-Id: <1489118144-1020-1-git-send-email-james@balean.com.au> X-Mailer: git-send-email 2.7.4 Cc: James Balean Subject: [U-Boot] [PATCH v3] Add single register pin controller driver 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" This patch adds a pin controller driver supporting devices using a single configuration register per pin. Signed-off-by: Felix Brack [james@balean.com.au: changed .set_state_simple operation to .set_state] Signed-off-by: James Balean Reviewed-by: Lukasz Majewski --- drivers/pinctrl/Kconfig | 10 +++ drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-single.c | 141 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 drivers/pinctrl/pinctrl-single.c diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index efcb4c0..a2b9212 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -175,6 +175,16 @@ config PIC32_PINCTRL by a device tree node which contains both GPIO defintion and pin control functions. +config PINCTRL_SINGLE + bool "Single register pin-control and pin-multiplex driver" + depends on PINCTRL_FULL || SPL_PINCTRL_FULL + help + This enables pinctrl driver for systems using a single register for + pin configuration and multiplexing. TI's AM335X SoCs are examples of + such systems. + Depending on the platform make sure to also enable OF_TRANSLATE and + eventually SPL_OF_TRANSLATE to get correct address translations. + endif source "drivers/pinctrl/meson/Kconfig" diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 512112a..f148f94 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_PIC32_PINCTRL) += pinctrl_pic32.o obj-$(CONFIG_PINCTRL_EXYNOS) += exynos/ obj-$(CONFIG_PINCTRL_MESON) += meson/ obj-$(CONFIG_PINCTRL_MVEBU) += mvebu/ +obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c new file mode 100644 index 0000000..a5b4d75 --- /dev/null +++ b/drivers/pinctrl/pinctrl-single.c @@ -0,0 +1,141 @@ +/* + * Copyright (C) EETS GmbH, 2017, Felix Brack + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +struct single_pdata { + fdt_addr_t base; /* first configuration register */ + int offset; /* index of last configuration register */ + u32 mask; /* configuration-value mask bits */ + int width; /* configuration register bit width */ +}; + +struct single_fdt_pin_cfg { + fdt32_t reg; /* configuration register offset */ + fdt32_t val; /* configuration register value */ +}; + +/** + * single_configure_pins() - Configure pins based on FDT data + * + * @dev: Pointer to single pin configuration device which is the parent of + * the pins node holding the pin configuration data. + * @pins: Pointer to the first element of an array of register/value pairs + * of type 'struct single_fdt_pin_cfg'. Each such pair describes the + * the pin to be configured and the value to be used for configuration. + * This pointer points to a 'pinctrl-single,pins' property in the + * device-tree. + * @size: Size of the 'pins' array in bytes. + * The number of register/value pairs in the 'pins' array therefore + * equals to 'size / sizeof(struct single_fdt_pin_cfg)'. + */ +static int single_configure_pins(struct udevice *dev, + const struct single_fdt_pin_cfg *pins, + int size) +{ + struct single_pdata *pdata = dev->platdata; + int count = size / sizeof(struct single_fdt_pin_cfg); + int n, reg; + u32 val; + + for (n = 0; n < count; n++) { + reg = fdt32_to_cpu(pins->reg); + if ((reg < 0) || (reg > pdata->offset)) { + dev_dbg(dev, " invalid register offset 0x%08x\n", reg); + pins++; + continue; + } + reg += pdata->base; + switch (pdata->width) { + case 32: + val = readl(reg) & ~pdata->mask; + val |= fdt32_to_cpu(pins->val) & pdata->mask; + writel(val, reg); + dev_dbg(dev, " reg/val 0x%08x/0x%08x\n", + reg, val); + break; + default: + dev_warn(dev, "unsupported register width %i\n", + pdata->width); + } + pins++; + } + return 0; +} + +static int single_set_state(struct udevice *dev, struct udevice *config) +{ + const void *fdt = gd->fdt_blob; + const struct single_fdt_pin_cfg *prop; + int len; + + prop = fdt_getprop(fdt, config->of_offset, "pinctrl-single,pins", &len); + if (prop) { + dev_dbg(dev, "configuring pins for %s\n", config->name); + if (len % sizeof(struct single_fdt_pin_cfg)) { + dev_dbg(dev, " invalid pin configuration in fdt\n"); + return -FDT_ERR_BADSTRUCTURE; + } + single_configure_pins(dev, prop, len); + len = 0; + } + + return len; +} + +static int single_ofdata_to_platdata(struct udevice *dev) +{ + fdt_addr_t addr; + u32 of_reg[2]; + int res; + struct single_pdata *pdata = dev->platdata; + + pdata->width = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "pinctrl-single,register-width", 0); + + res = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, + "reg", of_reg, 2); + if (res) + return res; + pdata->offset = of_reg[1] - pdata->width / 8; + + addr = dev_get_addr(dev); + if (addr == FDT_ADDR_T_NONE) { + dev_dbg(dev, "no valid base register address\n"); + return -EINVAL; + } + pdata->base = addr; + + pdata->mask = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "pinctrl-single,function-mask", + 0xffffffff); + return 0; +} + +const struct pinctrl_ops single_pinctrl_ops = { + .set_state = single_set_state, +}; + +static const struct udevice_id single_pinctrl_match[] = { + { .compatible = "pinctrl-single" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(single_pinctrl) = { + .name = "single-pinctrl", + .id = UCLASS_PINCTRL, + .of_match = single_pinctrl_match, + .ops = &single_pinctrl_ops, + .flags = DM_FLAG_PRE_RELOC, + .platdata_auto_alloc_size = sizeof(struct single_pdata), + .ofdata_to_platdata = single_ofdata_to_platdata, +};