On Fri, Mar 21, 2008 at 5:56 PM, Bartlomiej Sieka <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]>
Comments below. > --- > 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 @@ > }; > > [EMAIL PROTECTED] { > + 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 @@ > [EMAIL PROTECTED] { > 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>; > + }; > + > + [EMAIL PROTECTED] { > + #address-cells = <1>; > + #size-cells = <0>; > + device_type = "mdio"; Drop device type; it's unneeded and unused. > + compatible = "fsl,mpc5200b-mdio"; Should technically be "fsl,mpc5200b-mdio", "fsl,mpc5200-mdio"; (I know the lite5200b.dts doesn't have this either, but I'll write a patch right now to fix it so that it's correct in .25) I regret introducing "fsl,mpc5200b-*" at all since the 5200b is really just a bug fix of the 5200 except for a very few incompatible device changes. Just the nodes for specific incompatible devices need to claim 5200b-<blah> in their compatible string (without claiming 5200-<blah>). It seems to me that specific silicon revision differences by conventional is too fine grained for the compatible field and if really needed can be discovered from the SVR. I may even drop it in the .26 series. All device trees in the wild claim compatibility with both so it won't break any existing boards. heh; I guess that's just a long winded way to say make sure fsl,mpc5200-mdio is in there so it remains possible to drop mpc5200b-mdio in the future. > + 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:[EMAIL PROTECTED] { > + device_type = "ethernet-phy"; > + reg = <0>; > + }; > }; > > [EMAIL PROTECTED] { > + #address-cells = <1>; > + #size-cells = <0>; inconsistent indentation? > 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 > + [EMAIL PROTECTED],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>; > }; > > + [EMAIL PROTECTED] { > + compatible = "mpc5200b-mscan\0mpc5200-mscan"; "mpc5200b-mscan", "mpc5200-mscan"; The '\0' is depreciated. > + interrupts = <2 11 0>; > + interrupt-parent = <&mpc5200_pic>; > + reg = <900 80>; > + }; > + > [EMAIL PROTECTED] { > compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan"; > interrupts = <2 12 0>; > @@ -148,7 +155,6 @@ > interrupt-parent = <&mpc5200_pic>; > }; > > - > [EMAIL PROTECTED] { > compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi"; > reg = <f00 20>; > @@ -164,6 +170,7 @@ > }; > > [EMAIL PROTECTED] { > + 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 > @@ -209,10 +216,26 @@ > [EMAIL PROTECTED] { > 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>; > + }; > + > + [EMAIL PROTECTED] { > + #address-cells = <1>; > + #size-cells = <0>; > + device_type = "mdio"; Drop device type > + compatible = "fsl,mpc5200b-mdio"; Same here; should include fsl,mpc5200-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:[EMAIL PROTECTED] { > + device_type = "ethernet-phy"; > + reg = <2>; > + }; > }; > > [EMAIL PROTECTED] { > @@ -223,11 +246,19 @@ > }; > > [EMAIL PROTECTED] { > + #address-cells = <1>; > + #size-cells = <0>; > compatible = > "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c"; > reg = <3d40 40>; > interrupts = <2 10 0>; > interrupt-parent = <&mpc5200_pic>; > fsl5200-clocking; > + > + [EMAIL PROTECTED] { > + device_type = "rtc"; > + compatible = "dallas,ds1339"; > + reg = <68>; > + }; > }; > > [EMAIL PROTECTED] { > @@ -240,7 +271,8 @@ > compatible = "fsl,lpb"; > #address-cells = <2>; > #size-cells = <1>; > - ranges = <1 0 50000000 00010000 > + ranges = <0 0 ff000000 01000000 > + 1 0 50000000 00010000 > 2 0 50010000 00010000 > 3 0 50020000 00010000>; > > @@ -271,31 +303,15 @@ > compatible = "promess,pro_module_dio"; > reg = <3 800 2>; > }; > - }; > > - [EMAIL PROTECTED] { > - #interrupt-cells = <1>; > - #size-cells = <2>; > - #address-cells = <3>; > - device_type = "pci"; > - compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci"; > - reg = <f0000d00 100>; > - interrupt-map-mask = <f800 0 0 7>; > - interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot > - c000 0 0 2 &mpc5200_pic 1 1 3 > - c000 0 0 3 &mpc5200_pic 1 2 3 > - c000 0 0 4 &mpc5200_pic 1 3 3 > - > - c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot > - c800 0 0 2 &mpc5200_pic 1 2 3 > - c800 0 0 3 &mpc5200_pic 1 3 3 > - c800 0 0 4 &mpc5200_pic 0 0 3>; > - clock-frequency = <0>; // From boot loader > - interrupts = <2 8 0 2 9 0 2 a 0>; > - interrupt-parent = <&mpc5200_pic>; > - bus-range = <0 0>; > - ranges = <42000000 0 80000000 80000000 0 20000000 > - 02000000 0 a0000000 a0000000 0 10000000 > - 01000000 0 00000000 b0000000 0 01000000>; > + // 16-bit flash device at LocalPlus Bus CS0 > + [EMAIL PROTECTED],0 { > + compatible = "cfi-flash"; > + reg = <0 0 01000000>; > + bank-width = <2>; > + device-width = <2>; > + #size-cells = <1>; > + #address-cells = <1>; > + }; > }; > }; > diff --git a/arch/powerpc/boot/dts/tqm5200.dts > b/arch/powerpc/boot/dts/tqm5200.dts > index c86464f..bbac984 100644 > --- a/arch/powerpc/boot/dts/tqm5200.dts > +++ b/arch/powerpc/boot/dts/tqm5200.dts > @@ -83,6 +83,7 @@ > }; > > [EMAIL PROTECTED] { > + device_type = "dma-controller"; > compatible = "fsl,mpc5200-bestcomm"; > reg = <1200 80>; > interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 > @@ -127,10 +128,26 @@ > [EMAIL PROTECTED] { > device_type = "network"; > compatible = "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>; > + }; > + > + [EMAIL PROTECTED] { > + #address-cells = <1>; > + #size-cells = <0>; > + device_type = "mdio"; ditto > + compatible = "fsl,mpc5200b-mdio"; ditto > + 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:[EMAIL PROTECTED] { > + device_type = "ethernet-phy"; > + reg = <0>; > + }; > }; > > [EMAIL PROTECTED] { > @@ -141,11 +158,19 @@ > }; > > [EMAIL PROTECTED] { > + #address-cells = <1>; > + #size-cells = <0>; > compatible = "fsl,mpc5200-i2c","fsl-i2c"; > reg = <3d40 40>; > interrupts = <2 10 0>; > interrupt-parent = <&mpc5200_pic>; > fsl5200-clocking; > + > + [EMAIL PROTECTED] { > + device_type = "rtc"; > + compatible = "dallas,ds1307"; > + reg = <68>; > + }; > }; > > [EMAIL PROTECTED] { > @@ -154,6 +179,23 @@ > }; > }; > > + lpb { > + model = "fsl,lpb"; > + compatible = "fsl,lpb"; > + #address-cells = <2>; > + #size-cells = <1>; > + ranges = <0 0 fc000000 02000000>; > + > + [EMAIL PROTECTED],0 { > + compatible = "cfi-flash"; > + reg = <0 0 02000000>; > + bank-width = <4>; > + device-width = <2>; > + #size-cells = <1>; > + #address-cells = <1>; > + }; > + }; > + > [EMAIL PROTECTED] { > #interrupt-cells = <1>; > #size-cells = <2>; > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev