Skip to contentSkip to conversation

FAILED: patch "[PATCH] pinctrl: ingenic: Fix incorrect pull up/down info" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Sep 15, 2021

Subsystems (3)
Stable branch Pin control Ingenic JZ47xx SoCs
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d5e931403942b3af39212960c2592b5ba741b2bf Mon Sep 17 00:00:00 2001
From: Paul Cercueil <[email protected]>
Date: Sat, 17 Jul 2021 18:48:34 +0100
Subject: [PATCH] pinctrl: ingenic: Fix incorrect pull up/down info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix the pull up/down info for both the JZ4760 and JZ4770 SoCs, as the previous values sometimes contradicted what's written in the programming manual.

Fixes b5c23aa46537 ("pinctrl: add a pinctrl driver for the Ingenic jz47xx SoCs")
Cc <[email protected]> # v4.12
Signed-off-by Paul Cercueil <[email protected]>
Tested-by 周琰杰 (Zhou Yanjie)<[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Linus Walleij <[email protected]>
drivers/pinctrl/pinctrl-ingenic.c +3 -3
index cd296d98548d..5a602e6479b9 100644
@@ -744,7 +744,7 @@ static const struct ingenic_chip_info jz4755_chip_info = {
 };
 
 static const u32 jz4760_pull_ups[6] = {
-	0xffffffff, 0xfffcf3ff, 0xffffffff, 0xffffcfff, 0xfffffb7c, 0xfffff00f,
+	0xffffffff, 0xfffcf3ff, 0xffffffff, 0xffffcfff, 0xfffffb7c, 0x0000000f,
 };
 
 static const u32 jz4760_pull_downs[6] = {

@@ -1092,11 +1092,11 @@ static const struct ingenic_chip_info jz4760_chip_info = {
 };
 
 static const u32 jz4770_pull_ups[6] = {
-	0x3fffffff, 0xfff0030c, 0xffffffff, 0xffff4fff, 0xfffffb7c, 0xffa7f00f,
+	0x3fffffff, 0xfff0f3fc, 0xffffffff, 0xffff4fff, 0xfffffb7c, 0x0024f00f,
 };
 
 static const u32 jz4770_pull_downs[6] = {
-	0x00000000, 0x000f0c03, 0x00000000, 0x0000b000, 0x00000483, 0x00580ff0,
+	0x00000000, 0x000f0c03, 0x00000000, 0x0000b000, 0x00000483, 0x005b0ff0,
 };
 
 static int jz4770_uart0_data_pins[] = { 0xa0, 0xa3, };