linux-usb.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: George Hilliard <thirtythreeforty@gmail.com>
To: Chen-Yu Tsai <wens@csie.org>, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: George Hilliard <thirtythreeforty@gmail.com>,
	Icenowy Zheng <icenowy@aosc.io>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/5] musb: sunxi: add support for the suniv MUSB controller
Date: Tue, 31 Mar 2020 12:02:17 -0500	[thread overview]
Message-ID: <20200331170219.267732-4-thirtythreeforty@gmail.com> (raw)
In-Reply-To: <20200331170219.267732-1-thirtythreeforty@gmail.com>

The suniv SoC has a MUSB controller like the one in A33, but with a SRAM
region to be claimed.

Add support for it.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
George Hilliard: debugged, match existing style
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
---
v1..v2: reordered sun{50,iv} to match `sort` order.

 drivers/usb/musb/sunxi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index f3f76f2ac63f..9b353b97fb06 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -714,14 +714,17 @@ static int sunxi_musb_probe(struct platform_device *pdev)
 	INIT_WORK(&glue->work, sunxi_musb_work);
 	glue->host_nb.notifier_call = sunxi_musb_host_notifier;
 
-	if (of_device_is_compatible(np, "allwinner,sun4i-a10-musb"))
+	if (of_device_is_compatible(np, "allwinner,sun4i-a10-musb") ||
+	    of_device_is_compatible(np, "allwinner,suniv-f1c100s-musb")) {
 		set_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags);
+	}
 
 	if (of_device_is_compatible(np, "allwinner,sun6i-a31-musb"))
 		set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags);
 
 	if (of_device_is_compatible(np, "allwinner,sun8i-a33-musb") ||
-	    of_device_is_compatible(np, "allwinner,sun8i-h3-musb")) {
+	    of_device_is_compatible(np, "allwinner,sun8i-h3-musb") ||
+	    of_device_is_compatible(np, "allwinner,suniv-f1c100s-musb")) {
 		set_bit(SUNXI_MUSB_FL_HAS_RESET, &glue->flags);
 		set_bit(SUNXI_MUSB_FL_NO_CONFIGDATA, &glue->flags);
 	}
@@ -818,6 +821,7 @@ static const struct of_device_id sunxi_musb_match[] = {
 	{ .compatible = "allwinner,sun6i-a31-musb", },
 	{ .compatible = "allwinner,sun8i-a33-musb", },
 	{ .compatible = "allwinner,sun8i-h3-musb", },
+	{ .compatible = "allwinner,suniv-f1c100s-musb", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, sunxi_musb_match);
-- 
2.26.0


  parent reply	other threads:[~2020-03-31 17:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31 17:02 [PATCH v2 0/5] Support the Allwinner F1C100s USB stack George Hilliard
2020-03-31 17:02 ` [PATCH v2 1/5] dt-bindings: Add new F1C100s compatible strings for USB George Hilliard
2020-03-31 17:02 ` [PATCH v2 2/5] phy: sun4i-usb: add support for the USB PHY on suniv SoC George Hilliard
2020-03-31 17:02 ` George Hilliard [this message]
2020-03-31 17:02 ` [PATCH v2 4/5] ARM: suniv: add USB-related device nodes George Hilliard
2020-03-31 17:02 ` [PATCH v2 5/5] ARM: suniv: f1c100s: enable USB on Lichee Pi Nano George Hilliard

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=20200331170219.267732-4-thirtythreeforty@gmail.com \
    --to=thirtythreeforty@gmail.com \
    --cc=icenowy@aosc.io \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.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 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).