* [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config @ 2019-11-19 15:52 Paul Cercueil 2019-11-19 15:52 ` [PATCH 2/2] pinctrl: ingenic: Add OTG VBUS pin for the JZ4770 Paul Cercueil 2019-11-21 14:10 ` [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config Linus Walleij 0 siblings, 2 replies; 4+ messages in thread From: Paul Cercueil @ 2019-11-19 15:52 UTC (permalink / raw) To: Linus Walleij; +Cc: od, linux-gpio, linux-kernel, Paul Cercueil This makes the driver support the 'output-low' and 'output-high' devicetree properties in gpio-hog sub-nodes. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/pinctrl/pinctrl-ingenic.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 6e2683016c1f..dbd907ef7cf0 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -1801,19 +1801,30 @@ static void ingenic_set_bias(struct ingenic_pinctrl *jzpc, ingenic_config_pin(jzpc, pin, JZ4740_GPIO_PULL_DIS, !enabled); } +static void ingenic_set_output_level(struct ingenic_pinctrl *jzpc, + unsigned int pin, bool high) +{ + if (jzpc->version >= ID_JZ4770) + ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PAT0, high); + else + ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DATA, high); +} + static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, unsigned long *configs, unsigned int num_configs) { struct ingenic_pinctrl *jzpc = pinctrl_dev_get_drvdata(pctldev); unsigned int idx = pin % PINS_PER_GPIO_CHIP; unsigned int offt = pin / PINS_PER_GPIO_CHIP; - unsigned int cfg; + unsigned int cfg, arg; + int ret; for (cfg = 0; cfg < num_configs; cfg++) { switch (pinconf_to_config_param(configs[cfg])) { case PIN_CONFIG_BIAS_DISABLE: case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_DOWN: + case PIN_CONFIG_OUTPUT: continue; default: return -ENOTSUPP; @@ -1821,6 +1832,8 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, } for (cfg = 0; cfg < num_configs; cfg++) { + arg = pinconf_to_config_argument(configs[cfg]); + switch (pinconf_to_config_param(configs[cfg])) { case PIN_CONFIG_BIAS_DISABLE: dev_dbg(jzpc->dev, "disable pull-over for pin P%c%u\n", @@ -1844,6 +1857,14 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin, ingenic_set_bias(jzpc, pin, true); break; + case PIN_CONFIG_OUTPUT: + ret = pinctrl_gpio_direction_output(pin); + if (ret) + return ret; + + ingenic_set_output_level(jzpc, pin, arg); + break; + default: unreachable(); } -- 2.24.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] pinctrl: ingenic: Add OTG VBUS pin for the JZ4770 2019-11-19 15:52 [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config Paul Cercueil @ 2019-11-19 15:52 ` Paul Cercueil 2019-11-21 14:10 ` Linus Walleij 2019-11-21 14:10 ` [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config Linus Walleij 1 sibling, 1 reply; 4+ messages in thread From: Paul Cercueil @ 2019-11-19 15:52 UTC (permalink / raw) To: Linus Walleij; +Cc: od, linux-gpio, linux-kernel, Paul Cercueil Add pin mux configuration for the OTG VBUS pin of the JZ4770. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/pinctrl/pinctrl-ingenic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index dbd907ef7cf0..44f96a4eb97c 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -686,6 +686,7 @@ static int jz4770_mac_rmii_pins[] = { 0xa9, 0xab, 0xaa, 0xac, 0xa5, 0xa4, 0xad, 0xae, 0xa6, 0xa8, }; static int jz4770_mac_mii_pins[] = { 0xa7, 0xaf, }; +static int jz4770_otg_pins[] = { 0x8a, }; static int jz4770_uart0_data_funcs[] = { 0, 0, }; static int jz4770_uart0_hwflow_funcs[] = { 0, 0, }; @@ -744,6 +745,7 @@ static int jz4770_pwm_pwm6_funcs[] = { 0, }; static int jz4770_pwm_pwm7_funcs[] = { 0, }; static int jz4770_mac_rmii_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; static int jz4770_mac_mii_funcs[] = { 0, 0, }; +static int jz4770_otg_funcs[] = { 0, }; static const struct group_desc jz4770_groups[] = { INGENIC_PIN_GROUP("uart0-data", jz4770_uart0_data), @@ -799,6 +801,7 @@ static const struct group_desc jz4770_groups[] = { INGENIC_PIN_GROUP("pwm7", jz4770_pwm_pwm7), INGENIC_PIN_GROUP("mac-rmii", jz4770_mac_rmii), INGENIC_PIN_GROUP("mac-mii", jz4770_mac_mii), + INGENIC_PIN_GROUP("otg-vbus", jz4770_otg), }; static const char *jz4770_uart0_groups[] = { "uart0-data", "uart0-hwflow", }; @@ -841,6 +844,7 @@ static const char *jz4770_pwm5_groups[] = { "pwm5", }; static const char *jz4770_pwm6_groups[] = { "pwm6", }; static const char *jz4770_pwm7_groups[] = { "pwm7", }; static const char *jz4770_mac_groups[] = { "mac-rmii", "mac-mii", }; +static const char *jz4770_otg_groups[] = { "otg-vbus", }; static const struct function_desc jz4770_functions[] = { { "uart0", jz4770_uart0_groups, ARRAY_SIZE(jz4770_uart0_groups), }, @@ -871,6 +875,7 @@ static const struct function_desc jz4770_functions[] = { { "pwm6", jz4770_pwm6_groups, ARRAY_SIZE(jz4770_pwm6_groups), }, { "pwm7", jz4770_pwm7_groups, ARRAY_SIZE(jz4770_pwm7_groups), }, { "mac", jz4770_mac_groups, ARRAY_SIZE(jz4770_mac_groups), }, + { "otg", jz4770_otg_groups, ARRAY_SIZE(jz4770_otg_groups), }, }; static const struct ingenic_chip_info jz4770_chip_info = { -- 2.24.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] pinctrl: ingenic: Add OTG VBUS pin for the JZ4770 2019-11-19 15:52 ` [PATCH 2/2] pinctrl: ingenic: Add OTG VBUS pin for the JZ4770 Paul Cercueil @ 2019-11-21 14:10 ` Linus Walleij 0 siblings, 0 replies; 4+ messages in thread From: Linus Walleij @ 2019-11-21 14:10 UTC (permalink / raw) To: Paul Cercueil; +Cc: od, open list:GPIO SUBSYSTEM, linux-kernel On Tue, Nov 19, 2019 at 4:52 PM Paul Cercueil <paul@crapouillou.net> wrote: > Add pin mux configuration for the OTG VBUS pin of the JZ4770. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Patch applied. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config 2019-11-19 15:52 [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config Paul Cercueil 2019-11-19 15:52 ` [PATCH 2/2] pinctrl: ingenic: Add OTG VBUS pin for the JZ4770 Paul Cercueil @ 2019-11-21 14:10 ` Linus Walleij 1 sibling, 0 replies; 4+ messages in thread From: Linus Walleij @ 2019-11-21 14:10 UTC (permalink / raw) To: Paul Cercueil; +Cc: od, open list:GPIO SUBSYSTEM, linux-kernel On Tue, Nov 19, 2019 at 4:52 PM Paul Cercueil <paul@crapouillou.net> wrote: > This makes the driver support the 'output-low' and 'output-high' > devicetree properties in gpio-hog sub-nodes. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Patch applied! Yours, Linus Walleij ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-21 14:11 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-11-19 15:52 [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config Paul Cercueil 2019-11-19 15:52 ` [PATCH 2/2] pinctrl: ingenic: Add OTG VBUS pin for the JZ4770 Paul Cercueil 2019-11-21 14:10 ` Linus Walleij 2019-11-21 14:10 ` [PATCH 1/2] pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).