diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/sata_fsl.c | 5 | ||||
-rw-r--r-- | drivers/dma/fsldma.c | 8 | ||||
-rw-r--r-- | drivers/net/fec_mpc52xx.c | 1 | ||||
-rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 1 |
4 files changed, 7 insertions, 8 deletions
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 | }; |
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 72692309398a..df163687c91a 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c | |||
@@ -1021,11 +1021,11 @@ const u32 mpc8349_dma_ip_feature = FSL_DMA_IP_83XX | FSL_DMA_LITTLE_ENDIAN; | |||
1021 | 1021 | ||
1022 | static struct of_device_id of_fsl_dma_chan_ids[] = { | 1022 | static struct of_device_id of_fsl_dma_chan_ids[] = { |
1023 | { | 1023 | { |
1024 | .compatible = "fsl,mpc8540-dma-channel", | 1024 | .compatible = "fsl,eloplus-dma-channel", |
1025 | .data = (void *)&mpc8540_dma_ip_feature, | 1025 | .data = (void *)&mpc8540_dma_ip_feature, |
1026 | }, | 1026 | }, |
1027 | { | 1027 | { |
1028 | .compatible = "fsl,mpc8349-dma-channel", | 1028 | .compatible = "fsl,elo-dma-channel", |
1029 | .data = (void *)&mpc8349_dma_ip_feature, | 1029 | .data = (void *)&mpc8349_dma_ip_feature, |
1030 | }, | 1030 | }, |
1031 | {} | 1031 | {} |
@@ -1107,8 +1107,8 @@ err: | |||
1107 | } | 1107 | } |
1108 | 1108 | ||
1109 | static struct of_device_id of_fsl_dma_ids[] = { | 1109 | static struct of_device_id of_fsl_dma_ids[] = { |
1110 | { .compatible = "fsl,mpc8540-dma", }, | 1110 | { .compatible = "fsl,eloplus-dma", }, |
1111 | { .compatible = "fsl,mpc8349-dma", }, | 1111 | { .compatible = "fsl,elo-dma", }, |
1112 | {} | 1112 | {} |
1113 | }; | 1113 | }; |
1114 | 1114 | ||
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 58b71e60204e..fe59c27c09e3 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
@@ -1057,6 +1057,7 @@ static int mpc52xx_fec_of_resume(struct of_device *op) | |||
1057 | #endif | 1057 | #endif |
1058 | 1058 | ||
1059 | static struct of_device_id mpc52xx_fec_match[] = { | 1059 | static struct of_device_id mpc52xx_fec_match[] = { |
1060 | { .type = "network", .compatible = "fsl,mpc5200b-fec", }, | ||
1060 | { .type = "network", .compatible = "fsl,mpc5200-fec", }, | 1061 | { .type = "network", .compatible = "fsl,mpc5200-fec", }, |
1061 | { .type = "network", .compatible = "mpc5200-fec", }, | 1062 | { .type = "network", .compatible = "mpc5200-fec", }, |
1062 | { } | 1063 | { } |
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 6a3ac4ea97e9..1d0cd1dd955e 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c | |||
@@ -179,6 +179,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of) | |||
179 | 179 | ||
180 | static struct of_device_id mpc52xx_fec_mdio_match[] = { | 180 | static struct of_device_id mpc52xx_fec_mdio_match[] = { |
181 | { .compatible = "fsl,mpc5200b-mdio", }, | 181 | { .compatible = "fsl,mpc5200b-mdio", }, |
182 | { .compatible = "fsl,mpc5200-mdio", }, | ||
182 | { .compatible = "mpc5200b-fec-phy", }, | 183 | { .compatible = "mpc5200b-fec-phy", }, |
183 | {} | 184 | {} |
184 | }; | 185 | }; |