Skip to content

Commit bef873d

Browse files
author
Linus Walleij
committed
Merge tag 'renesas-pinctrl-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: renesas: Updates for v5.17 - Add generic support for output impedance, - Add drive strength and output impedance support for the RZ/G2L SoC, - Miscellaneous fixes and improvements.
2 parents c09acbc + 7c50a40 commit bef873d

File tree

7 files changed

+224
-111
lines changed

7 files changed

+224
-111
lines changed

Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ properties:
114114
description: enable output on a pin without actively driving it
115115
(such as enabling an output buffer)
116116

117+
output-impedance-ohms:
118+
description: set the output impedance of a pin to at most X ohms
119+
117120
output-low:
118121
type: boolean
119122
description: set the pin to output mode with low level

Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ additionalProperties:
7373
pins: true
7474
drive-strength:
7575
enum: [ 2, 4, 8, 12 ]
76+
output-impedance-ohms:
77+
enum: [ 33, 50, 66, 100 ]
7678
power-source:
7779
enum: [ 1800, 2500, 3300 ]
7880
slew-rate: true

drivers/pinctrl/pinconf-generic.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static const struct pin_config_item conf_items[] = {
4646
PCONFDUMP(PIN_CONFIG_MODE_LOW_POWER, "pin low power", "mode", true),
4747
PCONFDUMP(PIN_CONFIG_OUTPUT_ENABLE, "output enabled", NULL, false),
4848
PCONFDUMP(PIN_CONFIG_OUTPUT, "pin output", "level", true),
49+
PCONFDUMP(PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS, "output impedance", "ohms", true),
4950
PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector", true),
5051
PCONFDUMP(PIN_CONFIG_SLEEP_HARDWARE_STATE, "sleep hardware state", NULL, false),
5152
PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL, true),
@@ -179,6 +180,7 @@ static const struct pinconf_generic_params dt_params[] = {
179180
{ "output-disable", PIN_CONFIG_OUTPUT_ENABLE, 0 },
180181
{ "output-enable", PIN_CONFIG_OUTPUT_ENABLE, 1 },
181182
{ "output-high", PIN_CONFIG_OUTPUT, 1, },
183+
{ "output-impedance-ohms", PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS, 0 },
182184
{ "output-low", PIN_CONFIG_OUTPUT, 0, },
183185
{ "power-source", PIN_CONFIG_POWER_SOURCE, 0 },
184186
{ "sleep-hardware-state", PIN_CONFIG_SLEEP_HARDWARE_STATE, 0 },

drivers/pinctrl/renesas/pinctrl-rza1.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -757,9 +757,9 @@ static int rza1_gpio_request(struct gpio_chip *chip, unsigned int gpio)
757757
}
758758

759759
/**
760-
* rza1_gpio_disable_free() - reset a pin
760+
* rza1_gpio_free() - reset a pin
761761
*
762-
* Surprisingly, disable_free a gpio, is equivalent to request it.
762+
* Surprisingly, freeing a gpio is equivalent to requesting it.
763763
* Reset pin to port mode, with input buffer disabled. This overwrites all
764764
* port direction settings applied with set_direction
765765
*
@@ -875,7 +875,7 @@ static int rza1_dt_node_pin_count(struct device_node *np)
875875
}
876876

877877
/**
878-
* rza1_parse_pmx_function() - parse a pin mux sub-node
878+
* rza1_parse_pinmux_node() - parse a pin mux sub-node
879879
*
880880
* @rza1_pctl: RZ/A1 pin controller device
881881
* @np: of pmx sub-node

0 commit comments

Comments
 (0)