diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 09:14:03 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 09:14:03 -0400 |
| commit | 383453ad33aef6bbf703044094990d3fd2ebf533 (patch) | |
| tree | cb616692ee3440d18f762add65c7b30e87a3fc43 | |
| parent | 63c3c98b9d708821a5ce51ad55c857a5d2e7b887 (diff) | |
| download | longterm-queue-4.12-383453ad33aef6bbf703044094990d3fd2ebf533.tar.gz | |
imx: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch b/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch index fe48ce5..c9ecad3 100644 --- a/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch +++ b/queue/mfd-fsl-imx25-Clean-up-irq-settings-during-removal.patch @@ -1,4 +1,4 @@ -From 18f77393796848e68909e65d692c1d1436f06e06 Mon Sep 17 00:00:00 2001 +From 47d6da40204d4322702d1544f411434a3cf9e9d6 Mon Sep 17 00:00:00 2001 From: Martin Kaiser <martin@kaiser.cx> Date: Tue, 17 Oct 2017 22:53:08 +0200 Subject: [PATCH] mfd: fsl-imx25: Clean up irq settings during removal @@ -27,13 +27,14 @@ the module. Signed-off-by: Martin Kaiser <martin@kaiser.cx> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c -index 14189efd70d0..dbb85caaafed 100644 +index ac430a396a89..e3bfb01091ba 100644 --- a/drivers/mfd/fsl-imx25-tsadc.c +++ b/drivers/mfd/fsl-imx25-tsadc.c -@@ -179,6 +179,19 @@ static int mx25_tsadc_probe(struct platform_device *pdev) - return devm_of_platform_populate(dev); +@@ -183,6 +183,19 @@ static int mx25_tsadc_probe(struct platform_device *pdev) + return 0; } +static int mx25_tsadc_remove(struct platform_device *pdev) @@ -52,7 +53,7 @@ index 14189efd70d0..dbb85caaafed 100644 static const struct of_device_id mx25_tsadc_ids[] = { { .compatible = "fsl,imx25-tsadc" }, { /* Sentinel */ } -@@ -191,6 +204,7 @@ static struct platform_driver mx25_tsadc_driver = { +@@ -195,6 +208,7 @@ static struct platform_driver mx25_tsadc_driver = { .of_match_table = of_match_ptr(mx25_tsadc_ids), }, .probe = mx25_tsadc_probe, |