2014-04-28 14:00:27

by Guido Martínez

Subject: [PATCH 1/4] ARM: dts: am335x-bone-common: use phandles for USB and DMA refs

Use phandles instead of unit adresses to reference usb and dma nodes.
This makes the DT more robust and readable.

Signed-off-by: Guido Martínez <[email protected]>
---
arch/arm/boot/dts/am335x-bone-common.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 2e7d932..b95bc9a 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -183,28 +183,28 @@
&usb {
status = "okay";

- control@44e10620 {
+ &usb_ctrl_mod {
status = "okay";
};

- usb-phy@47401300 {
+ &usb0_phy {
status = "okay";
};

- usb-phy@47401b00 {
+ &usb1_phy {
status = "okay";
};

- usb@47401000 {
+ &usb0 {
status = "okay";
};

- usb@47401800 {
+ &usb1 {
status = "okay";
dr_mode = "host";
};

- dma-controller@47402000 {
+ &cppi41dma {
status = "okay";
};
};
--
1.9.2

2014-04-28 14:00:51

by Guido Martínez

Subject: [PATCH 3/4] ARM: dts: am335x-evmsk: use phandles for USB and DMA refs

Use phandles instead of unit adresses to reference usb and dma nodes.
This makes the DT more robust and readable.

Signed-off-by: Guido Martínez <[email protected]>
---
arch/arm/boot/dts/am335x-evmsk.dts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index ab23885..44b8d75 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -364,28 +364,28 @@
&usb {
status = "okay";

- control@44e10620 {
+ &usb_ctrl_mod {
status = "okay";
};

- usb-phy@47401300 {
+ &usb0_phy {
status = "okay";
};

- usb-phy@47401b00 {
+ &usb1_phy {
status = "okay";
};

- usb@47401000 {
+ &usb0 {
status = "okay";
};

- usb@47401800 {
+ &usb1 {
status = "okay";
dr_mode = "host";
};

- dma-controller@47402000 {
+ &cppi41dma {
status = "okay";
};
};
--
1.9.2

2014-04-28 14:01:22

by Guido Martínez

Subject: [PATCH 4/4] ARM: dts: am335x-igep0033: use phandles for USB and DMA refs

Use phandles instead of unit adresses to reference usb and dma nodes.
This makes the DT more robust and readable.

Signed-off-by: Guido Martínez <[email protected]>
---
arch/arm/boot/dts/am335x-igep0033.dtsi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 9f22c18..81cf68b 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -201,28 +201,28 @@
&usb {
status = "okay";

- control@44e10620 {
+ &usb_ctrl_mod {
status = "okay";
};

- usb-phy@47401300 {
+ &usb0_phy {
status = "okay";
};

- usb-phy@47401b00 {
+ &usb1_phy {
status = "okay";
};

- usb@47401000 {
+ &usb0 {
status = "okay";
};

- usb@47401800 {
+ &usb1 {
status = "okay";
dr_mode = "host";
};

- dma-controller@47402000 {
+ &cppi41dma {
status = "okay";
};
};
--
1.9.2

2014-04-28 14:00:45

by Guido Martínez

Subject: [PATCH 2/4] ARM: dts: am335x-evm: use phandles for USB and DMA refs

Use phandles instead of unit adresses to reference usb and dma nodes.
This makes the DT more robust and readable.

Signed-off-by: Guido Martínez <[email protected]>
---
arch/arm/boot/dts/am335x-evm.dts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 6028217..e802627 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -331,28 +331,28 @@
&usb {
status = "okay";

- control@44e10620 {
+ &usb_ctrl_mod {
status = "okay";
};

- usb-phy@47401300 {
+ &usb0_phy {
status = "okay";
};

- usb-phy@47401b00 {
+ &usb1_phy {
status = "okay";
};

- usb@47401000 {
+ &usb0 {
status = "okay";
};

- usb@47401800 {
+ &usb1 {
status = "okay";
dr_mode = "host";
};

- dma-controller@47402000 {
+ &cppi41dma {
status = "okay";
};
};
--
1.9.2

2014-04-28 14:42:27

by George Cherian

Subject: Re: [PATCH 1/4] ARM: dts: am335x-bone-common: use phandles for USB and DMA refs

On 4/28/2014 7:28 PM, Guido Martínez wrote:
> Use phandles instead of unit adresses to reference usb and dma nodes.
> This makes the DT more robust and readable.
The series will give dtb build errors
Error: arch/arm/boot/dts/am335x-bone-common.dtsi:186.2-15 syntax error
FATAL ERROR: Unable to parse input tree
Error: arch/arm/boot/dts/am335x-evmsk.dts:367.2-15 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/am335x-bone.dtb] Error 1
make[1]: *** Waiting for unfinished jobs....
Error: arch/arm/boot/dts/am335x-evm.dts:334.2-15 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/am335x-evmsk.dtb] Error 1
make[1]: *** [arch/arm/boot/dts/am335x-evm.dtb] Error 1
Error: arch/arm/boot/dts/am335x-igep0033.dtsi:204.2-15 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/am335x-base0033.dtb] Error 1
Error: arch/arm/boot/dts/am335x-bone-common.dtsi:186.2-15 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/am335x-boneblack.dtb] Error 1
make: *** [dtbs] Error 2

>
> Signed-off-by: Guido Martínez <[email protected]>
> ---
> arch/arm/boot/dts/am335x-bone-common.dtsi | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index 2e7d932..b95bc9a 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -183,28 +183,28 @@
> &usb {
> status = "okay";
>
> - control@44e10620 {
> + &usb_ctrl_mod {
> status = "okay";
> };
>
> - usb-phy@47401300 {
> + &usb0_phy {
> status = "okay";
> };
>
> - usb-phy@47401b00 {
> + &usb1_phy {
> status = "okay";
> };
>
> - usb@47401000 {
> + &usb0 {
> status = "okay";
> };
>
> - usb@47401800 {
> + &usb1 {
> status = "okay";
> dr_mode = "host";
> };
>
> - dma-controller@47402000 {
> + &cppi41dma {
> status = "okay";
> };
> };
Instead the patch should be

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi
b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 2e7d932..06be20a 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -182,31 +182,30 @@

&usb {
status = "okay";
+};
+&usb_ctrl_mod {
+ status = "okay";
+};

- control@44e10620 {
- status = "okay";
- };
-
- usb-phy@47401300 {
- status = "okay";
- };
+&usb0_phy {
+ status = "okay";
+};

- usb-phy@47401b00 {
- status = "okay";
- };
+&usb1_phy {
+ status = "okay";
+};

- usb@47401000 {
- status = "okay";
- };
+&usb {
+ status = "okay";
+};

- usb@47401800 {
- status = "okay";
- dr_mode = "host";
- };
+&usb1 {
+ status = "okay";
+ dr_mode = "host";
+};

- dma-controller@47402000 {
- status = "okay";
- };
+&cppi41dma {
+ status = "okay";
};



--
-George

2014-04-28 16:12:34

by Guido Martínez

Subject: Re: [PATCH 1/4] ARM: dts: am335x-bone-common: use phandles for USB and DMA refs

On Mon, Apr 28, 2014 at 08:11:33PM +0530, George Cherian wrote:
> On 4/28/2014 7:28 PM, Guido Mart?nez wrote:
> >Use phandles instead of unit adresses to reference usb and dma nodes.
> >This makes the DT more robust and readable.
> The series will give dtb build errors
> Error: arch/arm/boot/dts/am335x-bone-common.dtsi:186.2-15 syntax error
> FATAL ERROR: Unable to parse input tree
> Error: arch/arm/boot/dts/am335x-evmsk.dts:367.2-15 syntax error
> FATAL ERROR: Unable to parse input tree
> make[1]: *** [arch/arm/boot/dts/am335x-bone.dtb] Error 1
> make[1]: *** Waiting for unfinished jobs....
> Error: arch/arm/boot/dts/am335x-evm.dts:334.2-15 syntax error
> FATAL ERROR: Unable to parse input tree
> make[1]: *** [arch/arm/boot/dts/am335x-evmsk.dtb] Error 1
> make[1]: *** [arch/arm/boot/dts/am335x-evm.dtb] Error 1
> Error: arch/arm/boot/dts/am335x-igep0033.dtsi:204.2-15 syntax error
> FATAL ERROR: Unable to parse input tree
> make[1]: *** [arch/arm/boot/dts/am335x-base0033.dtb] Error 1
> Error: arch/arm/boot/dts/am335x-bone-common.dtsi:186.2-15 syntax error
> FATAL ERROR: Unable to parse input tree
> make[1]: *** [arch/arm/boot/dts/am335x-boneblack.dtb] Error 1
> make: *** [dtbs] Error 2
>
Terribly sorry about this. I'll send a v2.

> >
> >Signed-off-by: Guido Mart?nez <[email protected]>
> >---
> > arch/arm/boot/dts/am335x-bone-common.dtsi | 12 ++++++------
> > 1 file changed, 6 insertions(+), 6 deletions(-)
> >
> >diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> >index 2e7d932..b95bc9a 100644
> >--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> >+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> >@@ -183,28 +183,28 @@
> > &usb {
> > status = "okay";
> >- control@44e10620 {
> >+ &usb_ctrl_mod {
> > status = "okay";
> > };
> >- usb-phy@47401300 {
> >+ &usb0_phy {
> > status = "okay";
> > };
> >- usb-phy@47401b00 {
> >+ &usb1_phy {
> > status = "okay";
> > };
> >- usb@47401000 {
> >+ &usb0 {
> > status = "okay";
> > };
> >- usb@47401800 {
> >+ &usb1 {
> > status = "okay";
> > dr_mode = "host";
> > };
> >- dma-controller@47402000 {
> >+ &cppi41dma {
> > status = "okay";
> > };
> > };
> Instead the patch should be
>
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi
> b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index 2e7d932..06be20a 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -182,31 +182,30 @@
>
> &usb {
> status = "okay";
> +};
> +&usb_ctrl_mod {
> + status = "okay";
> +};
>
> - control@44e10620 {
> - status = "okay";
> - };
> -
> - usb-phy@47401300 {
> - status = "okay";
> - };
> +&usb0_phy {
> + status = "okay";
> +};
>
> - usb-phy@47401b00 {
> - status = "okay";
> - };
> +&usb1_phy {
> + status = "okay";
> +};
>
> - usb@47401000 {
> - status = "okay";
> - };
> +&usb {
> + status = "okay";
> +};
>
> - usb@47401800 {
> - status = "okay";
> - dr_mode = "host";
> - };
> +&usb1 {
> + status = "okay";
> + dr_mode = "host";
> +};
>
> - dma-controller@47402000 {
> - status = "okay";
> - };
> +&cppi41dma {
> + status = "okay";
> };
>
>
>
> --
> -George
>

--
Guido Mart?nez, VanguardiaSur
http://www.vanguardiasur.com.ar