Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 603dbb1f authored by Paul Cercueil's avatar Paul Cercueil Committed by Greg Kroah-Hartman
Browse files

pinctrl: ingenic: Fix incorrect pull up/down info 



commit d5e931403942b3af39212960c2592b5ba741b2bf upstream.

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: b5c23aa4 ("pinctrl: add a pinctrl driver for the Ingenic jz47xx SoCs")
Cc: <stable@vger.kernel.org> # v4.12
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Tested-by: default avatar周琰杰 (Zhou <Yanjie)&lt;zhouyanjie@wanyeetech.com>
Link: https://lore.kernel.org/r/20210717174836.14776-1-paul@crapouillou.net


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eda59ca4

drivers/pinctrl/pinctrl-ingenic.c

+3 −3
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static const struct ingenic_chip_info jz4725b_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] = {
@@ -611,11 +611,11 @@ static const struct ingenic_chip_info jz4760b_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, };