From: Benjamin Herrenschmidt Date: Thu, 14 Apr 2011 22:32:00 +0000 (+0000) Subject: powerpc/nvram: Search for nvram using compatible X-Git-Tag: v3.0-rc1~385^2~108 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=411e689d929d5fc2e9066e30de55e8bcdbd573ad;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git powerpc/nvram: Search for nvram using compatible As well as searching for nodes with type = "nvram", search for nodes that have compatible = "nvram". This can't be converted into a single call to of_find_compatible_node() with a non-NULL type, because that searches for a node that has _both_ type & compatible = "nvram". Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c index 2073242..ddc877a 100644 --- a/arch/powerpc/sysdev/mmio_nvram.c +++ b/arch/powerpc/sysdev/mmio_nvram.c @@ -115,6 +115,8 @@ int __init mmio_nvram_init(void) int ret; nvram_node = of_find_node_by_type(NULL, "nvram"); + if (!nvram_node) + nvram_node = of_find_compatible_node(NULL, NULL, "nvram"); if (!nvram_node) { printk(KERN_WARNING "nvram: no node found in device-tree\n"); return -ENODEV;