From: Felipe Balbi <balbi@ti.com>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: linux-usb@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
Benoit Cousson <benoit.cousson@linaro.org>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>
Subject: Re: [PATCH 1/4] usb: usb: dsps: update code according to the binding document
Date: Fri, 20 Sep 2013 10:44:39 -0500 [thread overview]
Message-ID: <20130920154439.GW26101@radagast> (raw)
In-Reply-To: <1376580112-17677-2-git-send-email-bigeasy@linutronix.de>
[-- Attachment #1: Type: text/plain, Size: 5118 bytes --]
+ linux-omap, Benoit
On Thu, Aug 15, 2013 at 05:21:49PM +0200, Sebastian Andrzej Siewior wrote:
> This relfects the code and dts requires changes due to recent .dts
> binding updates:
> - use mg prefix for the Metor Graphics specific attributes
> - use power in mA not in mA/2 as specifed in the USB2.0 specification
>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
hope this can go in during the -rc cycle
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/boot/dts/am335x-bone.dts | 2 +-
> arch/arm/boot/dts/am335x-evm.dts | 6 +++---
> arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
> arch/arm/boot/dts/am33xx.dtsi | 26 +++++++++++++-------------
> drivers/usb/musb/musb_dsps.c | 11 ++++++-----
> 5 files changed, 24 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index a8907b5..e8447a7 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -127,7 +127,7 @@
> status = "okay";
> };
>
> - phy@47401300 {
> + usb-phy@47401300 {
> status = "okay";
> };
>
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index c26c16c..648a67e 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -178,11 +178,11 @@
> status = "okay";
> };
>
> - phy@47401300 {
> + usb-phy@47401300 {
> status = "okay";
> };
>
> - phy@47401b00 {
> + usb-phy@47401b00 {
> status = "okay";
> };
>
> @@ -194,7 +194,7 @@
> status = "okay";
> };
>
> - dma@07402000 {
> + dma-controller@07402000 {
> status = "okay";
> };
> };
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index e92446c..a6c5033 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -214,7 +214,7 @@
> status = "okay";
> };
>
> - phy@47401300 {
> + usb-phy@47401300 {
> status = "okay";
> };
>
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index a38f8d3..c57c6b8 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -354,7 +354,7 @@
> status = "disabled";
> };
>
> - usb0_phy: phy@47401300 {
> + usb0_phy: usb-phy@47401300 {
> compatible = "ti,am335x-usb-phy";
> reg = <0x47401300 0x100>;
> reg-names = "phy";
> @@ -377,11 +377,11 @@
> reg-names = "mc";
> interrupts = <18>;
> interrupt-names = "mc";
> - multipoint = <1>;
> - num-eps = <16>;
> - ram-bits = <12>;
> - port-mode = <3>;
> - power = <250>;
> + mg,multipoint = <1>;
> + mg,num-eps = <16>;
> + mg,ram-bits = <12>;
> + mg,port-mode = <3>;
> + mg,power = <500>;
> phys = <&usb0_phy>;
>
> dmas = <&cppi41dma 0 0 &cppi41dma 1 0
> @@ -409,7 +409,7 @@
> };
> };
>
> - usb1_phy: phy@47401b00 {
> + usb1_phy: usb-phy@47401b00 {
> compatible = "ti,am335x-usb-phy";
> reg = <0x47401b00 0x100>;
> reg-names = "phy";
> @@ -432,11 +432,11 @@
> reg-names = "mc";
> interrupts = <19>;
> interrupt-names = "mc";
> - multipoint = <1>;
> - num-eps = <16>;
> - ram-bits = <12>;
> - port-mode = <3>;
> - power = <250>;
> + mg,multipoint = <1>;
> + mg,num-eps = <16>;
> + mg,ram-bits = <12>;
> + mg,port-mode = <3>;
> + mg,power = <500>;
> phys = <&usb1_phy>;
>
> dmas = <&cppi41dma 15 0 &cppi41dma 16 0
> @@ -464,7 +464,7 @@
> };
> };
>
> - cppi41dma: dma@07402000 {
> + cppi41dma: dma-controller@07402000 {
> compatible = "ti,am3359-cppi41";
> reg = <0x47400000 0x1000
> 0x47402000 0x1000
> diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
> index 4ffbaac..7368577 100644
> --- a/drivers/usb/musb/musb_dsps.c
> +++ b/drivers/usb/musb/musb_dsps.c
> @@ -485,11 +485,12 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue,
> pdata.config = config;
> pdata.platform_ops = &dsps_ops;
>
> - config->num_eps = get_int_prop(child_node, "num-eps");
> - config->ram_bits = get_int_prop(child_node, "ram-bits");
> - pdata.mode = get_int_prop(child_node, "port-mode");
> - pdata.power = get_int_prop(child_node, "power");
> - config->multipoint = of_property_read_bool(child_node, "multipoint");
> + config->num_eps = get_int_prop(child_node, "mg,num-eps");
> + config->ram_bits = get_int_prop(child_node, "mg,ram-bits");
> + pdata.mode = get_int_prop(child_node, "mg,port-mode");
> + /* DT keeps this entry in mA, musb expects it as per USB spec */
> + pdata.power = get_int_prop(child_node, "mg,power") / 2;
> + config->multipoint = of_property_read_bool(child_node, "mg,multipoint");
>
> ret = platform_device_add_data(musb, &pdata, sizeof(pdata));
> if (ret) {
> --
> 1.8.4.rc2
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next parent reply other threads:[~2013-09-20 15:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1376580112-17677-1-git-send-email-bigeasy@linutronix.de>
[not found] ` <1376580112-17677-2-git-send-email-bigeasy@linutronix.de>
2013-09-20 15:44 ` Felipe Balbi [this message]
[not found] ` <1376580112-17677-3-git-send-email-bigeasy@linutronix.de>
2013-09-20 15:44 ` [PATCH 2/4] usb: musb: am335x: add second port to beagle bone Felipe Balbi
[not found] ` <1376580112-17677-4-git-send-email-bigeasy@linutronix.de>
2013-09-20 15:45 ` [PATCH 3/4] usb: musb: am335x: Do not remove the session bit HOST-only mode Felipe Balbi
2013-09-23 14:47 ` Sebastian Andrzej Siewior
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=20130920154439.GW26101@radagast \
--to=balbi@ti.com \
--cc=benoit.cousson@linaro.org \
--cc=bigeasy@linutronix.de \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.