Commit 4fac724f authored by Patrice Chotard's avatar Patrice Chotard Committed by Linus Walleij

pinctrl: stm32: factorize stm32_pconf_input/output_get()

As these 2 functions code are 95% similar, factorize them.
Signed-off-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Acked-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a0ee2ac0
...@@ -638,8 +638,8 @@ static u32 stm32_pconf_get_bias(struct stm32_gpio_bank *bank, ...@@ -638,8 +638,8 @@ static u32 stm32_pconf_get_bias(struct stm32_gpio_bank *bank,
return (val >> (offset * 2)); return (val >> (offset * 2));
} }
static bool stm32_pconf_input_get(struct stm32_gpio_bank *bank, static bool stm32_pconf_get(struct stm32_gpio_bank *bank,
unsigned int offset) unsigned int offset, bool dir)
{ {
unsigned long flags; unsigned long flags;
u32 val; u32 val;
...@@ -647,23 +647,12 @@ static bool stm32_pconf_input_get(struct stm32_gpio_bank *bank, ...@@ -647,23 +647,12 @@ static bool stm32_pconf_input_get(struct stm32_gpio_bank *bank,
clk_enable(bank->clk); clk_enable(bank->clk);
spin_lock_irqsave(&bank->lock, flags); spin_lock_irqsave(&bank->lock, flags);
val = !!(readl_relaxed(bank->base + STM32_GPIO_IDR) & BIT(offset)); if (dir)
val = !!(readl_relaxed(bank->base + STM32_GPIO_IDR) &
spin_unlock_irqrestore(&bank->lock, flags); BIT(offset));
clk_disable(bank->clk); else
val = !!(readl_relaxed(bank->base + STM32_GPIO_ODR) &
return val; BIT(offset));
}
static bool stm32_pconf_output_get(struct stm32_gpio_bank *bank,
unsigned int offset)
{
unsigned long flags;
u32 val;
clk_enable(bank->clk);
spin_lock_irqsave(&bank->lock, flags);
val = !!(readl_relaxed(bank->base + STM32_GPIO_ODR) & BIT(offset));
spin_unlock_irqrestore(&bank->lock, flags); spin_unlock_irqrestore(&bank->lock, flags);
clk_disable(bank->clk); clk_disable(bank->clk);
...@@ -772,7 +761,7 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev, ...@@ -772,7 +761,7 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
switch (mode) { switch (mode) {
/* input */ /* input */
case 0: case 0:
val = stm32_pconf_input_get(bank, offset); val = stm32_pconf_get(bank, offset, true);
seq_printf(s, "- %s - %s", seq_printf(s, "- %s - %s",
val ? "high" : "low", val ? "high" : "low",
biasing[bias]); biasing[bias]);
...@@ -782,7 +771,7 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev, ...@@ -782,7 +771,7 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
case 1: case 1:
drive = stm32_pconf_get_driving(bank, offset); drive = stm32_pconf_get_driving(bank, offset);
speed = stm32_pconf_get_speed(bank, offset); speed = stm32_pconf_get_speed(bank, offset);
val = stm32_pconf_output_get(bank, offset); val = stm32_pconf_get(bank, offset, false);
seq_printf(s, "- %s - %s - %s - %s %s", seq_printf(s, "- %s - %s - %s - %s %s",
val ? "high" : "low", val ? "high" : "low",
drive ? "open drain" : "push pull", drive ? "open drain" : "push pull",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment