linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
To: "周琰杰 (Zhou Yanjie)" <zhouyanjie@wanyeetech.com>,
	"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
	"robh+dt@kernel.org" <robh+dt@kernel.org>
Cc: "paul@crapouillou.net" <paul@crapouillou.net>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
	"linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"dongsheng.qiu@ingenic.com" <dongsheng.qiu@ingenic.com>,
	"aric.pzqi@ingenic.com" <aric.pzqi@ingenic.com>,
	"rick.tyliu@ingenic.com" <rick.tyliu@ingenic.com>,
	"sihui.liu@ingenic.com" <sihui.liu@ingenic.com>,
	"jun.jiang@ingenic.com" <jun.jiang@ingenic.com>,
	"sernia.zhou@foxmail.com" <sernia.zhou@foxmail.com>,
	"Dragan Čečavac" <dragancecavac@yahoo.com>
Subject: Re: [PATCH 2/2] USB: dwc2: Add OTG support for Ingenic SoCs.
Date: Fri, 30 Jul 2021 06:33:55 +0000	[thread overview]
Message-ID: <2ad5780a-bce9-1dc9-3cd8-8b78f4c0a61b@synopsys.com> (raw)
In-Reply-To: <1627116521-124612-3-git-send-email-zhouyanjie@wanyeetech.com>

On 7/24/2021 12:48 PM, 周琰杰 (Zhou Yanjie) wrote:
> Add OTG support for the JZ4775 SoC, the JZ4780 SoC, the X1000
> SoC, the X1600 SoC, the X1830 SoC, and the X2000 SoC. Introduce
> support for disable Ingenic overcurrent detection, once selected
> it enables GOTGCTL register bits VbvalidOvEn and VbvalidOvVal to
> disable the VBUS overcurrent detection.
> 
> This patch is derived from Dragan Čečavac (in the kernel 3.18.3
> tree of CI20). It is very useful for the MIPS Creator CI20 (r1).
> Without this patch, OTG port of CI20 has a great probability to
> face overcurrent warning, which breaks the OTG functionality.
> 
> Signed-off-by: Dragan Čečavac <dragancecavac@yahoo.com>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>

Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>

