aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 035da9e64a17..f27c04e18aaa 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -69,6 +69,8 @@
69#ifdef CONFIG_PPC_OF 69#ifdef CONFIG_PPC_OF
70#include <linux/of_device.h> 70#include <linux/of_device.h>
71#include <linux/of_platform.h> 71#include <linux/of_platform.h>
72#include <linux/of_address.h>
73#include <linux/of_irq.h>
72#endif 74#endif
73 75
74#define PFX "ipmi_si: " 76#define PFX "ipmi_si: "
@@ -2546,7 +2548,7 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
2546{ 2548{
2547 struct smi_info *info; 2549 struct smi_info *info;
2548 struct resource resource; 2550 struct resource resource;
2549 const int *regsize, *regspacing, *regshift; 2551 const __be32 *regsize, *regspacing, *regshift;
2550 struct device_node *np = dev->dev.of_node; 2552 struct device_node *np = dev->dev.of_node;
2551 int ret; 2553 int ret;
2552 int proplen; 2554 int proplen;
@@ -2599,9 +2601,9 @@ static int __devinit ipmi_of_probe(struct platform_device *dev,
2599 2601
2600 info->io.addr_data = resource.start; 2602 info->io.addr_data = resource.start;
2601 2603
2602 info->io.regsize = regsize ? *regsize : DEFAULT_REGSIZE; 2604 info->io.regsize = regsize ? be32_to_cpup(regsize) : DEFAULT_REGSIZE;
2603 info->io.regspacing = regspacing ? *regspacing : DEFAULT_REGSPACING; 2605 info->io.regspacing = regspacing ? be32_to_cpup(regspacing) : DEFAULT_REGSPACING;
2604 info->io.regshift = regshift ? *regshift : 0; 2606 info->io.regshift = regshift ? be32_to_cpup(regshift) : 0;
2605 2607
2606 info->irq = irq_of_parse_and_map(dev->dev.of_node, 0); 2608 info->irq = irq_of_parse_and_map(dev->dev.of_node, 0);
2607 info->dev = &dev->dev; 2609 info->dev = &dev->dev;