On Jan 18, 2011, at 7:10 PM, Jeff Garzik wrote: > On 01/17/2011 06:47 AM, Sergei Shtylyov wrote: >> Hello. >> >> On 17-01-2011 10:10, Xulei 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> >> >> AFAIK, full name is required. >> >>> Signed-off-by: Roy Zang <tie-fei.zang@xxxxxxxxxxxxx> >> [...] >> >>> 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 think it's OK to send 100% of this via the PPC tree. The sata_fsl.c patch for data_snoop variability directly keys off a call to platform-specific detail (of_device_is_compatible call). > > Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx> With Jeff's ack I'll pull this in via the powerpc tree's. Can we make the minor updates that Sergei has commented on. - k -- 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