Commit e9cfb2d6 authored by Kevin Hao's avatar Kevin Hao Committed by Michael Ellerman

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: default avatarKevin Hao <haokexin@gmail.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 758ddd1d
...@@ -1470,15 +1470,13 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1470,15 +1470,13 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
unsigned long addr, size; unsigned long addr, size;
struct imstt_par *par; struct imstt_par *par;
struct fb_info *info; struct fb_info *info;
#ifdef CONFIG_PPC_OF
struct device_node *dp; struct device_node *dp;
dp = pci_device_to_OF_node(pdev); dp = pci_device_to_OF_node(pdev);
if(dp) if(dp)
printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name); printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
else else if (IS_ENABLED(CONFIG_OF))
printk(KERN_ERR "imsttfb: no OF node for pci device\n"); printk(KERN_ERR "imsttfb: no OF node for pci device\n");
#endif /* CONFIG_PPC_OF */
info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev); info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev);
...@@ -1501,11 +1499,9 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1501,11 +1499,9 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
switch (pdev->device) { switch (pdev->device) {
case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */ case PCI_DEVICE_ID_IMS_TT128: /* IMS,tt128mbA */
par->ramdac = IBM; par->ramdac = IBM;
#ifdef CONFIG_PPC_OF
if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) || if (dp && ((strcmp(dp->name, "IMS,tt128mb8") == 0) ||
(strcmp(dp->name, "IMS,tt128mb8A") == 0))) (strcmp(dp->name, "IMS,tt128mb8A") == 0)))
par->ramdac = TVP; par->ramdac = TVP;
#endif /* CONFIG_PPC_OF */
break; break;
case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */ case PCI_DEVICE_ID_IMS_TT3D: /* IMS,tt3d */
par->ramdac = TVP; par->ramdac = TVP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment