diff --git a/projects/Allwinner/patches/linux/0003-backport-from-5.4.patch b/projects/Allwinner/patches/linux/0003-backport-from-5.4.patch index 3298ff32cf..352e8a2c29 100644 --- a/projects/Allwinner/patches/linux/0003-backport-from-5.4.patch +++ b/projects/Allwinner/patches/linux/0003-backport-from-5.4.patch @@ -371,81 +371,6 @@ index 240a800217df..011924a75263 100644 -- 2.22.0 -From 95b579d069348a59d0fa6463a2f821089876ebfd Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sat, 6 Jul 2019 11:07:49 +0200 -Subject: [PATCH 1/2] regulator: axp20x: fix DCDCA and DCDCD for AXP806 - -Refactoring of the driver introduced few bugs in AXP806's DCDCA and -DCDCD regulator definitions. - -Fix them. - -Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks") -Signed-off-by: Jernej Skrabec ---- - drivers/regulator/axp20x-regulator.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c -index 152053361862..c951568994a1 100644 ---- a/drivers/regulator/axp20x-regulator.c -+++ b/drivers/regulator/axp20x-regulator.c -@@ -240,7 +240,7 @@ - #define AXP806_DCDCA_600mV_END \ - (AXP806_DCDCA_600mV_START + AXP806_DCDCA_600mV_STEPS) - #define AXP806_DCDCA_1120mV_START 0x33 --#define AXP806_DCDCA_1120mV_STEPS 14 -+#define AXP806_DCDCA_1120mV_STEPS 20 - #define AXP806_DCDCA_1120mV_END \ - (AXP806_DCDCA_1120mV_START + AXP806_DCDCA_1120mV_STEPS) - #define AXP806_DCDCA_NUM_VOLTAGES 72 -@@ -774,8 +774,8 @@ static const struct regulator_linear_range axp806_dcdcd_ranges[] = { - AXP806_DCDCD_600mV_END, - 20000), - REGULATOR_LINEAR_RANGE(1600000, -- AXP806_DCDCD_600mV_START, -- AXP806_DCDCD_600mV_END, -+ AXP806_DCDCD_1600mV_START, -+ AXP806_DCDCD_1600mV_END, - 100000), - }; - --- -2.22.0 - -From a8e790b1850f368daff2d3c35b52f8a69978be6e Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sat, 6 Jul 2019 11:15:13 +0200 -Subject: [PATCH 2/2] regulator: axp20x: fix DCDC6 for AXP803 - -Refactoring of axp20x driver introduced a bug in AXP803's DCDC6 -regulator definition. - -Fix it. - -Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks") -Signed-off-by: Jernej Skrabec ---- - drivers/regulator/axp20x-regulator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c -index c951568994a1..29b92ce521b7 100644 ---- a/drivers/regulator/axp20x-regulator.c -+++ b/drivers/regulator/axp20x-regulator.c -@@ -181,7 +181,7 @@ - #define AXP803_DCDC6_600mV_END \ - (AXP803_DCDC6_600mV_START + AXP803_DCDC6_600mV_STEPS) - #define AXP803_DCDC6_1120mV_START 0x33 --#define AXP803_DCDC6_1120mV_STEPS 14 -+#define AXP803_DCDC6_1120mV_STEPS 20 - #define AXP803_DCDC6_1120mV_END \ - (AXP803_DCDC6_1120mV_START + AXP803_DCDC6_1120mV_STEPS) - #define AXP803_DCDC6_NUM_VOLTAGES 72 --- -2.22.0 - From: Ondrej Jirman Subject: [PATCH v8 3/4] drm: sun4i: Add support for enabling DDC I2C bus to sun8i_dw_hdmi glue