Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-10 15:45:06 +0200
committerTakashi Iwai <tiwai@suse.de>2018-07-10 15:45:11 +0200
commit4e185589e9075bb5162bc46751a254bb1d104f50 (patch)
tree016b54a92f0e48a40f11c53df18da08902339042
parent93b84cc89f626822ffcdd3754d93fa03d5cf5021 (diff)
pwm: stmpe: Fix wrong register offset for hwpwm=2 case
(bsc#1051510).
-rw-r--r--patches.drivers/pwm-stmpe-Fix-wrong-register-offset-for-hwpwm-2-case36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.drivers/pwm-stmpe-Fix-wrong-register-offset-for-hwpwm-2-case b/patches.drivers/pwm-stmpe-Fix-wrong-register-offset-for-hwpwm-2-case
new file mode 100644
index 0000000000..db428584e2
--- /dev/null
+++ b/patches.drivers/pwm-stmpe-Fix-wrong-register-offset-for-hwpwm-2-case
@@ -0,0 +1,36 @@
+From 8472b529e113e0863ea064fdee51bf73c3f86fd6 Mon Sep 17 00:00:00 2001
+From: Axel Lin <axel.lin@ingics.com>
+Date: Tue, 7 Nov 2017 13:18:53 +0800
+Subject: [PATCH] pwm: stmpe: Fix wrong register offset for hwpwm=2 case
+Git-commit: 8472b529e113e0863ea064fdee51bf73c3f86fd6
+Patch-mainline: v4.16-rc1
+References: bsc#1051510
+
+Fix trivial copy/paste bug.
+
+Signed-off-by: Axel Lin <axel.lin@ingics.com>
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Fixes: ef1f09eca74a ("pwm: Add a driver for the STMPE PWM")
+Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/pwm/pwm-stmpe.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/pwm/pwm-stmpe.c b/drivers/pwm/pwm-stmpe.c
+index e464582a390a..3439f1e902cb 100644
+--- a/drivers/pwm/pwm-stmpe.c
++++ b/drivers/pwm/pwm-stmpe.c
+@@ -145,7 +145,7 @@ static int stmpe_24xx_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
+ break;
+
+ case 2:
+- offset = STMPE24XX_PWMIC1;
++ offset = STMPE24XX_PWMIC2;
+ break;
+
+ default:
+--
+2.18.0
+
diff --git a/series.conf b/series.conf
index 2eafc54971..ac28009253 100644
--- a/series.conf
+++ b/series.conf
@@ -11651,6 +11651,7 @@
patches.arch/12-kvm-vmx-emulate-msr_ia32_arch_capabilities.patch
patches.arch/13-kvm-vmx-allow-direct-access-to-msr_ia32_spec_ctrl.patch
patches.arch/14-kvm-svm-allow-direct-access-to-msr_ia32_spec_ctrl.patch
+ patches.drivers/pwm-stmpe-Fix-wrong-register-offset-for-hwpwm-2-case
patches.fixes/ovl-fix-failure-to-fsync-lower-dir.patch
patches.drivers/PCI-ASPM-Calculate-LTR_L1.2_THRESHOLD-from-device-ch
patches.drivers/bnx2x-Deprecate-pci_get_bus_and_slot.patch