> ---
>   drivers/usb/dwc2/core.c   |  9 +++++++++
>   drivers/usb/dwc2/core.h   |  5 +++++
>   drivers/usb/dwc2/params.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++-
>   3 files changed, 62 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
> index 272ae57..c35b2e2 100644
> --- a/drivers/usb/dwc2/core.c
> +++ b/drivers/usb/dwc2/core.c
> @@ -1153,6 +1153,7 @@ static void dwc2_set_turnaround_time(struct dwc2_hsotg *hsotg)
>   int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>   {
>   	u32 usbcfg;
> +	u32 otgctl;
>   	int retval = 0;
>   
>   	if ((hsotg->params.speed == DWC2_SPEED_PARAM_FULL ||
> @@ -1187,6 +1188,14 @@ int dwc2_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
>   		dwc2_writel(hsotg, usbcfg, GUSBCFG);
>   	}
>   
> +	if (hsotg->params.deactivate_ingenic_overcurrent_detection) {
> +		if (dwc2_is_host_mode(hsotg)) {
> +			otgctl = readl(hsotg->regs + GOTGCTL);
> +			otgctl |= GOTGCTL_VBVALOEN | GOTGCTL_VBVALOVAL;
> +			writel(otgctl, hsotg->regs + GOTGCTL);
> +		}
> +	}
> +
>   	return retval;
>   }
>   
> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
> index ab6b815..e026d13 100644
> --- a/drivers/usb/dwc2/core.h
> +++ b/drivers/usb/dwc2/core.h
> @@ -418,6 +418,10 @@ enum dwc2_ep0_state {
>    *			detection using GGPIO register.
>    *			0 - Deactivate the external level detection (default)
>    *			1 - Activate the external level detection
> + * @deactivate_ingenic_overcurrent_detection: Deactivate Ingenic overcurrent
> + *			detection.
> + *			0 - Activate the overcurrent detection (default)
> + *			1 - Deactivate the overcurrent detection
>    * @g_dma:              Enables gadget dma usage (default: autodetect).
>    * @g_dma_desc:         Enables gadget descriptor DMA (default: autodetect).
>    * @g_rx_fifo_size:	The periodic rx fifo size for the device, in
> @@ -489,6 +493,7 @@ struct dwc2_core_params {
>   	u8 hird_threshold;
>   	bool activate_stm_fs_transceiver;
>   	bool activate_stm_id_vb_detection;
> +	bool deactivate_ingenic_overcurrent_detection;
>   	bool ipg_isoc_en;
>   	u16 max_packet_count;
>   	u32 max_transfer_size;
> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
> index 67c5eb1..a7a1b50 100644
> --- a/drivers/usb/dwc2/params.c
> +++ b/drivers/usb/dwc2/params.c
> @@ -71,6 +71,47 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
>   	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>   }
>   
> +static void dwc2_set_jz4775_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
> +static void dwc2_set_x1600_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->host_channels = 16;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
> +static void dwc2_set_x2000_params(struct dwc2_hsotg *hsotg)
> +{
> +	struct dwc2_core_params *p = &hsotg->params;
> +
> +	p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
> +	p->speed = DWC2_SPEED_PARAM_HIGH;
> +	p->host_rx_fifo_size = 1024;
> +	p->host_nperio_tx_fifo_size = 1024;
> +	p->host_perio_tx_fifo_size = 1024;
> +	p->host_channels = 16;
> +	p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
> +	p->phy_utmi_width = 16;
> +	p->deactivate_ingenic_overcurrent_detection =
> +		device_property_read_bool(hsotg->dev, "disable-over-current");
> +}
> +
>   static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
>   {
>   	struct dwc2_core_params *p = &hsotg->params;
> @@ -202,7 +243,13 @@ static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg)
>   
>   const struct of_device_id dwc2_of_match_table[] = {
>   	{ .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params },
> -	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params  },
> +	{ .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params },
> +	{ .compatible = "ingenic,jz4775-otg", .data = dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,jz4780-otg", .data = dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,x1000-otg", .data = dwc2_set_jz4775_params },
> +	{ .compatible = "ingenic,x1600-otg", .data = dwc2_set_x1600_params },
> +	{ .compatible = "ingenic,x1830-otg", .data = dwc2_set_x1600_params },
> +	{ .compatible = "ingenic,x2000-otg", .data = dwc2_set_x2000_params },
>   	{ .compatible = "rockchip,rk3066-usb", .data = dwc2_set_rk_params },
>   	{ .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params },
>   	{ .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params },
> 


      parent reply	other threads:[~2021-07-30  6:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-24  8:48 [PATCH 0/2] " 周琰杰 (Zhou Yanjie)
2021-07-24  8:48 ` [PATCH 1/2] dt-bindings: dwc2: Add bindings for new " 周琰杰 (Zhou Yanjie)
2021-07-24 10:46   ` Paul Cercueil
2021-07-24 12:52     ` Zhou Yanjie
2021-07-25 10:31       ` Paul Cercueil
2021-07-30  9:33         ` Zhou Yanjie
2021-07-29 21:38   ` Rob Herring
2021-07-24  8:48 ` [PATCH 2/2] USB: dwc2: Add OTG support for " 周琰杰 (Zhou Yanjie)
2021-07-24 10:49   ` Paul Cercueil
2021-07-24 13:05     ` Zhou Yanjie
2021-07-24 13:24       ` Felipe Balbi
2021-07-27 14:27   ` Greg KH
2021-07-30  9:34     ` Zhou Yanjie
2021-07-30  6:33   ` Minas Harutyunyan [this message]

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=2ad5780a-bce9-1dc9-3cd8-8b78f4c0a61b@synopsys.com \
    --to=minas.harutyunyan@synopsys.com \
    --cc=aric.pzqi@ingenic.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dongsheng.qiu@ingenic.com \
    --cc=dragancecavac@yahoo.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jun.jiang@ingenic.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=paul@crapouillou.net \
    --cc=rick.tyliu@ingenic.com \
    --cc=robh+dt@kernel.org \
    --cc=sernia.zhou@foxmail.com \
    --cc=sihui.liu@ingenic.com \
    --cc=zhouyanjie@wanyeetech.com \
    --subject='Re: [PATCH 2/2] USB: dwc2: Add OTG support for Ingenic SoCs.' \
    /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

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).