linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: megous@megous.com
To: linux-sunxi@googlegroups.com,
	Maxime Ripard <maxime.ripard@bootlin.com>,
	Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.org>,
	Linus Walleij <linus.walleij@linaro.org>
Cc: Ondrej Jirman <megous@megous.com>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Mark Rutland <mark.rutland@arm.com>,
	Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	Alexandre Torgue <alexandre.torgue@st.com>,
	Jose Abreu <joabreu@synopsys.com>,
	"David S. Miller" <davem@davemloft.net>,
	Maxime Coquelin <mcoquelin.stm32@gmail.com>,
	Arend van Spriel <arend.vanspriel@broadcom.com>,
	Franky Lin <franky.lin@broadcom.com>,
	Hante Meuleman <hante.meuleman@broadcom.com>,
	Chi-Hsien Lin <chi-hsien.lin@cypress.com>,
	Wright Feng <wright.feng@cypress.com>,
	Kalle Valo <kvalo@codeaurora.org>,
	Naveen Gupta <naveen.gupta@cypress.com>,
	dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	linux-stm32@st-md-mailman.stormreply.com,
	linux-wireless@vger.kernel.org,
	brcm80211-dev-list.pdl@broadcom.com,
	brcm80211-dev-list@cypress.com, linux-gpio@vger.kernel.org
Subject: [PATCH 10/12] pinctrl: sunxi: Support I/O bias voltage setting on H6
Date: Sat,  6 Apr 2019 01:45:12 +0200	[thread overview]
Message-ID: <20190405234514.6183-11-megous@megous.com> (raw)
In-Reply-To: <20190405234514.6183-1-megous@megous.com>

From: Ondrej Jirman <megous@megous.com>

H6 SoC has a "pio group withstand voltage mode" register (datasheet
description), that needs to be used to select either 1.8V or 3.3V
I/O mode, based on what voltage is powering the respective pin
banks and is thus used for I/O signals.

Add support for configuring this register according to the voltage
of the pin bank regulator (if enabled).

This is similar to the support for I/O bias voltage setting patch
for A80 and the same concerns apply. (see commit 402bfb3c135213dc
Support I/O bias voltage setting on A80).

Signed-off-by: Ondrej Jirman <megous@megous.com>
---
 drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c |  1 +
 drivers/pinctrl/sunxi/pinctrl-sunxi.c     | 14 ++++++++++++++
 drivers/pinctrl/sunxi/pinctrl-sunxi.h     |  3 +++
 3 files changed, 18 insertions(+)

diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
index ef4268cc6227..30b1befa8ed8 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c
@@ -591,6 +591,7 @@ static const struct sunxi_pinctrl_desc h6_pinctrl_data = {
 	.irq_banks = 4,
 	.irq_bank_map = h6_irq_bank_map,
 	.irq_read_needs_mux = true,
+	.io_bias_cfg_variant = IO_BIAS_CFG_V2,
 };
 
 static int h6_pinctrl_probe(struct platform_device *pdev)
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 9f329fec77cf..59a4ed396d92 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -607,6 +607,8 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl,
 					 unsigned pin,
 					 struct regulator *supply)
 {
+	unsigned short bank = pin / PINS_PER_BANK;
+	unsigned long flags;
 	u32 val, reg;
 	int uV;
 
@@ -639,6 +641,18 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl,
 		reg = readl(pctl->membase + sunxi_grp_config_reg(pin));
 		reg &= ~IO_BIAS_MASK;
 		writel(reg | val, pctl->membase + sunxi_grp_config_reg(pin));
+	} else if (pctl->desc->io_bias_cfg_variant == IO_BIAS_CFG_V2) {
+		val = uV <= 1800000 ? 1 : 0;
+
+		dev_info(pctl->dev,
+			 "Setting voltage bias to %sV on bank P%c\n",
+			 val ? "1.8" : "3.3", 'A' + bank);
+
+		raw_spin_lock_irqsave(&pctl->lock, flags);
+		reg = readl(pctl->membase + PIO_POW_MOD_SEL_REG);
+		reg &= ~(1 << bank);
+		writel(reg | val << bank, pctl->membase + PIO_POW_MOD_SEL_REG);
+		raw_spin_unlock_irqrestore(&pctl->lock, flags);
 	}
 
 	return 0;
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.h b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
index 476772f91dba..3a66376f141b 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.h
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
@@ -95,7 +95,10 @@
 #define PINCTRL_SUN7I_A20	BIT(7)
 #define PINCTRL_SUN8I_R40	BIT(8)
 
+#define PIO_POW_MOD_SEL_REG	0x340
+
 #define IO_BIAS_CFG_V1		1
