[linux-yocto] [PATCH 03/18] arch/powerpc: Checking in correct USB entries to ACP3421 DTS

[Bruce Ashfield]

On 14-02-27 02:25 PM, Charlie Paul wrote:
> From: SangeethaRao <sangeetha.rao at lsi.com>
>
> The latest USB driver in 3.10 Yocto expects more information from DTS
> than what existed in ACP3421 DTS. The ACP3421 DTS was updated with
> the extra information based on LSI hardware configurations.

And without the extra information .. what do we see on boot ? I'm
assuming silent boot death , since you are messing with the uart.

If that is the case, get that into the change log, and send the
pull request.

If it isn't the case, I await the explanation :)

Bruce

>
> Signed-off-by: SangeethaRao <sangeetha.rao at lsi.com>
> ---
>   arch/powerpc/boot/dts/acp342x.dts |   33 +++++++++++++++++----------------
>   1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/arch/powerpc/boot/dts/acp342x.dts b/arch/powerpc/boot/dts/acp342x.dts
> index b851788..f5cf3a6 100644
> --- a/arch/powerpc/boot/dts/acp342x.dts
> +++ b/arch/powerpc/boot/dts/acp342x.dts
> @@ -90,64 +90,65 @@
>                           clock-frequency = <0>; // Filled in by zImage
>                           UART0: serial at 00404000 {
>                                   device_type = "serial";
> -                                compatible = "acp-uart0";
> +                                compatible = "lsi,acp-uart0";
>                                   enabled = <1>;
>                                   reg = <0x00404000 0x1000>;
>                                   clock-reg = <0x00408040 0x20>;
>                                   clock-frequency = <0xbebc200>;
>                                   current-speed = <9600>;
>                                   interrupt-parent = <&MPIC>;
> -                                interrupts = <22 4>;
> +                                interrupts = <22>;
>                           };
>                           UART1: serial at 00405000 {
>                                   device_type = "serial";
> -                                compatible = "acp-uart1";
> +                                compatible = "lsi,acp-uart1";
>                                   enabled = <0>;
>                                   reg = <0x00405000 0x1000>;
>                                   clock-reg = <0x00408060 0x20>;
>                                   clock-frequency = <200000000>;
>                                   current-speed = <9600>;
>                                   interrupt-parent = <&MPIC>;
> -                                interrupts = <23 4>;
> +                                interrupts = <23>;
>                           };
>                           USB0: usb at 004a4000 {
>                                   device_type = "usb";
> -                                compatible = "acp-usb";
> -                                enabled = <0>;
> -                                reg = <0x004a4000 0x00020000>;
> +                                compatible = "lsi,acp-usb";
> +                                enabled = <1>;
> +                                reg = <0x20 0x004A0000 0x0 0020000>,
> +					<0x20 0x0040C000 0x0 0001000>;
>                                   interrupt-parent = <&MPIC>;
> -                                interrupts = <31 4>;
> +                                interrupts = <31>;
>                           };
>                           I2C: i2c at 00403000 {
> -                                compatible = "acp-i2c";
> +                                compatible = "lsi,acp-i2c";
>                                   enabled = <0>;
>                                   reg = <0x00403000 0x00001000>;
>                                   interrupt-parent = <&MPIC>;
> -                                interrupts = <21 4>;
> +                                interrupts = <21>;
>                           };
>                           SSP: ssp at 00402000 {
> -                                compatible = "acp-ssp";
> +                                compatible = "arm,acp-ssp";
>                                   enabled = <0>;
>                                   reg = <0x00402000 0x00001000>;
>                                   interrupt-parent = <&MPIC>;
> -                                interrupts = <20 4>;
> +                                interrupts = <20>;
>                           };
>                           NAND: nand at 00440000 {
>                                   device_type = "nand";
> -                                compatible = "acp-nand";
> +                                compatible = "lsi,acp-nand";
>                                   enabled = <1>;
>                                   reg = <0x00440000 0x20000
>                                          0x0040c000 0x1000>;
>                           };
>                           FEMAC: femac at 00480000 {
>                                   device_type = "network";
> -                                compatible = "acp-femac";
> +                                compatible = "lsi,acp-femac";
>                                   enabled = <1>;
>                                   reg = <0x00480000 0x1000
>                                          0x00481000 0x1000
>                                          0x00482000 0x1000>;
>                                   interrupt-parent = <&MPIC>;
> -                                interrupts = <33 4>;
> +                                interrupts = <33>;
>                                   mdio-reg = <0x00409000 0x1000>;
>                                   // The following will get filled in by
>                                   // the boot loader.
> @@ -284,7 +285,7 @@
>           };
>
>           rio0: rapidio at f0020000 {
> -                compatible = "acp,rapidio-delta";
> +                compatible = "lsi,rapidio-delta";
>                   device_type = "rapidio";
>                   enabled = <0>;
>                   #size = <0>;    /* 0 = (256, small system)
>