From patchwork Fri Jan 4 14:44:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 154782 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp691337ljp; Fri, 4 Jan 2019 06:44:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/UQfo+OVqwpAVLoHtb+gd6f3yD92nOIG3YnVqZId+FJxXBmDXDn8Tcou24QIf60/dLeG9cX X-Received: by 2002:a50:ade7:: with SMTP id b36mr44918049edd.215.1546613087044; Fri, 04 Jan 2019 06:44:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546613087; cv=none; d=google.com; s=arc-20160816; b=iKUzPcYvU87D3p2/DdOmwTL9GzMgvpRfVDoAGlCH2Yp38VAfkJc0h5f9Uvc4ToZ7JH /+j7vjIUNb6aofKQDjRhDNRi2+fhs6DwZI58Py3XeOZqNcocSTBazlGgZvQKIjLXhBoB MFRk4CWVigTNxNkRrSS5b5rryHa/n8R0ms3WRib72v/5r4TbYemNpg0741fXm/SqKa8V OKnXy0dYO44wwholWqd2w58mY+gJDsw/llr4cPl3FxjR7fOxPABZJB1FVI5kEal8LKAR WBumRf0jn9BDUm3ZR7oSW4Qp0juImHmTRVjNWjzyIUnlQ4TESEF4Qwcq8Ve4DPcK37BZ Qc8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:dkim-signature; bh=34jXCzls7jEOam+kRf/kNBXnyrQU5cJ8GL5nAV8aKv0=; b=OCgo4ynJejkH8Xo5Qq6Wcw1+Cq9JdCe+F34G0n0/2qIAkfK9DxofeYQk3Gm9BXZmlh V8TQu5iUSBb8UOo1/XK5BIix3tP2jX7uMNsPekdBnxz1ACQAD6h4MLDqJg+3i1sHf4PI bZMbWmFC2WPZY0sZeIQmit9XE+G7UQ9pCJFfzqmTGJfuECEnvQv9ymisBC87uAibY3zg FjSbPHJ5dAxAQ6WX72Z8wCw59Bo/WQex9uZiJ3AUNlF9VYt3C0pogodYH9vfIPQWSO86 ktdhsEvD7z/4Dv0aum+XKzbLrLCZ40y0yRuJpBKz5oxkNP09fEkGSfQ3RtbgXN1JQpVT y/FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=IrYsG6v4; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id d13si8627939ede.206.2019.01.04.06.44.46; Fri, 04 Jan 2019 06:44:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=IrYsG6v4; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id E2C2FC21D8A; Fri, 4 Jan 2019 14:44:44 +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_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 B5B98C21C4A; Fri, 4 Jan 2019 14:44:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1593BC21C4A; Fri, 4 Jan 2019 14:44:40 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 8E956C21C3F for ; Fri, 4 Jan 2019 14:44:39 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id b14so31965160edt.6 for ; Fri, 04 Jan 2019 06:44:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tv04QqPECaxVM8Sw6KXSVOAbVxSEehcXLLlssHTSp+U=; b=IrYsG6v4q1eVCM0J+LdTIidEevSwbnB/uX9iq9JxMwEbBcGf29B+NCdhV76tfR7SuA 1D8Uh+cBf4vJVfKxUFIorhfll1HpoMMv1xm9v7mkY6QJ0lGmpVZm1N1FepDldipMYtkK T6+C6hF+TJG3o6RNjPRdMpqBe0SiAOcSMhydLO0Zf7USP0NDwzgG2L9Jcfi+v6yg8oEl I3BVhnFnwADajMYn9xMu3igVtz81CaG3XvWTWzGtBUnqaoxusy3+3pxr4TilTi/kGVRh jqi5K15Bei43CRTX8OHKqlBxMN53cETAL7QCSdLrPexKrzEYx/luzjPf6HQ0WPoflzgp 7bcQ== 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:mime-version :content-transfer-encoding; bh=Tv04QqPECaxVM8Sw6KXSVOAbVxSEehcXLLlssHTSp+U=; b=tavqClwAwM2S+YPwn6klnK92KaM0I3XzHVgjyQBL2lPnDBo/nReqUOoECU4elanO+X inkFFPDG7plsKoYfRggDatePGCx22TlF8sSbHDDA/N2Eb6RHUyNrUHemXwzPSNL0Oyf/ LRYtHPaQ803D6GrkDOqTd+kV/JTzc33DhMlLubqEZl+9+G4Q7leKVSCl+VMF9WK62IhH fBwyd+6Qwd9LYUhiuvWYgUSavG/W9vuhI//we4GY2urTTFUX+JmMbmJspq4noaJxqHnX KGUjFyZOTylbF3Saj6ychTNaHHi3p7Squ6gVleBafw3wuyUWNYTZ3KLzJQqQVo04eDRd IqBw== X-Gm-Message-State: AJcUukeFaW467xr+dZ4lXpcLV0GIwKN67L31xeEa+dARQTgJbU2EmVca maC5OWwRzkgKsMI0Z2HO3t0Jkw== X-Received: by 2002:a17:906:48c2:: with SMTP id d2-v6mr2908066ejt.244.1546613078974; Fri, 04 Jan 2019 06:44:38 -0800 (PST) Received: from boomer.lan (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id f4sm23148840edb.21.2019.01.04.06.44.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Jan 2019 06:44:38 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , trini@konsulko.com Date: Fri, 4 Jan 2019 15:44:34 +0100 Message-Id: <20190104144434.5672-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: u-boot@lists.denx.de, linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH u-boot] pinctrl: meson: add pinconf support 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Adding pinconf support is necessary to enable boot from SPI without breaking the eMMC. When booting from SPI, the ROM code leave pull downs on the eMMC pad. We need to set pinconf provided in DT to solve this Signed-off-by: Jerome Brunet --- drivers/pinctrl/meson/Kconfig | 1 + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 10 ++ drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 10 ++ drivers/pinctrl/meson/pinctrl-meson.c | 101 ++++++++++++++++-- drivers/pinctrl/meson/pinctrl-meson.h | 8 ++ 5 files changed, 123 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig index ee820a57a0e0..162642d7289b 100644 --- a/drivers/pinctrl/meson/Kconfig +++ b/drivers/pinctrl/meson/Kconfig @@ -2,6 +2,7 @@ if ARCH_MESON config PINCTRL_MESON select PINCTRL_GENERIC + select PINCONF bool config PINCTRL_MESON_GX_PMX diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c index c82413d08f34..f9065723eea9 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c @@ -93,6 +93,12 @@ static int meson_axg_pinmux_group_set(struct udevice *dev, return 0; } +const struct pinconf_param meson_axg_pinconf_params[] = { + { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 }, + { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 1 }, + { "bias-pull-down", PIN_CONFIG_BIAS_PULL_DOWN, 1 }, +}; + const struct pinctrl_ops meson_axg_pinctrl_ops = { .get_groups_count = meson_pinctrl_get_groups_count, .get_group_name = meson_pinctrl_get_group_name, @@ -100,6 +106,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = { .get_function_name = meson_pinmux_get_function_name, .pinmux_group_set = meson_axg_pinmux_group_set, .set_state = pinctrl_generic_set_state, + .pinconf_params = meson_axg_pinconf_params + .pinconf_num_params = ARRAY_SIZE(meson_axg_pinconf_params), + .pinconf_set = meson_pinconf_set, + .pinconf_group_set = meson_pinconf_group_set, }; static int meson_axg_gpio_request(struct udevice *dev, diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c index fc1538ea719e..cf72576b6ce2 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c @@ -72,6 +72,12 @@ static int meson_gx_pinmux_group_set(struct udevice *dev, return 0; } +const struct pinconf_param meson_gx_pinconf_params[] = { + { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 }, + { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 1 }, + { "bias-pull-down", PIN_CONFIG_BIAS_PULL_DOWN, 1 }, +}; + const struct pinctrl_ops meson_gx_pinctrl_ops = { .get_groups_count = meson_pinctrl_get_groups_count, .get_group_name = meson_pinctrl_get_group_name, @@ -79,6 +85,10 @@ const struct pinctrl_ops meson_gx_pinctrl_ops = { .get_function_name = meson_pinmux_get_function_name, .pinmux_group_set = meson_gx_pinmux_group_set, .set_state = pinctrl_generic_set_state, + .pinconf_params = meson_gx_pinconf_params, + .pinconf_num_params = ARRAY_SIZE(meson_gx_pinconf_params), + .pinconf_set = meson_pinconf_set, + .pinconf_group_set = meson_pinconf_group_set, }; static const struct dm_gpio_ops meson_gx_gpio_ops = { diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index b539749752c8..fa3d78858a9e 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -57,7 +57,7 @@ static int meson_gpio_calc_reg_and_bit(struct udevice *dev, unsigned int offset, enum meson_reg_type reg_type, unsigned int *reg, unsigned int *bit) { - struct meson_pinctrl *priv = dev_get_priv(dev->parent); + struct meson_pinctrl *priv = dev_get_priv(dev); struct meson_bank *bank = NULL; struct meson_reg_desc *desc; unsigned int pin; @@ -89,7 +89,8 @@ int meson_gpio_get(struct udevice *dev, unsigned int offset) unsigned int reg, bit; int ret; - ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_IN, ®, &bit); + ret = meson_gpio_calc_reg_and_bit(dev->parent, offset, REG_IN, ®, + &bit); if (ret) return ret; @@ -102,7 +103,8 @@ int meson_gpio_set(struct udevice *dev, unsigned int offset, int value) unsigned int reg, bit; int ret; - ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_OUT, ®, &bit); + ret = meson_gpio_calc_reg_and_bit(dev->parent, offset, REG_OUT, ®, + &bit); if (ret) return ret; @@ -117,7 +119,8 @@ int meson_gpio_get_direction(struct udevice *dev, unsigned int offset) unsigned int reg, bit, val; int ret; - ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_DIR, ®, &bit); + ret = meson_gpio_calc_reg_and_bit(dev->parent, offset, REG_DIR, ®, + &bit); if (ret) return ret; @@ -132,7 +135,8 @@ int meson_gpio_direction_input(struct udevice *dev, unsigned int offset) unsigned int reg, bit; int ret; - ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_DIR, ®, &bit); + ret = meson_gpio_calc_reg_and_bit(dev->parent, offset, REG_DIR, ®, + &bit); if (ret) return ret; @@ -148,13 +152,15 @@ int meson_gpio_direction_output(struct udevice *dev, unsigned int reg, bit; int ret; - ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_DIR, ®, &bit); + ret = meson_gpio_calc_reg_and_bit(dev->parent, offset, REG_DIR, ®, + &bit); if (ret) return ret; clrbits_le32(priv->reg_gpio + reg, BIT(bit)); - ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_OUT, ®, &bit); + ret = meson_gpio_calc_reg_and_bit(dev->parent, offset, REG_OUT, ®, + &bit); if (ret) return ret; @@ -163,6 +169,72 @@ int meson_gpio_direction_output(struct udevice *dev, return 0; } +static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin, + unsigned int param) +{ + struct meson_pinctrl *priv = dev_get_priv(dev); + unsigned int offset = pin - priv->data->pin_base; + unsigned int reg, bit; + int ret; + + ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULLEN, ®, &bit); + if (ret) + return ret; + + if (param == PIN_CONFIG_BIAS_DISABLE) { + clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 0); + return 0; + } + + /* othewise, enable the bias and select level */ + clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1); + ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, ®, &bit); + if (ret) + return ret; + + clrsetbits_le32(priv->reg_pull + reg, BIT(bit), + param == PIN_CONFIG_BIAS_PULL_UP); + + return 0; +} + +int meson_pinconf_set(struct udevice *dev, unsigned int pin, + unsigned int param, unsigned int arg) +{ + int ret; + + switch (param) { + case PIN_CONFIG_BIAS_DISABLE: + case PIN_CONFIG_BIAS_PULL_UP: + case PIN_CONFIG_BIAS_PULL_DOWN: + ret = meson_pinconf_bias_set(dev, pin, param); + break; + + default: + dev_err(dev, "unsupported configuration parameter %u\n", param); + return -EINVAL; + } + + return ret; +} + +int meson_pinconf_group_set(struct udevice *dev, + unsigned int group_selector, + unsigned int param, unsigned int arg) +{ + struct meson_pinctrl *priv = dev_get_priv(dev); + struct meson_pmx_group *grp = &priv->data->groups[group_selector]; + int i, ret; + + for (i = 0; i < grp->num_pins; i++) { + ret = meson_pinconf_set(dev, grp->pins[i], param, arg); + if (ret) + return ret; + } + + return 0; +} + int meson_gpio_probe(struct udevice *dev) { struct meson_pinctrl *priv = dev_get_priv(dev->parent); @@ -240,6 +312,21 @@ int meson_pinctrl_probe(struct udevice *dev) return -EINVAL; } priv->reg_gpio = (void __iomem *)addr; + + addr = parse_address(gpio, "pull", na, ns); + if (addr == FDT_ADDR_T_NONE) { + debug("pull address not found\n"); + return -EINVAL; + } + priv->reg_pull = (void __iomem *)addr; + + addr = parse_address(gpio, "pull-enable", na, ns); + /* Use pull region if pull-enable one is not present */ + if (addr == FDT_ADDR_T_NONE) + priv->reg_pullen = priv->reg_pull; + else + priv->reg_pullen = (void __iomem *)addr; + priv->data = (struct meson_pinctrl_data *)dev_get_driver_data(dev); /* Lookup GPIO driver */ diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h index bdee721fc007..28085a7495d4 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h @@ -39,6 +39,8 @@ struct meson_pinctrl { struct meson_pinctrl_data *data; void __iomem *reg_mux; void __iomem *reg_gpio; + void __iomem *reg_pull; + void __iomem *reg_pullen; }; /** @@ -130,4 +132,10 @@ int meson_gpio_direction_output(struct udevice *dev, unsigned int offset, int value); int meson_gpio_probe(struct udevice *dev); +int meson_pinconf_set(struct udevice *dev, unsigned int pin, + unsigned int param, unsigned int arg); +int meson_pinconf_group_set(struct udevice *dev, + unsigned int group_selector, + unsigned int param, unsigned int arg); + #endif /* __PINCTRL_MESON_H__ */