From: Mans Rullgard <mans@mansr.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [RESEND][PATCH 2/2] usb: hub: use non-removable-ports DT property
Date: Fri, 24 Jan 2020 15:25:04 +0000 [thread overview]
Message-ID: <20200124152504.23411-2-mans@mansr.com> (raw)
In-Reply-To: <20200124152504.23411-1-mans@mansr.com>
Mark any ports listed in the non-removable-ports DT property as
hardwired. This is useful for boards with built-in USB devices
that cannot be (or have not been) marked as fixed in hardware.
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
drivers/usb/core/hub.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 4ac74b354801..97f8f15fb632 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1366,6 +1366,9 @@ static int hub_configure(struct usb_hub *hub,
unsigned unit_load;
unsigned full_load;
unsigned maxchild;
+ struct property *prop;
+ const __be32 *cur;
+ u32 val;
hub->buffer = kmalloc(sizeof(*hub->buffer), GFP_KERNEL);
if (!hub->buffer) {
@@ -1667,6 +1670,19 @@ static int hub_configure(struct usb_hub *hub,
}
}
+ of_property_for_each_u32(hub_dev->of_node, "non-removable-ports",
+ prop, cur, val) {
+ if (val < 1 || val > hdev->maxchild) {
+ dev_warn(hub_dev,
+ "bad port number %u in non-removable-ports\n",
+ val);
+ continue;
+ }
+
+ hub->ports[val - 1]->connect_type =
+ USB_PORT_CONNECT_TYPE_HARD_WIRED;
+ }
+
usb_hub_adjust_deviceremovable(hdev, hub->descriptor);
hub_activate(hub, HUB_INIT);
--
2.25.0
next prev parent reply other threads:[~2020-01-24 15:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 15:25 [RESEND][PATCH 1/2] dt-bindings: usb: add non-removable-ports hub property Mans Rullgard
2020-01-24 15:25 ` Mans Rullgard [this message]
2020-01-28 16:51 ` [RESEND][PATCH 2/2] usb: hub: use non-removable-ports DT property Greg Kroah-Hartman
2020-01-27 15:35 ` [RESEND][PATCH 1/2] dt-bindings: usb: add non-removable-ports hub property Rob Herring
2020-01-27 16:56 ` Måns Rullgård
2020-01-28 13:47 ` Greg Kroah-Hartman
2020-01-28 15:15 ` Måns Rullgård
2020-01-28 15:28 ` Greg Kroah-Hartman
2020-01-28 16:52 ` Greg Kroah-Hartman
2020-01-28 18:21 ` Rob Herring
2020-01-30 17:06 ` Måns Rullgård
2020-01-28 17:27 ` Rob Herring
2020-01-28 16:53 ` Greg Kroah-Hartman
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=20200124152504.23411-2-mans@mansr.com \
--to=mans@mansr.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 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).