> -----Original Message----- > From: Sergei Shtylyov [mailto:sshtylyov@xxxxxxxxxx] > Sent: Tuesday, January 18, 2011 19:27 PM > To: Zang Roy-R61911 > Cc: Sergei Shtylyov; Xu Lei-B33228; linuxppc-dev@xxxxxxxxxxxxxxxx; Gala Kumar- > B11780; jgarzik@xxxxxxxxx; linux-ide@xxxxxxxxxxxxxxx > Subject: Re: [PATCH] ATA: Add FSL sata v2 controller support > > Hello. > > On 18-01-2011 6:01, Zang Roy-R61911 wrote: > > >>> In FSL sata v2 block, the snoop bit of PRDT Word3 description > >>> information is at bit28 instead of bit22. > > >>> This patch adds FSL sata v2 probe and resolve this difference. > > >>> Signed-off-by: Xulei<B33228@xxxxxxxxxxxxx> > > > [snip] > > >>> diff --git a/arch/powerpc/boot/dts/p1022ds.dts > >> b/arch/powerpc/boot/dts/p1022ds.dts > >>> index 2bbecbb..9ad41dd 100644 > >>> --- a/arch/powerpc/boot/dts/p1022ds.dts > >>> +++ b/arch/powerpc/boot/dts/p1022ds.dts > >>> @@ -475,14 +475,14 @@ > >>> }; > >>> > >>> sata@18000 { > >>> - compatible = "fsl,mpc8536-sata", "fsl,pq-sata"; > >>> + compatible = "fsl,p1022-sata", "fsl,pq-sata-v2"; > >>> reg =<0x18000 0x1000>; > >>> cell-index =<1>; > >>> interrupts =<74 0x2>; > >>> }; > >>> > >>> sata@19000 { > >>> - compatible = "fsl,mpc8536-sata", "fsl,pq-sata"; > >>> + compatible = "fsl,p1022-sata", "fsl,pq-sata-v2"; > >>> reg =<0x19000 0x1000>; > >>> cell-index =<2>; > >>> interrupts =<41 0x2>; > > >> Please put this into the separate patch and push thru the PPC tree. > > > I agree to put to them to separate patches, but should we > > pull in the separate patches to one candidate tree to make > > the function work? > > I don't understand. What is "candidate tree"? Powerpc or ide git repository for upstream to mainline. It is odd that patches for one function in different trees. Thanks. Roy -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
