All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philipp Puschmann <philipp.puschmann@emlix.com>
To: gregkh@linuxfoundation.org
Cc: robh+dt@kernel.org, mark.rutland@arm.com, Peter.Chen@nxp.com,
	linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, philipp.puschmann@emlix.com
Subject: [PATCH 2/2] usb: chipidea: imx: set power polarity
Date: Tue, 15 Jan 2019 13:31:13 +0100	[thread overview]
Message-ID: <20190115123113.20577-2-philipp.puschmann@emlix.com> (raw)
In-Reply-To: <20190115123113.20577-1-philipp.puschmann@emlix.com>

This patch adds support to set the power line polarity for i.MX6q/dl.

To let the USB controller control the power it may be necessary to configure
the polarity of the power line. So far the polarity was configured
by Bootloader or alternatively the power line was muxed as gpio and
driven by a regulator.

Signed-off-by: Philipp Puschmann <philipp.puschmann@emlix.com>
---
 drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
 drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
 drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index e81de9ca8729..32dc120680fa 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -152,6 +152,9 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
 		dev_warn(dev, "No over current polarity defined\n");
 	}
 
+	if (of_find_property(np, "power-active-high", NULL))
+		data->pwr_pol = 1;
+
 	if (of_find_property(np, "external-vbus-divider", NULL))
 		data->evdo = 1;
 
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h
index 7cc53e2ce564..c842e03f8767 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.h
+++ b/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -18,6 +18,7 @@ struct imx_usbmisc_data {
 	/* true if dt specifies polarity */
 	unsigned int oc_pol_configured:1;
 
+	unsigned int pwr_pol:1; /* power polarity */
 	unsigned int evdo:1; /* set external vbus divider option */
 	unsigned int ulpi:1; /* connected to an ULPI phy */
 	unsigned int hsic:1; /* HSIC controlller */
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 097ffbca0bd9..13e52632aece 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -63,6 +63,7 @@
 #define MX6_BM_NON_BURST_SETTING	BIT(1)
 #define MX6_BM_OVER_CUR_DIS		BIT(7)
 #define MX6_BM_OVER_CUR_POLARITY	BIT(8)
+#define MX6_BM_PWR_POLARITY		BIT(9)
 #define MX6_BM_WAKEUP_ENABLE		BIT(10)
 #define MX6_BM_UTMI_ON_CLOCK		BIT(13)
 #define MX6_BM_ID_WAKEUP		BIT(16)
@@ -383,6 +384,9 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
 		else if (data->oc_pol_configured)
 			reg &= ~MX6_BM_OVER_CUR_POLARITY;
 	}
+	/* If the polarity is not set keep it as setup by the bootlader */
+	if (data->pwr_polarity == 1)
+		reg |= MX6_BM_PWR_POLARITY;
 	writel(reg, usbmisc->base + data->index * 4);
 
 	/* SoC non-burst setting */
-- 
2.20.1


WARNING: multiple messages have this Message-ID (diff)
From: Philipp Puschmann <philipp.puschmann@emlix.com>
To: gregkh@linuxfoundation.org
Cc: robh+dt@kernel.org, mark.rutland@arm.com, Peter.Chen@nxp.com,
	linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, philipp.puschmann@emlix.com
Subject: [2/2] usb: chipidea: imx: set power polarity
Date: Tue, 15 Jan 2019 13:31:13 +0100	[thread overview]
Message-ID: <20190115123113.20577-2-philipp.puschmann@emlix.com> (raw)

This patch adds support to set the power line polarity for i.MX6q/dl.

To let the USB controller control the power it may be necessary to configure
the polarity of the power line. So far the polarity was configured
by Bootloader or alternatively the power line was muxed as gpio and
driven by a regulator.

Signed-off-by: Philipp Puschmann <philipp.puschmann@emlix.com>
---
 drivers/usb/chipidea/ci_hdrc_imx.c | 3 +++
 drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
 drivers/usb/chipidea/usbmisc_imx.c | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index e81de9ca8729..32dc120680fa 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -152,6 +152,9 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
 		dev_warn(dev, "No over current polarity defined\n");
 	}
 
