diff options
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8377_mds.dts | 4 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8379_mds.dts | 8 | ||||
| -rw-r--r-- | 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 49c05e97386c..eac8e1b59496 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
| @@ -255,14 +255,14 @@ | |||
| 255 | }; | 255 | }; |
| 256 | 256 | ||
| 257 | sata@18000 { | 257 | sata@18000 { |
| 258 | compatible = "fsl,mpc8379-sata"; | 258 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
| 259 | reg = <0x18000 0x1000>; | 259 | reg = <0x18000 0x1000>; |
| 260 | interrupts = <44 0x8>; | 260 | interrupts = <44 0x8>; |
| 261 | interrupt-parent = <&ipic>; | 261 | interrupt-parent = <&ipic>; |
| 262 | }; | 262 | }; |
| 263 | 263 | ||
| 264 | sata@19000 { | 264 | sata@19000 { |
| 265 | compatible = "fsl,mpc8379-sata"; | 265 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
| 266 | reg = <0x19000 0x1000>; | 266 | reg = <0x19000 0x1000>; |
| 267 | interrupts = <45 0x8>; | 267 | interrupts = <45 0x8>; |
| 268 | interrupt-parent = <&ipic>; | 268 | interrupt-parent = <&ipic>; |
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts index fdb4a9255b24..6f78a9fd9826 100644 --- a/arch/powerpc/boot/dts/mpc8379_mds.dts +++ b/arch/powerpc/boot/dts/mpc8379_mds.dts | |||
| @@ -255,28 +255,28 @@ | |||
| 255 | }; | 255 | }; |
| 256 | 256 | ||
| 257 | sata@18000 { | 257 | sata@18000 { |
| 258 | compatible = "fsl,mpc8379-sata"; | 258 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
| 259 | reg = <0x18000 0x1000>; | 259 | reg = <0x18000 0x1000>; |
| 260 | interrupts = <44 0x8>; | 260 | interrupts = <44 0x8>; |
| 261 | interrupt-parent = <&ipic>; | 261 | interrupt-parent = <&ipic>; |
| 262 | }; | 262 | }; |
| 263 | 263 | ||
| 264 | sata@19000 { | 264 | sata@19000 { |
| 265 | compatible = "fsl,mpc8379-sata"; | 265 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
| 266 | reg = <0x19000 0x1000>; | 266 | reg = <0x19000 0x1000>; |
| 267 | interrupts = <45 0x8>; | 267 | interrupts = <45 0x8>; |
| 268 | interrupt-parent = <&ipic>; | 268 | interrupt-parent = <&ipic>; |
| 269 | }; | 269 | }; |
| 270 | 270 | ||
| 271 | sata@1a000 { | 271 | sata@1a000 { |
| 272 | compatible = "fsl,mpc8379-sata"; | 272 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
| 273 | reg = <0x1a000 0x1000>; | 273 | reg = <0x1a000 0x1000>; |
| 274 | interrupts = <46 0x8>; | 274 | interrupts = <46 0x8>; |
| 275 | interrupt-parent = <&ipic>; | 275 | interrupt-parent = <&ipic>; |
| 276 | }; | 276 | }; |
| 277 | 277 | ||
| 278 | sata@1b000 { | 278 | sata@1b000 { |
| 279 | compatible = "fsl,mpc8379-sata"; | 279 | compatible = "fsl,mpc8379-sata", "fsl,pq-sata"; |
| 280 | reg = <0x1b000 0x1000>; | 280 | reg = <0x1b000 0x1000>; |
| 281 | interrupts = <47 0x8>; | 281 | interrupts = <47 0x8>; |
| 282 | interrupt-parent = <&ipic>; | 282 | interrupt-parent = <&ipic>; |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 07791a7a48a5..4c1985511548 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) | |||
| 1348 | 1348 | ||
| 1349 | static struct of_device_id fsl_sata_match[] = { | 1349 | static struct of_device_id fsl_sata_match[] = { |
| 1350 | { | 1350 | { |
| 1351 | .compatible = "fsl,mpc8315-sata", | 1351 | .compatible = "fsl,pq-sata", |
| 1352 | }, | ||
| 1353 | { | ||
| 1354 | .compatible = "fsl,mpc8379-sata", | ||
| 1355 | }, | 1352 | }, |
| 1356 | {}, | 1353 | {}, |
| 1357 | }; | 1354 | }; |
