The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x d5301c90716a8e20bc961a348182daca00c8e8f0 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023091308-backfield-resample-5e13@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
d5301c90716a ("pinctrl: cherryview: fix address_space_handler() argument") 3ea2e2cabd2d ("pinctrl: cherryview: Switch to use struct intel_pinctrl") 8a8285707780 ("pinctrl: cherryview: Move custom community members to separate data struct") 0e2d769d4b4e ("pinctrl: cherryview: Drop stale comment") 293428f93260 ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 3)") bfc8a4baec93 ("pinctrl: cherryview: Convert chv_writel() to use chv_padreg()") 99fd6512278e ("pinctrl: cherryview: Introduce helpers to IO with common registers") 4e7293e3a2a3 ("pinctrl: cherryview: Introduce chv_readl() helper") 3dbf1ee6abbb ("pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler") 36ad7b24486a ("pinctrl: cherryview: Re-use data structures from pinctrl-intel.h (part 2)") b9a19bdbc843 ("pinctrl: cherryview: Pass irqchip when adding gpiochip") bd90633a5c54 ("pinctrl: cherryview: Add GPIO <-> pin mapping ranges via callback") 82d9beb4b7f7 ("pinctrl: cherryview: Split out irq hw-init into a separate helper function") 8ae93b5ed9be ("pinctrl: cherryview: Missed type change to unsigned int") e58e177392b9 ("pinctrl: cherryview: Allocate IRQ chip dynamic") 17d49c6258e6 ("pinctrl: cherryview: Fix spelling mistake in the comment") 3c2edc36a774 ("Merge tag 'pinctrl-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d5301c90716a8e20bc961a348182daca00c8e8f0 Mon Sep 17 00:00:00 2001 From: Raag Jadav raag.jadav@intel.com Date: Tue, 22 Aug 2023 12:53:40 +0530 Subject: [PATCH] pinctrl: cherryview: fix address_space_handler() argument
First argument of acpi_*_address_space_handler() APIs is acpi_handle of the device, which is incorrectly passed in driver ->remove() path here. Fix it by passing the appropriate argument and while at it, make both API calls consistent using ACPI_HANDLE().
Fixes: a0b028597d59 ("pinctrl: cherryview: Add support for GMMR GPIO opregion") Cc: stable@vger.kernel.org Signed-off-by: Raag Jadav raag.jadav@intel.com Acked-by: Mika Westerberg mika.westerberg@linux.intel.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c index 55a42dbf97b6..81ee949b946d 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -1649,7 +1649,6 @@ static int chv_pinctrl_probe(struct platform_device *pdev) struct intel_community_context *cctx; struct intel_community *community; struct device *dev = &pdev->dev; - struct acpi_device *adev = ACPI_COMPANION(dev); struct intel_pinctrl *pctrl; acpi_status status; unsigned int i; @@ -1717,7 +1716,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev) if (ret) return ret;
- status = acpi_install_address_space_handler(adev->handle, + status = acpi_install_address_space_handler(ACPI_HANDLE(dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler, NULL, pctrl); @@ -1734,7 +1733,7 @@ static int chv_pinctrl_remove(struct platform_device *pdev) struct intel_pinctrl *pctrl = platform_get_drvdata(pdev); const struct intel_community *community = &pctrl->communities[0];
- acpi_remove_address_space_handler(ACPI_COMPANION(&pdev->dev), + acpi_remove_address_space_handler(ACPI_HANDLE(&pdev->dev), community->acpi_space_id, chv_pinctrl_mmio_access_handler);