+	if (of_find_property(np, "power-active-high", NULL))
+		data->pwr_pol = 1;
+
 	if (of_find_property(np, "external-vbus-divider", NULL))
 		data->evdo = 1;
 
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h
index 7cc53e2ce564..c842e03f8767 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.h
+++ b/drivers/usb/chipidea/ci_hdrc_imx.h
@@ -18,6 +18,7 @@ struct imx_usbmisc_data {
 	/* true if dt specifies polarity */
 	unsigned int oc_pol_configured:1;
 
+	unsigned int pwr_pol:1; /* power polarity */
 	unsigned int evdo:1; /* set external vbus divider option */
 	unsigned int ulpi:1; /* connected to an ULPI phy */
 	unsigned int hsic:1; /* HSIC controlller */
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 097ffbca0bd9..13e52632aece 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -63,6 +63,7 @@
 #define MX6_BM_NON_BURST_SETTING	BIT(1)
 #define MX6_BM_OVER_CUR_DIS		BIT(7)
 #define MX6_BM_OVER_CUR_POLARITY	BIT(8)
+#define MX6_BM_PWR_POLARITY		BIT(9)
 #define MX6_BM_WAKEUP_ENABLE		BIT(10)
 #define MX6_BM_UTMI_ON_CLOCK		BIT(13)
 #define MX6_BM_ID_WAKEUP		BIT(16)
@@ -383,6 +384,9 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
 		else if (data->oc_pol_configured)
 			reg &= ~MX6_BM_OVER_CUR_POLARITY;
 	}
+	/* If the polarity is not set keep it as setup by the bootlader */
+	if (data->pwr_polarity == 1)
+		reg |= MX6_BM_PWR_POLARITY;
 	writel(reg, usbmisc->base + data->index * 4);
 
 	/* SoC non-burst setting */

  reply	other threads:[~2019-01-15 12:40 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-15 12:31 [PATCH 1/2] dt-bindings: usb: ci-hdrc-usb2: add property power-active-high Philipp Puschmann
2019-01-15 12:31 ` [1/2] " Philipp Puschmann
2019-01-15 12:31 ` Philipp Puschmann [this message]
2019-01-15 12:31   ` [2/2] usb: chipidea: imx: set power polarity Philipp Puschmann
2019-01-16 10:51 ` [PATCH v2,1/2] dt-bindings: usb: ci-hdrc-usb2: add property power-active-high Philipp Puschmann
2019-01-16 10:51   ` [v2,1/2] " Philipp Puschmann
2019-01-16 10:51   ` [PATCH v2,2/2] usb: chipidea: imx: set power polarity Philipp Puschmann
2019-01-16 10:51     ` [v2,2/2] " Philipp Puschmann
2019-01-16 11:11     ` [PATCH v3 1/2] dt-bindings: usb: ci-hdrc-usb2: add property power-active-high Philipp Puschmann
2019-01-16 11:11       ` [v3,1/2] " Philipp Puschmann
2019-01-16 11:11       ` [PATCH v3 2/2] usb: chipidea: imx: set power polarity Philipp Puschmann
2019-01-16 11:11         ` [v3,2/2] " Philipp Puschmann
2019-01-16 19:51       ` [PATCH v3 1/2] dt-bindings: usb: ci-hdrc-usb2: add property power-active-high Rob Herring
2019-01-16 19:51         ` [v3,1/2] " Rob Herring
2019-01-16 19:51         ` [PATCH v3 1/2] " Rob Herring
2019-01-17  7:01       ` Peter Chen
2019-01-17  7:01         ` [v3,1/2] " Peter Chen
2019-01-21 18:00         ` [PATCH v3 1/2] " Philipp Puschmann
2019-01-21 18:00           ` [v3,1/2] " Philipp Puschmann
2019-01-22  7:50           ` [PATCH v3 1/2] " Peter Chen
2019-01-22  7:50             ` [v3,1/2] " Peter Chen
2019-01-16 16:32     ` [PATCH v2,2/2] usb: chipidea: imx: set power polarity Sergei Shtylyov
2019-01-16 16:32       ` [v2,2/2] " Sergei Shtylyov
2019-01-21 17:57       ` [PATCH v2,2/2] " Philipp Puschmann
2019-01-21 17:57         ` [v2,2/2] " Philipp Puschmann

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=20190115123113.20577-2-philipp.puschmann@emlix.com \
    --to=philipp.puschmann@emlix.com \
    --cc=Peter.Chen@nxp.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.