linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata
@ 2008-03-28 15:51 Kim Phillips
  2008-03-28 16:01 ` Kumar Gala
  2008-04-01  2:15 ` Kumar Gala
  0 siblings, 2 replies; 4+ messages in thread
From: Kim Phillips @ 2008-03-28 15:51 UTC (permalink / raw)
  To: linuxppc-dev, Kumar Gala; +Cc: linux-ide, jgarzik

as prescribed in Documentation/powerpc/booting-without-of.txt.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
---
 arch/powerpc/boot/dts/mpc8377_mds.dts |    4 ++--
 arch/powerpc/boot/dts/mpc8379_mds.dts |    8 ++++----
 drivers/ata/sata_fsl.c                |    5 +----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 49c05e9..eac8e1b 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -255,14 +255,14 @@
 		};
 
 		sata@18000 {
-			compatible = "fsl,mpc8379-sata";
+			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
 			reg = <0x18000 0x1000>;
 			interrupts = <44 0x8>;
 			interrupt-parent = <&ipic>;
 		};
 
 		sata@19000 {
-			compatible = "fsl,mpc8379-sata";
+			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
 			reg = <0x19000 0x1000>;
 			interrupts = <45 0x8>;
 			interrupt-parent = <&ipic>;
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index fdb4a92..6f78a9f 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -255,28 +255,28 @@
 		};
 
 		sata@18000 {
-			compatible = "fsl,mpc8379-sata";
+			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
 			reg = <0x18000 0x1000>;
 			interrupts = <44 0x8>;
 			interrupt-parent = <&ipic>;
 		};
 
 		sata@19000 {
-			compatible = "fsl,mpc8379-sata";
+			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
 			reg = <0x19000 0x1000>;
 			interrupts = <45 0x8>;
 			interrupt-parent = <&ipic>;
 		};
 
 		sata@1a000 {
-			compatible = "fsl,mpc8379-sata";
+			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
 			reg = <0x1a000 0x1000>;
 			interrupts = <46 0x8>;
 			interrupt-parent = <&ipic>;
 		};
 
 		sata@1b000 {
-			compatible = "fsl,mpc8379-sata";
+			compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
 			reg = <0x1b000 0x1000>;
 			interrupts = <47 0x8>;
 			interrupt-parent = <&ipic>;
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 07791a7..4c19855 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1348,10 +1348,7 @@ static int sata_fsl_remove(struct of_device *ofdev)
 
 static struct of_device_id fsl_sata_match[] = {
 	{
-		.compatible = "fsl,mpc8315-sata",
-	},
-	{
-		.compatible = "fsl,mpc8379-sata",
+		.compatible = "fsl,pq-sata",
 	},
 	{},
 };
-- 
1.5.4.4.481.g5075

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata
  2008-03-28 15:51 [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata Kim Phillips
@ 2008-03-28 16:01 ` Kumar Gala
  2008-03-28 16:27   ` Jeff Garzik
  2008-04-01  2:15 ` Kumar Gala
  1 sibling, 1 reply; 4+ messages in thread
From: Kumar Gala @ 2008-03-28 16:01 UTC (permalink / raw)
  To: Kim Phillips; +Cc: linuxppc-dev, jgarzik, linux-ide


On Mar 28, 2008, at 10:51 AM, Kim Phillips wrote:
> as prescribed in Documentation/powerpc/booting-without-of.txt.
>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> ---

Jeff, I'll take this via the powerpc tree if you don't have any issue.

- k

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata
  2008-03-28 16:01 ` Kumar Gala
@ 2008-03-28 16:27   ` Jeff Garzik
  0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2008-03-28 16:27 UTC (permalink / raw)
  To: Kumar Gala; +Cc: Kim Phillips, linuxppc-dev, linux-ide

Kumar Gala wrote:
> 
> On Mar 28, 2008, at 10:51 AM, Kim Phillips wrote:
>> as prescribed in Documentation/powerpc/booting-without-of.txt.
>>
>> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
>> Cc: Jeff Garzik <jgarzik@pobox.com>
>> ---
> 
> Jeff, I'll take this via the powerpc tree if you don't have any issue.

ACK



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata
  2008-03-28 15:51 [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata Kim Phillips
  2008-03-28 16:01 ` Kumar Gala
@ 2008-04-01  2:15 ` Kumar Gala
  1 sibling, 0 replies; 4+ messages in thread
From: Kumar Gala @ 2008-04-01  2:15 UTC (permalink / raw)
  To: Kim Phillips; +Cc: linuxppc-dev, linux-ide, jgarzik


On Mar 28, 2008, at 10:51 AM, Kim Phillips wrote:
> as prescribed in Documentation/powerpc/booting-without-of.txt.
>
> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> ---
> arch/powerpc/boot/dts/mpc8377_mds.dts |    4 ++--
> arch/powerpc/boot/dts/mpc8379_mds.dts |    8 ++++----
> drivers/ata/sata_fsl.c                |    5 +----
> 3 files changed, 7 insertions(+), 10 deletions(-)

applied.

- k

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-04-01  2:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-28 15:51 [PATCH 3/3] sata_fsl: reduce compatibility to fsl,pq-sata Kim Phillips
2008-03-28 16:01 ` Kumar Gala
2008-03-28 16:27   ` Jeff Garzik
2008-04-01  2:15 ` Kumar Gala

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).