Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-17 17:01:28 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-17 17:01:36 +0200
commit960072f1990f00ca42e8c1347ab0a1e75b944a5f (patch)
tree33cd67ebfc17a944a91419e6df4ece162988c8e6
parent738ff9132221b3337886188c6d931a1c52f3e452 (diff)
power: supply: axp20x_usb_power: Fix typo in VBUS current
limit macros (bsc#1051510).
-rw-r--r--patches.drivers/power-supply-axp20x_usb_power-Fix-typo-in-VBUS-curre.patch66
-rw-r--r--series.conf1
2 files changed, 67 insertions, 0 deletions
diff --git a/patches.drivers/power-supply-axp20x_usb_power-Fix-typo-in-VBUS-curre.patch b/patches.drivers/power-supply-axp20x_usb_power-Fix-typo-in-VBUS-curre.patch
new file mode 100644
index 0000000000..f842e339af
--- /dev/null
+++ b/patches.drivers/power-supply-axp20x_usb_power-Fix-typo-in-VBUS-curre.patch
@@ -0,0 +1,66 @@
+From c11f0b8f226a411915f8d7467bd554a8c9ceec42 Mon Sep 17 00:00:00 2001
+From: Chen-Yu Tsai <wens@csie.org>
+Date: Tue, 16 Apr 2019 14:40:19 +0800
+Subject: [PATCH] power: supply: axp20x_usb_power: Fix typo in VBUS current limit macros
+Git-commit: c11f0b8f226a411915f8d7467bd554a8c9ceec42
+Patch-mainline: v5.2-rc1
+References: bsc#1051510
+
+The VBUS current limit value macros have VBUS typed as VBUC, while
+the bitmask macro is named correctly. Fix it.
+
+Fixes: 69fb4dcada77 ("power: Add an axp20x-usb-power driver")
+Signed-off-by: Chen-Yu Tsai <wens@csie.org>
+Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/power/supply/axp20x_usb_power.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
+index f52fe77edb6f..cd9b90d79839 100644
+--- a/drivers/power/supply/axp20x_usb_power.c
++++ b/drivers/power/supply/axp20x_usb_power.c
+@@ -36,10 +36,10 @@
+ #define AXP20X_VBUS_VHOLD_MASK GENMASK(5, 3)
+ #define AXP20X_VBUS_VHOLD_OFFSET 3
+ #define AXP20X_VBUS_CLIMIT_MASK 3
+-#define AXP20X_VBUC_CLIMIT_900mA 0
+-#define AXP20X_VBUC_CLIMIT_500mA 1
+-#define AXP20X_VBUC_CLIMIT_100mA 2
+-#define AXP20X_VBUC_CLIMIT_NONE 3
++#define AXP20X_VBUS_CLIMIT_900mA 0
++#define AXP20X_VBUS_CLIMIT_500mA 1
++#define AXP20X_VBUS_CLIMIT_100mA 2
++#define AXP20X_VBUS_CLIMIT_NONE 3
+
+ #define AXP20X_ADC_EN1_VBUS_CURR BIT(2)
+ #define AXP20X_ADC_EN1_VBUS_VOLT BIT(3)
+@@ -107,19 +107,19 @@ static int axp20x_usb_power_get_property(struct power_supply *psy,
+ return ret;
+
+ switch (v & AXP20X_VBUS_CLIMIT_MASK) {
+- case AXP20X_VBUC_CLIMIT_100mA:
++ case AXP20X_VBUS_CLIMIT_100mA:
+ if (power->axp20x_id == AXP221_ID)
+ val->intval = -1; /* No 100mA limit */
+ else
+ val->intval = 100000;
+ break;
+- case AXP20X_VBUC_CLIMIT_500mA:
++ case AXP20X_VBUS_CLIMIT_500mA:
+ val->intval = 500000;
+ break;
+- case AXP20X_VBUC_CLIMIT_900mA:
++ case AXP20X_VBUS_CLIMIT_900mA:
+ val->intval = 900000;
+ break;
+- case AXP20X_VBUC_CLIMIT_NONE:
++ case AXP20X_VBUS_CLIMIT_NONE:
+ val->intval = -1;
+ break;
+ }
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 3151ad9033..fbcff9d74f 100644
--- a/series.conf
+++ b/series.conf
@@ -22016,6 +22016,7 @@
patches.drivers/backlight-lm3630a-Return-0-on-success-in-update_stat.patch
patches.fixes/crypto-caam-fix-caam_dump_sg-that-iterates-through-s.patch
patches.drivers/power-supply-axp288_charger-Fix-unchecked-return-val.patch
+ patches.drivers/power-supply-axp20x_usb_power-Fix-typo-in-VBUS-curre.patch
patches.drm/drm-i915-fbc-disable-framebuffer-compression-on-Gemi.patch
patches.drm/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch
patches.drivers/thermal-cpu_cooling-Actually-trace-CPU-load-in-therm.patch