Merge branch 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[karo-tx-linux.git] / drivers / pinctrl / intel / pinctrl-cherryview.c

diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index 9ff790174906e46962ec9b9fa00f4f04de14aa18..2debba62fac90d956ce37cd09805c518ee4a8da5 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -149,6 +149,7 @@ struct chv_community {
        size_t ngpio_ranges;
        size_t ngpios;
        size_t nirqs;
+       acpi_adr_space_type acpi_space_id;
 };
 
 struct chv_pin_context {
@@ -405,6 +406,7 @@ static const struct chv_community southwest_community = {
         * trigger GPEs.
         */
        .nirqs = 8,
+       .acpi_space_id = 0x91,
 };
 
 static const struct pinctrl_pin_desc north_pins[] = {
@@ -494,6 +496,7 @@ static const struct chv_community north_community = {
         * GPEs.
         */
        .nirqs = 8,
+       .acpi_space_id = 0x92,
 };
 
 static const struct pinctrl_pin_desc east_pins[] = {
@@ -537,6 +540,7 @@ static const struct chv_community east_community = {
        .ngpio_ranges = ARRAY_SIZE(east_gpio_ranges),
        .ngpios = ARRAY_SIZE(east_pins),
        .nirqs = 16,
+       .acpi_space_id = 0x93,
 };
 
 static const struct pinctrl_pin_desc southeast_pins[] = {
@@ -663,6 +667,7 @@ static const struct chv_community southeast_community = {
        .ngpio_ranges = ARRAY_SIZE(southeast_gpio_ranges),
        .ngpios = ARRAY_SIZE(southeast_pins),
        .nirqs = 16,
+       .acpi_space_id = 0x94,
 };
 
 static const struct chv_community *chv_communities[] = {
@@ -1608,11 +1613,34 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
        return 0;
 }
 
+static acpi_status chv_pinctrl_mmio_access_handler(u32 function,
+       acpi_physical_address address, u32 bits, u64 *value,
+       void *handler_context, void *region_context)
+{
+       struct chv_pinctrl *pctrl = region_context;
+       unsigned long flags;
+       acpi_status ret = AE_OK;
+
+       raw_spin_lock_irqsave(&chv_lock, flags);
+
+       if (function == ACPI_WRITE)
+               chv_writel((u32)(*value), pctrl->regs + (u32)address);
+       else if (function == ACPI_READ)
+               *value = readl(pctrl->regs + (u32)address);
+       else
+               ret = AE_BAD_PARAMETER;
+
+       raw_spin_unlock_irqrestore(&chv_lock, flags);
+
+       return ret;
+}
+
 static int chv_pinctrl_probe(struct platform_device *pdev)
 {
        struct chv_pinctrl *pctrl;
        struct acpi_device *adev;
        struct resource *res;
+       acpi_status status;
        int ret, irq, i;
 
        adev = ACPI_COMPANION(&pdev->dev);
@@ -1668,11 +1696,29 @@ static int chv_pinctrl_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
+       status = acpi_install_address_space_handler(adev->handle,
+                                       pctrl->community->acpi_space_id,
+                                       chv_pinctrl_mmio_access_handler,
+                                       NULL, pctrl);
+       if (ACPI_FAILURE(status))
+               dev_err(&pdev->dev, "failed to install ACPI addr space handler\n");
+
        platform_set_drvdata(pdev, pctrl);
 
        return 0;
 }
 
+static int chv_pinctrl_remove(struct platform_device *pdev)
+{
+       struct chv_pinctrl *pctrl = platform_get_drvdata(pdev);
+
+       acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev),
+                                         pctrl->community->acpi_space_id,
+                                         chv_pinctrl_mmio_access_handler);
+
+       return 0;
+}
+
 #ifdef CONFIG_PM_SLEEP
 static int chv_pinctrl_suspend_noirq(struct device *dev)
 {
@@ -1780,6 +1826,7 @@ MODULE_DEVICE_TABLE(acpi, chv_pinctrl_acpi_match);
 
 static struct platform_driver chv_pinctrl_driver = {
        .probe = chv_pinctrl_probe,
+       .remove = chv_pinctrl_remove,
        .driver = {
                .name = "cherryview-pinctrl",
                .pm = &chv_pinctrl_pm_ops,