Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'

* acpi-ec:
  ACPI / EC: Remove non-standard log emphasis

* acpi-soc:
  ACPI / LPSS: Deassert resets for SPI host controllers on Braswell
  ACPI / LPSS: Always disable I2C host controllers
  Revert "ACPI / LPSS: Remove non-existing clock control from Intel Lynxpoint I2C"

* acpi-video:
  ACPI / video: Disable native backlight on Samsung Series 9 laptops

* acpi-resources:
  ACPI / resources: Change pr_info() to pr_debug() for debug information

diff --combined drivers/acpi/acpi_lpss.c
index 02e835f3cf8aa76326b9994768b75f2d39c39fed,4f3febf8a58954b2ca8ced8c057106529ab1f30b,6bb8d3574ec68718ca8c17e2f5d32e36a9c5e4a9,4f3febf8a58954b2ca8ced8c057106529ab1f30b,dfd1b8095dadbb6c853dc98e669c21eeeff60bb3..657964e8ab7ed2ba9e56004d5f83881ad826e7b7
--- 1/drivers/acpi/acpi_lpss.c
--- 2/drivers/acpi/acpi_lpss.c
--- 3/drivers/acpi/acpi_lpss.c
--- 4/drivers/acpi/acpi_lpss.c
--- 5/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@@@@@ -1,7 -1,7 -1,7 -1,7 -1,7 +1,7 @@@@@@
     /*
      * ACPI support for Intel Lynxpoint LPSS.
      *
 - -- * Copyright (C) 2013, 2014, Intel Corporation
 + ++ * Copyright (C) 2013, Intel Corporation
      * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
      *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
      *
@@@@@@ -60,6 -60,8 -60,6 -60,8 -60,8 +60,6 @@@@@@ ACPI_MODULE_NAME("acpi_lpss")
     #define LPSS_CLK_DIVIDER           BIT(2)
     #define LPSS_LTR                   BIT(3)
     #define LPSS_SAVE_CTX                      BIT(4)
 - --#define LPSS_DEV_PROXY                     BIT(5)
 - --#define LPSS_PROXY_REQ                     BIT(6)
     
     struct lpss_private_data;
     
@@@@@@ -70,8 -72,10 -70,8 -72,10 -72,10 +70,8 @@@@@@ struct lpss_device_desc 
        void (*setup)(struct lpss_private_data *pdata);
     };
     
 - --static struct device *proxy_device;
 - --
     static struct lpss_device_desc lpss_dma_desc = {
 - --   .flags = LPSS_CLK | LPSS_PROXY_REQ,
 + ++   .flags = LPSS_CLK,
     };
     
     struct lpss_private_data {
@@@@@@ -105,7 -109,7 -105,7 -109,7 -109,7 +105,7 @@@@@@ static void lpss_uart_setup(struct lpss
        }
     }
     
-- --static void byt_i2c_setup(struct lpss_private_data *pdata)
++ ++static void lpss_deassert_reset(struct lpss_private_data *pdata)
     {
        unsigned int offset;
        u32 val;
@@@@@@ -114,9 -118,9 -114,18 -118,9 -118,9 +114,18 @@@@@@
        val = readl(pdata->mmio_base + offset);
        val |= LPSS_RESETS_RESET_APB | LPSS_RESETS_RESET_FUNC;
        writel(val, pdata->mmio_base + offset);
++ ++}
++ ++
++ ++#define LPSS_I2C_ENABLE                    0x6c
++ ++
++ ++static void byt_i2c_setup(struct lpss_private_data *pdata)
++ ++{
++ ++   lpss_deassert_reset(pdata);
     
        if (readl(pdata->mmio_base + pdata->dev_desc->prv_offset))
                pdata->fixed_clk_rate = 133000000;
++ ++
++ ++   writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);
     }
     
     static struct lpss_device_desc lpt_dev_desc = {
@@@@@@ -125,7 -129,7 -134,7 -129,7 -129,7 +134,7 @@@@@@
     };
     
     static struct lpss_device_desc lpt_i2c_dev_desc = {
-       .flags = LPSS_CLK | LPSS_LTR,
+       .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_LTR,
        .prv_offset = 0x800,
     };
     
@@@@@@ -146,26 -150,28 -155,32 -150,28 -150,28 +155,32 @@@@@@ static struct lpss_device_desc byt_pwm_
     };
     
     static struct lpss_device_desc byt_uart_dev_desc = {
 - --   .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX |
 - --            LPSS_DEV_PROXY,
 + ++   .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,
        .prv_offset = 0x800,
        .setup = lpss_uart_setup,
     };
     
     static struct lpss_device_desc byt_spi_dev_desc = {
 - --   .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX |
 - --            LPSS_DEV_PROXY,
 + ++   .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,
        .prv_offset = 0x400,
     };
     
     static struct lpss_device_desc byt_sdio_dev_desc = {
 - --   .flags = LPSS_CLK | LPSS_DEV_PROXY,
 + ++   .flags = LPSS_CLK,
     };
     
     static struct lpss_device_desc byt_i2c_dev_desc = {
 - --   .flags = LPSS_CLK | LPSS_SAVE_CTX | LPSS_DEV_PROXY,
 + ++   .flags = LPSS_CLK | LPSS_SAVE_CTX,
        .prv_offset = 0x800,
        .setup = byt_i2c_setup,
     };
     
++ ++static struct lpss_device_desc bsw_spi_dev_desc = {
++ ++   .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,
++ ++   .prv_offset = 0x400,
++ ++   .setup = lpss_deassert_reset,
++ ++};
++ ++
     #else
     
     #define LPSS_ADDR(desc) (0UL)
@@@@@@ -198,7 -204,7 -213,7 -204,7 -204,7 +213,7 @@@@@@ static const struct acpi_device_id acpi
        /* Braswell LPSS devices */
        { "80862288", LPSS_ADDR(byt_pwm_dev_desc) },
        { "8086228A", LPSS_ADDR(byt_uart_dev_desc) },
