Subject: [PATCH 3.14 012/158] ARM: dts: am33xx: correcting dt node unit address for usb

From: [email-masked] (Johan Hovold)
Date: Mon, 5 May 2014 10:37:57 +0200

On Sun, May 04, 2014 at 11:38:41AM -0400, Greg Kroah-Hartman wrote:
> 3.14-stable review patch.  If anyone has any objections, please let me know.

This one should not be backported without commit

	a2f8d6b30321 ("ARM: dts: am335x: update USB DT references")

which is in Linus' tree but is not marked for stable (or USB will be
disabled for the boards relying on the old node addresses).

Thanks,
Johan

> ------------------
> 
> From: Mugunthan V N <[email-masked]>
> 
> commit 8abcdd680d543fb582371e146e62ba9f2af8a816 upstream.
> 
> DT node's unit address should be its own register offset address to make it a
> unique across the system. This patch corrects the incorrect USB entries with
> correct register offset for unit address.
> 
> Acked-by: Sebastian Andrzej Siewior <[email-masked]>
> Acked-by: Felipe Balbi <[email-masked]>
> Signed-off-by: Mugunthan V N <[email-masked]>
> Signed-off-by: Tony Lindgren <[email-masked]>
> Signed-off-by: Greg Kroah-Hartman <[email-masked]>
> 
> ---
>  arch/arm/boot/dts/am33xx.dtsi |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -448,7 +448,7 @@
>  			ti,hwmods = "usb_otg_hs";
>  			status = "disabled";
>  
> -			usb_ctrl_mod: control at 44e10000 {
> +			usb_ctrl_mod: control at 44e10620 {
>  				compatible = "ti,am335x-usb-ctrl-module";
>  				reg = <0x44e10620 0x10
>  					0x44e10648 0x4>;
> @@ -551,7 +551,7 @@
>  					"tx14", "tx15";
>  			};
>  
> -			cppi41dma: dma-controller at 07402000 {
> +			cppi41dma: dma-controller at 47402000 {
>  				compatible = "ti,am3359-cppi41";
>  				reg =  <0x47400000 0x1000
>  					0x47402000 0x1000