aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2015-03-12 08:32:45 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-03-17 05:04:31 -0400
commite9cfb2d62befcd562291e6a8a63d3bdff89b135b (patch)
tree3a4cce1691a8c6d731190960ac8efc1708795939 /drivers/video
parent758ddd1d11da5616851dd0d269e321cd1d2d4c1b (diff)
fbdev: imsttfb: remove the dependency on PPC_OF
The OF functionality has moved to a common place and be used by many archs. So we don't need to depend on PPC_OF option any more. This is a preparation for killing PPC_OF. Signed-off-by: Kevin Hao <haokexin@gmail.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/imsttfb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index aae10ce74f14..9b167f7ef6c6 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1470,15 +1470,13 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1470 unsigned long addr, size; 1470 unsigned long addr, size;
1471 struct imstt_par *par; 1471 struct imstt_par *par;
1472 struct fb_info *info; 1472 struct fb_info *info;
1473#ifdef CONFIG_PPC_OF
1474 struct device_node *dp; 1473 struct device_node *dp;
1475 1474
1476 dp = pci_device_to_OF_node(pdev); 1475 dp = pci_device_to_OF_node(pdev);
1477 if(dp) 1476 if(dp)
1478 printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name); 1477 printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
1479 else 1478 else if (IS_ENABLED(CONFIG_OF))
1480 printk(KERN_ERR "imsttfb: no OF node for pci device\n"); 1479 printk(KERN_ERR "imsttfb: no OF node for pci device\n");
1481#endif /* CONFIG_PPC_OF */
1482 1480
1483 info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev); 1481 info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev);
1484 1482
@@ -1501,11 +1499,9 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1501 switch (pdev->device) { 1499 switch (pdev->device) {
1502 case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */ 1500 case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */
1503 par->ramdac = IBM; 1501 par->ramdac = IBM;
1504#ifdef CONFIG_PPC_OF
1505 if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) || 1502 if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) ||
1506 (strcmp(dp->name, "IMS,tt128mb8A") == 0))) 1503 (strcmp(dp->name, "IMS,tt128mb8A") == 0)))
1507 par->ramdac = TVP; 1504 par->ramdac = TVP;
1508#endif /* CONFIG_PPC_OF */
1509 break; 1505 break;
1510 case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */ 1506 case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */
1511 par->ramdac = TVP; 1507 par->ramdac = TVP;