public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Wolfgang Grandegger <wg@grandegger•com>
To: Bartlomiej Sieka <tur@semihalf•com>
Cc: linuxppc-dev@ozlabs•org, Anatolij Gustschin <agust@denx•de>,
	Paul Mackerras <paulus@samba•org>
Subject: Re: [POWERPC] mpc52xx: Amalgamated dts fixes and updates
Date: Mon, 24 Mar 2008 17:59:42 +0100	[thread overview]
Message-ID: <47E7DDFE.1060805@grandegger.com> (raw)
In-Reply-To: <20080321235633.GB345@frozen.semihalf.com>

Bartlomiej Sieka wrote:
> The bulk of this patch is taken from
> http://patchwork.ozlabs.org/linuxppc/patch?q=Balakowicz&id=16197, with few
> other updates, in particluar one posted by Anatolij Gustschin, which fixes
> an Oops during boot.
>     
> Signed-off-by: Marian Balakowicz <m8@semihalf•com>
> ---
> Anatolij, would you like to add your S-O-B?
> 
> diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
> index 30737ea..8b2e8e4 100644
> --- a/arch/powerpc/boot/dts/cm5200.dts
> +++ b/arch/powerpc/boot/dts/cm5200.dts
> @@ -159,6 +159,7 @@
>  		};
>  
>  		dma-controller@1200 {
> +			device_type = "dma-controller";
>  			compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
>  			reg = <1200 80>;
>  			interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
> @@ -212,13 +213,31 @@
>  		ethernet@3000 {
>  			device_type = "network";
>  			compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
> -			reg = <3000 800>;
> +			reg = <3000 400>;
>  			local-mac-address = [ 00 00 00 00 00 00 ];
>  			interrupts = <2 5 0>;
>  			interrupt-parent = <&mpc5200_pic>;
> +			phy-handle = <&phy0>;
> +		};
> +
> +		mdio@3000 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			device_type = "mdio";
> +			compatible = "fsl,mpc5200b-mdio";
> +			reg = <3000 400>;       // fec range, since we need to setup fec interrupts
> +			interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.
> +			interrupt-parent = <&mpc5200_pic>;
> +
> +			phy0:ethernet-phy@0 {
> +				device_type = "ethernet-phy";
> +				reg = <0>;
> +			};
>  		};
>  
>  		i2c@3d40 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
>  			compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
>  			reg = <3d40 40>;
>  			interrupts = <2 10 0>;
> @@ -231,4 +250,22 @@
>  			reg = <8000 4000>;
>  		};
>  	};
> +
> +	lpb {
> +		model = "fsl,lpb";
> +		compatible = "fsl,lpb";
> +		#address-cells = <2>;
> +		#size-cells = <1>;
> +		ranges = <0 0 fc000000 2000000>;
> +
> +		// 16-bit flash device at LocalPlus Bus CS0
> +		flash@0,0 {
> +			compatible = "cfi-flash";
> +			reg = <0 0 2000000>;
> +			bank-width = <2>;
> +			device-width = <2>;
> +			#size-cells = <1>;
> +			#address-cells = <1>;
> +		};
> +	};
>  };
> diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts
> index 76951ab..9ca81ff 100644
> --- a/arch/powerpc/boot/dts/motionpro.dts
> +++ b/arch/powerpc/boot/dts/motionpro.dts
> @@ -127,6 +127,13 @@
>  			interrupt-parent = <&mpc5200_pic>;
>  		};
>  
> +		mscan@900 {
> +			compatible = "mpc5200b-mscan\0mpc5200-mscan";
> +			interrupts = <2 11 0>;
> +			interrupt-parent = <&mpc5200_pic>;
> +			reg = <900 80>;
> +		};
> +

If I remember correctly, the motionpro board has only _one_ MSCAN port
wired. Therefore please discard the above hunk.

Wolfgang.

  parent reply	other threads:[~2008-03-24 16:59 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-20 14:18 Oops with TQM5200 on TQM5200 Wolfgang Grandegger
2008-03-20 14:41 ` Grant Likely
2008-03-20 15:24 ` Anatolij Gustschin
2008-03-20 16:17   ` Bartlomiej Sieka
2008-03-20 21:27     ` Grant Likely
2008-03-22 10:49       ` Anatolij Gustschin
2008-03-22 14:39         ` Grant Likely
2008-03-20 16:29   ` Wolfgang Grandegger
2008-03-20 23:50   ` Grant Likely
2008-03-21  0:07     ` Bartlomiej Sieka
2008-03-21  0:20       ` Grant Likely
2008-03-21 23:56         ` [POWERPC] mpc52xx: Amalgamated dts fixes and updates Bartlomiej Sieka
2008-03-22  0:12           ` David Gibson
2008-03-22  3:47             ` Grant Likely
2008-03-22  0:41           ` Anatolij Gustschin
2008-03-22  3:14           ` Grant Likely
2008-03-26 19:45             ` [RESEND][POWERPC] mpc5200: " Bartlomiej Sieka
2008-03-26 20:35               ` Grant Likely
2008-03-26 20:48                 ` Wolfgang Grandegger
2008-03-26 21:32                   ` Bartlomiej Sieka
2008-03-26 21:18                 ` [RESEND2][POWERPC] " Bartlomiej Sieka
2008-03-26 21:02               ` [RESEND][POWERPC] " Matt Sealey
2008-03-26 21:16                 ` Grant Likely
2008-03-26 22:51                   ` David Gibson
2008-03-26 22:57                     ` Matt Sealey
2008-03-26 23:28                       ` David Gibson
2008-03-24 16:59           ` Wolfgang Grandegger [this message]
2008-03-21  6:30       ` Oops with TQM5200 on TQM5200 Wolfgang Grandegger
2008-03-21 19:02         ` Grant Likely
2008-03-24  6:47         ` Paul Mackerras
2008-03-25  9:54           ` Wolfgang Grandegger

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=47E7DDFE.1060805@grandegger.com \
    --to=wg@grandegger$(echo .)com \
    --cc=agust@denx$(echo .)de \
    --cc=linuxppc-dev@ozlabs$(echo .)org \
    --cc=paulus@samba$(echo .)org \
    --cc=tur@semihalf$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox