Skip to content

Commit 7e92d4a

Browse files
xdarklightjfvogel
authored andcommitted
pinctrl: meson: define the pull up/down resistor value as 60 kOhm
[ Upstream commit e56088a ] The public datasheets of the following Amlogic SoCs describe a typical resistor value for the built-in pull up/down resistor: - Meson8/8b/8m2: not documented - GXBB (S905): 60 kOhm - GXL (S905X): 60 kOhm - GXM (S912): 60 kOhm - G12B (S922X): 60 kOhm - SM1 (S905D3): 60 kOhm The public G12B and SM1 datasheets additionally state min and max values: - min value: 50 kOhm for both, pull-up and pull-down - max value for the pull-up: 70 kOhm - max value for the pull-down: 130 kOhm Use 60 kOhm in the pinctrl-meson driver as well so it's shown in the debugfs output. It may not be accurate for Meson8/8b/8m2 but in reality 60 kOhm is closer to the actual value than 1 Ohm. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/20250329190132.855196-1-martin.blumenstingl@googlemail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit c134c62b9e97b2bd789e72d6fa89a37a3ab084fe) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 8560764 commit 7e92d4a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/pinctrl/meson/pinctrl-meson.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ static int meson_pinconf_get(struct pinctrl_dev *pcdev, unsigned int pin,
487487
case PIN_CONFIG_BIAS_PULL_DOWN:
488488
case PIN_CONFIG_BIAS_PULL_UP:
489489
if (meson_pinconf_get_pull(pc, pin) == param)
490-
arg = 1;
490+
arg = 60000;
491491
else
492492
return -EINVAL;
493493
break;

0 commit comments

Comments
 (0)