Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f7d8ba3 authored by Richard Leitner's avatar Richard Leitner Committed by Greg Kroah-Hartman
Browse files

usb: usb251xb: dt: add unit suffix to oc-delay and power-on-time 

Rename oc-delay-* to oc-delay-us and make it expect a time value.
Furthermore add -ms suffix to power-on-time. There changes were
suggested by Rob Herring in https://lkml.org/lkml/2017/2/15/1283

.

Signed-off-by: default avatarRichard Leitner <richard.leitner@skidata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cfa47afe

Documentation/devicetree/bindings/usb/usb251xb.txt

+6 −4
Original line number Original line Diff line number Diff line
@@ -31,7 +31,9 @@ Optional properties : 
	(default is individual)

	(default is individual)

 - dynamic-power-switching : enable auto-switching from self- to bus-powered

 - dynamic-power-switching : enable auto-switching from self- to bus-powered

	operation if the local power source is removed or unavailable

	operation if the local power source is removed or unavailable

 - oc-delay-{100us,4ms,8ms,16ms} : set over current timer delay (default is 8ms)

 - oc-delay-us : Delay time (in microseconds) for filtering the over-current

	sense inputs. Valid values are 100, 4000, 8000 (default) and 16000. If

	an invalid value is given, the default is used instead.

 - compound-device : indicated the hub is part of a compound device

 - compound-device : indicated the hub is part of a compound device

 - port-mapping-mode : enable port mapping mode

 - port-mapping-mode : enable port mapping mode

 - string-support : enable string descriptor support (required for manufacturer,

 - string-support : enable string descriptor support (required for manufacturer,
@@ -40,9 +42,9 @@ Optional properties : 
	device connected.

	device connected.

 - sp-disabled-ports : Specifies the ports which will be self-power disabled

 - sp-disabled-ports : Specifies the ports which will be self-power disabled

 - bp-disabled-ports : Specifies the ports which will be bus-power disabled

 - bp-disabled-ports : Specifies the ports which will be bus-power disabled

 - power-on-time : Specifies the time it takes from the time the host initiates

 - power-on-time-ms : Specifies the time it takes from the time the host

	the power-on sequence to a port until the port has adequate power. The

	initiates the power-on sequence to a port until the port has adequate

	value is given in ms in a 0 - 510 range (default is 100ms).

	power. The value is given in ms in a 0 - 510 range (default is 100ms).





Examples:

Examples:

	usb2512b@2c {

	usb2512b@2c {

drivers/usb/misc/usb251xb.c

+20 −15
Original line number Original line Diff line number Diff line
@@ -375,18 +375,24 @@ static int usb251xb_get_ofdata(struct usb251xb *hub, 
	if (of_get_property(np, "dynamic-power-switching", NULL))

	if (of_get_property(np, "dynamic-power-switching", NULL))

		hub->conf_data2 |= BIT(7);

		hub->conf_data2 |= BIT(7);





	if (of_get_property(np, "oc-delay-100us", NULL)) {

	if (!of_property_read_u32(np, "oc-delay-us", property_u32)) {

		if (*property_u32 == 100) {

			/* 100 us*/

			hub->conf_data2 &= ~BIT(5);

			hub->conf_data2 &= ~BIT(5);

			hub->conf_data2 &= ~BIT(4);

			hub->conf_data2 &= ~BIT(4);

	} else if (of_get_property(np, "oc-delay-4ms", NULL)) {

		} else if (*property_u32 == 4000) {

			/* 4 ms */

			hub->conf_data2 &= ~BIT(5);

			hub->conf_data2 &= ~BIT(5);

			hub->conf_data2 |= BIT(4);

			hub->conf_data2 |= BIT(4);

	} else if (of_get_property(np, "oc-delay-8ms", NULL)) {

		} else if (*property_u32 == 16000) {

		hub->conf_data2 |= BIT(5);

			/* 16 ms */

		hub->conf_data2 &= ~BIT(4);

	} else if (of_get_property(np, "oc-delay-16ms", NULL)) {

			hub->conf_data2 |= BIT(5);

			hub->conf_data2 |= BIT(5);

			hub->conf_data2 |= BIT(4);

			hub->conf_data2 |= BIT(4);

		} else {

			/* 8 ms (DEFAULT) */

			hub->conf_data2 |= BIT(5);

			hub->conf_data2 &= ~BIT(4);

		}

	}

	}





	if (of_get_property(np, "compound-device", NULL))

	if (of_get_property(np, "compound-device", NULL))
@@ -433,9 +439,8 @@ static int usb251xb_get_ofdata(struct usb251xb *hub, 
	}

	}





	hub->power_on_time = USB251XB_DEF_POWER_ON_TIME;

	hub->power_on_time = USB251XB_DEF_POWER_ON_TIME;

	if (!of_property_read_u32(np, "power-on-time", property_u32))

	if (!of_property_read_u32(np, "power-on-time-ms", property_u32))

		hub->power_on_time = min_t(u8, be32_to_cpu(*property_u32) / 2,

		hub->power_on_time = min_t(u8, *property_u32 / 2, 255);

					   255);





	if (of_property_read_u16_array(np, "language-id", &hub->lang_id, 1))

	if (of_property_read_u16_array(np, "language-id", &hub->lang_id, 1))

		hub->lang_id = USB251XB_DEF_LANGUAGE_ID;

		hub->lang_id = USB251XB_DEF_LANGUAGE_ID;