+#define IO_BIAS_CFG_V2		2
 
 struct sunxi_desc_function {
 	unsigned long	variant;
-- 
2.21.0


  parent reply	other threads:[~2019-04-05 23:52 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-05 23:45 [PATCH 00/12] Add support for Orange Pi 3 megous
2019-04-05 23:45 ` [PATCH 01/12] arm64: dts: allwinner: h6: Add Orange Pi 3 DTS megous
2019-04-08  7:46   ` Maxime Ripard
2019-04-08 22:58     ` Ondřej Jirman
2019-04-09  7:22       ` Maxime Ripard
2019-04-05 23:45 ` [PATCH 02/12] drm: sun4i: Add support for enabling DDC I2C bus to dw_hdmi glue megous
2019-04-08  7:23   ` Maxime Ripard
2019-04-08  7:28     ` [linux-sunxi] " Chen-Yu Tsai
2019-04-08  8:47       ` Maxime Ripard
2019-04-08 12:17         ` Ondřej Jirman
2019-04-09  7:45           ` Maxime Ripard
2019-04-05 23:45 ` [PATCH 03/12] dt-bindings: display: sun4i-drm: Add DDC power supply megous
2019-04-05 23:45 ` [PATCH 04/12] arm64: dts: allwinner: orange-pi-3: Enable HDMI output megous
2019-04-08  7:24   ` Maxime Ripard
2019-04-05 23:45 ` [PATCH 05/12] net: stmmac: sun8i: add support for Allwinner H6 EMAC megous
2019-04-08  7:25   ` Maxime Ripard
2019-04-05 23:45 ` [PATCH 06/12] net: stmmac: sun8i: force select external PHY when no internal one megous
2019-04-06 10:24   ` Sergei Shtylyov
2019-04-05 23:45 ` [PATCH 07/12] arm64: dts: allwinner: orange-pi-3: Enable ethernet megous
2019-04-08  6:11   ` Jagan Teki
2019-04-08 22:26     ` Ondřej Jirman
2019-04-08  7:40   ` Maxime Ripard
2019-04-08 23:22     ` Ondřej Jirman
2019-04-09  7:23       ` Maxime Ripard
2019-04-09  7:35       ` Linus Walleij
2019-04-05 23:45 ` [PATCH 08/12] arm64: dts: allwinner: h6: Add MMC1 pins megous
2019-04-08  7:43   ` Maxime Ripard
2019-04-08 22:41     ` Ondřej Jirman
2019-04-09  7:20       ` Maxime Ripard
2019-04-05 23:45 ` [PATCH 09/12] pinctrl: sunxi: Prepare for alternative bias voltage setting methods megous
2019-04-08 12:53   ` Linus Walleij
2019-04-08 13:08     ` Ondřej Jirman
2019-04-05 23:45 ` megous [this message]
2019-04-08  1:31   ` [PATCH 10/12] pinctrl: sunxi: Support I/O bias voltage setting on H6 Ondřej Jirman
2019-04-08  7:42   ` Maxime Ripard
2019-04-05 23:45 ` [PATCH 11/12] brcmfmac: Loading the correct firmware for brcm43456 megous
2019-04-13 11:06   ` Kalle Valo
2019-04-05 23:45 ` [PATCH 12/12] arm64: dts: allwinner: orange-pi-3: Enable WiFi megous
2019-04-07 15:31   ` [linux-sunxi] " Clément Péron
2019-04-07 16:15     ` Ondřej Jirman
2019-04-07 13:36 ` [linux-sunxi] [PATCH 00/12] Add support for Orange Pi 3 Clément Péron
2019-04-07 14:32   ` Ondřej Jirman
2019-04-07 15:08     ` Clément Péron
2019-04-08  6:01     ` Jagan Teki
2019-04-08 12:46       ` Ondřej Jirman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190405234514.6183-11-megous@megous.com \
    --to=megous@megous.com \
    --cc=airlied@linux.ie \
    --cc=alexandre.torgue@st.com \
    --cc=arend.vanspriel@broadcom.com \
    --cc=brcm80211-dev-list.pdl@broadcom.com \
    --cc=brcm80211-dev-list@cypress.com \
    --cc=chi-hsien.lin@cypress.com \
    --cc=daniel@ffwll.ch \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=franky.lin@broadcom.com \
    --cc=hante.meuleman@broadcom.com \
    --cc=joabreu@synopsys.com \
    --cc=kvalo@codeaurora.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=linux-sunxi@googlegroups.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@bootlin.com \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=naveen.gupta@cypress.com \
    --cc=netdev@vger.kernel.org \
    --cc=peppe.cavallaro@st.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    --cc=wright.feng@cypress.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).