Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / mfd / lpc_ich.c

diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index 2ad24ca..d9d9303 100644 (file)
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -734,7 +734,7 @@ static int lpc_ich_init_gpio(struct pci_dev *dev,
        pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg);
        base_addr = base_addr_cfg & 0x0000ff80;
        if (!base_addr) {
-               dev_err(&dev->dev, "I/O space for ACPI uninitialized\n");
+               dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n");
                lpc_ich_cells[LPC_GPIO].num_resources--;
                goto gpe0_done;
        }
@@ -760,7 +760,7 @@ gpe0_done:
        pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
        base_addr = base_addr_cfg & 0x0000ff80;
        if (!base_addr) {
-               dev_err(&dev->dev, "I/O space for GPIO uninitialized\n");
+               dev_notice(&dev->dev, "I/O space for GPIO uninitialized\n");
                ret = -ENODEV;
                goto gpio_done;
        }
@@ -810,7 +810,7 @@ static int lpc_ich_init_wdt(struct pci_dev *dev,
        pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg);
        base_addr = base_addr_cfg & 0x0000ff80;
        if (!base_addr) {
-               dev_err(&dev->dev, "I/O space for ACPI uninitialized\n");
+               dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n");
                ret = -ENODEV;
                goto wdt_done;
        }
@@ -830,12 +830,15 @@ static int lpc_ich_init_wdt(struct pci_dev *dev,
         * we have to read RCBA from PCI Config space 0xf0 and use
         * it as base. GCS = RCBA + ICH6_GCS(0x3410).
         */
-       if (lpc_chipset_info[id->driver_data].iTCO_version == 2) {
+       if (lpc_chipset_info[id->driver_data].iTCO_version == 1) {
+               /* Don't register iomem for TCO ver 1 */
+               lpc_ich_cells[LPC_WDT].num_resources--;
+       } else {
                pci_read_config_dword(dev, RCBABASE, &base_addr_cfg);
                base_addr = base_addr_cfg & 0xffffc000;
                if (!(base_addr_cfg & 1)) {
-                       pr_err("RCBA is disabled by hardware/BIOS, "
-                                       "device disabled\n");
+                       dev_notice(&dev->dev, "RCBA is disabled by "
+                                       "hardware/BIOS, device disabled\n");
                        ret = -ENODEV;
                        goto wdt_done;
                }
@@ -871,6 +874,7 @@ static int lpc_ich_probe(struct pci_dev *dev,
         * successfully.
         */
        if (!cell_added) {
+               dev_warn(&dev->dev, "No MFD cells added\n");
                lpc_ich_restore_config_space(dev);
                return -ENODEV;
        }