-- --   { "8086228E", LPSS_ADDR(byt_spi_dev_desc) },
++ ++   { "8086228E", LPSS_ADDR(bsw_spi_dev_desc) },
        { "808622C1", LPSS_ADDR(byt_i2c_dev_desc) },
     
        { "INT3430", LPSS_ADDR(lpt_dev_desc) },
@@@@@@ -307,7 -313,7 -322,7 -313,7 -313,7 +322,7 @@@@@@ static int acpi_lpss_create_device(stru
     {
        struct lpss_device_desc *dev_desc;
        struct lpss_private_data *pdata;
 ---    struct resource_list_entry *rentry;
 +++    struct resource_entry *rentry;
        struct list_head resource_list;
        struct platform_device *pdev;
        int ret;
@@@@@@ -327,15 -333,13 -342,15 -333,13 -333,13 +342,15 @@@@@@
                goto err_out;
     
        list_for_each_entry(rentry, &resource_list, node)
 ---            if (resource_type(&rentry->res) == IORESOURCE_MEM) {
 +++            if (resource_type(rentry->res) == IORESOURCE_MEM) {
                        if (dev_desc->prv_size_override)
                                pdata->mmio_size = dev_desc->prv_size_override;
                        else
 ---                            pdata->mmio_size = resource_size(&rentry->res);
 ---                    pdata->mmio_base = ioremap(rentry->res.start,
 +++                            pdata->mmio_size = resource_size(rentry->res);
 +++                    pdata->mmio_base = ioremap(rentry->res->start,
                                                   pdata->mmio_size);
 + ++                   if (!pdata->mmio_base)
 + ++                           goto err_out;
                        break;
                }
     
@@@@@@ -370,6 -374,8 -385,6 -374,8 -374,8 +385,6 @@@@@@
        adev->driver_data = pdata;
        pdev = acpi_create_platform_device(adev);
        if (!IS_ERR_OR_NULL(pdev)) {
 - --           if (!proxy_device && dev_desc->flags & LPSS_DEV_PROXY)
 - --                   proxy_device = &pdev->dev;
                return 1;
        }
     
@@@@@@ -594,7 -600,14 -609,7 -600,14 -600,14 +609,7 @@@@@@ static int acpi_lpss_runtime_suspend(st
        if (pdata->dev_desc->flags & LPSS_SAVE_CTX)
                acpi_lpss_save_ctx(dev, pdata);
     
 - --   ret = acpi_dev_runtime_suspend(dev);
 - --   if (ret)
 - --           return ret;
 - --
 - --   if (pdata->dev_desc->flags & LPSS_PROXY_REQ && proxy_device)
 - --           return pm_runtime_put_sync_suspend(proxy_device);
 - --
 - --   return 0;
 + ++   return acpi_dev_runtime_suspend(dev);
     }
     
     static int acpi_lpss_runtime_resume(struct device *dev)
@@@@@@ -602,6 -615,12 -617,6 -615,12 -615,12 +617,6 @@@@@@
        struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
        int ret;
     
 - --   if (pdata->dev_desc->flags & LPSS_PROXY_REQ && proxy_device) {
 - --           ret = pm_runtime_get_sync(proxy_device);
 - --           if (ret)
 - --                   return ret;
 - --   }
 - --
        ret = acpi_dev_runtime_resume(dev);
        if (ret)
                return ret;