From: Chris Brandt <chris.brandt@renesas.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Simon Horman <horms@verge.net.au>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
<linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-renesas-soc@vger.kernel.org>,
"Chris Brandt" <chris.brandt@renesas.com>
Subject: [PATCH v4 07/13] usb: renesas_usbhs: add support for CNEN bit
Date: Wed, 15 May 2019 10:20:42 -0500 [thread overview]
Message-ID: <20190515152048.42363-8-chris.brandt@renesas.com> (raw)
In-Reply-To: <20190515152048.42363-1-chris.brandt@renesas.com>
For some SoC, CNEN must be set for USB Device mode operation.
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
---
v3:
* added reviewed-by
v2:
* options are now held in param
---
drivers/usb/renesas_usbhs/common.c | 6 ++++++
drivers/usb/renesas_usbhs/common.h | 1 +
include/linux/usb/renesas_usbhs.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 1de7a44f3415..734fb4e542c5 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -114,6 +114,12 @@ void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable)
u16 mask = DCFM | DRPD | DPRPU | HSE | USBE;
u16 val = HSE | USBE;
+ /* CNEN bit is required for function operation */
+ if (usbhs_get_dparam(priv, has_cnen)) {
+ mask |= CNEN;
+ val |= CNEN;
+ }
+
/*
* if enable
*
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index 1fbffb7bbc8f..de74ebd1a347 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -104,6 +104,7 @@ struct usbhs_priv;
/* SYSCFG */
#define SCKE (1 << 10) /* USB Module Clock Enable */
+#define CNEN (1 << 8) /* Single-ended receiver operation Enable */
#define HSE (1 << 7) /* High-Speed Operation Enable */
#define DCFM (1 << 6) /* Controller Function Select */
#define DRPD (1 << 5) /* D+ Line/D- Line Resistance Control */
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 17fae6e504cc..9097a38fcda8 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -190,6 +190,7 @@ struct renesas_usbhs_driver_param {
u32 has_sudmac:1; /* for SUDMAC */
u32 has_usb_dmac:1; /* for USB-DMAC */
u32 runtime_pwctrl:1;
+ u32 has_cnen:1;
#define USBHS_USB_DMAC_XFER_SIZE 32 /* hardcode the xfer size */
};
--
2.16.1
next prev parent reply other threads:[~2019-05-15 15:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 15:20 [PATCH v4 00/13] usb: Add host and device support for RZ/A2 Chris Brandt
2019-05-15 15:20 ` [PATCH v4 01/13] phy: renesas: rcar-gen3-usb2: detect usb_x1 clock Chris Brandt
2019-05-15 15:20 ` [PATCH v4 02/13] dt-bindings: rcar-gen3-phy-usb2: Document use of usb_x1 Chris Brandt
2019-05-15 15:20 ` [PATCH v4 03/13] phy: renesas: rcar-gen3-usb2: Check dr_mode when not using OTG Chris Brandt
2019-05-15 15:20 ` [PATCH v4 04/13] dt-bindings: rcar-gen3-phy-usb2: Document dr_mode Chris Brandt
2019-05-15 15:20 ` [PATCH v4 05/13] dt-bindings: rcar-gen3-phy-usb2: Add r7s9210 support Chris Brandt
2019-05-15 15:20 ` [PATCH v4 06/13] usb: renesas_usbhs: move flags to param Chris Brandt
2019-05-15 15:20 ` Chris Brandt [this message]
2019-05-15 15:20 ` [PATCH v4 08/13] usb: renesas_usbhs: support byte addressable CFIFO Chris Brandt
2019-05-15 15:20 ` [PATCH v4 09/13] usb: renesas_usbhs: Add support for RZ/A2 Chris Brandt
2019-05-15 15:20 ` [PATCH v4 10/13] dt-bindings: usb: renesas_usbhs: Add support for r7s9210 Chris Brandt
2019-05-15 15:20 ` [PATCH v4 11/13] ARM: dts: r7s9210: Add USB Host support Chris Brandt
2019-05-20 11:42 ` Simon Horman
2019-05-15 15:20 ` [PATCH v4 12/13] ARM: dts: r7s9210: Add USB Device support Chris Brandt
2019-05-20 11:43 ` Simon Horman
2019-05-15 15:20 ` [PATCH v4 13/13] ARM: dts: rza2mevb: Add USB Host support Chris Brandt
2019-05-20 11:43 ` Simon Horman
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=20190515152048.42363-8-chris.brandt@renesas.com \
--to=chris.brandt@renesas.com \
--cc=chunfeng.yun@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=yoshihiro.shimoda.uh@renesas.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).