diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/sm501.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index e14d70e07418..8135e4c3bf47 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
@@ -893,6 +893,7 @@ static int sm501_init_dev(struct sm501_devdata *sm) | |||
893 | { | 893 | { |
894 | resource_size_t mem_avail; | 894 | resource_size_t mem_avail; |
895 | unsigned long dramctrl; | 895 | unsigned long dramctrl; |
896 | unsigned long devid; | ||
896 | int ret; | 897 | int ret; |
897 | 898 | ||
898 | mutex_init(&sm->clock_lock); | 899 | mutex_init(&sm->clock_lock); |
@@ -900,13 +901,18 @@ static int sm501_init_dev(struct sm501_devdata *sm) | |||
900 | 901 | ||
901 | INIT_LIST_HEAD(&sm->devices); | 902 | INIT_LIST_HEAD(&sm->devices); |
902 | 903 | ||
903 | dramctrl = readl(sm->regs + SM501_DRAM_CONTROL); | 904 | devid = readl(sm->regs + SM501_DEVICEID); |
904 | 905 | ||
906 | if ((devid & SM501_DEVICEID_IDMASK) != SM501_DEVICEID_SM501) { | ||
907 | dev_err(sm->dev, "incorrect device id %08lx\n", devid); | ||
908 | return -EINVAL; | ||
909 | } | ||
910 | |||
911 | dramctrl = readl(sm->regs + SM501_DRAM_CONTROL); | ||
905 | mem_avail = sm501_mem_local[(dramctrl >> 13) & 0x7]; | 912 | mem_avail = sm501_mem_local[(dramctrl >> 13) & 0x7]; |
906 | 913 | ||
907 | dev_info(sm->dev, "SM501 At %p: Version %08x, %ld Mb, IRQ %d\n", | 914 | dev_info(sm->dev, "SM501 At %p: Version %08lx, %ld Mb, IRQ %d\n", |
908 | sm->regs, readl(sm->regs + SM501_DEVICEID), | 915 | sm->regs, devid, (unsigned long)mem_avail >> 20, sm->irq); |
909 | (unsigned long)mem_avail >> 20, sm->irq); | ||
910 | 916 | ||
911 | sm501_dump_gate(sm); | 917 | sm501_dump_gate(sm); |
912 | 918 | ||