pinctrl: qcom: pass pin number to get_function_mux callback

This patch is the preparation for SM8150 support. This new SoC
depending on the particular pin can have different numbers for the
same function. For example "rgmii" function for GPIO4 has id=2 while
for GPIO59 it has id=1. So, to support this type of SoCs,
get_function_mux() callback needs to know for which pin the function
is requested.

Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Volodymyr Babchuk
2024-03-11 21:33:46 +00:00
committed by Caleb Connolly
parent b563e766fe
commit 493f069062
7 changed files with 14 additions and 8 deletions

View File

@@ -49,7 +49,8 @@ static const char *apq8016_get_pin_name(struct udevice *dev,
}
}
static unsigned int apq8016_get_function_mux(unsigned int selector)
static unsigned int apq8016_get_function_mux(__maybe_unused unsigned int pin,
unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

View File

@@ -44,7 +44,8 @@ static const char *apq8096_get_pin_name(struct udevice *dev,
}
}
static unsigned int apq8096_get_function_mux(unsigned int selector)
static unsigned int apq8096_get_function_mux(__maybe_unused unsigned int pin,
unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

View File

@@ -40,7 +40,8 @@ static const char *ipq4019_get_pin_name(struct udevice *dev,
return pin_name;
}
static unsigned int ipq4019_get_function_mux(unsigned int selector)
static unsigned int ipq4019_get_function_mux(__maybe_unused unsigned int pin,
unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

View File

@@ -83,14 +83,14 @@ static int msm_pinmux_set(struct udevice *dev, unsigned int pin_selector,
unsigned int func_selector)
{
struct msm_pinctrl_priv *priv = dev_get_priv(dev);
u32 func = priv->data->get_function_mux(pin_selector, func_selector);
/* Always NOP for special pins, assume they're in the correct state */
if (qcom_is_special_pin(&priv->data->pin_data, pin_selector))
return 0;
clrsetbits_le32(priv->base + GPIO_CONFIG_REG(priv, pin_selector),
TLMM_FUNC_SEL_MASK | TLMM_GPIO_DISABLE,
priv->data->get_function_mux(func_selector) << 2);
TLMM_FUNC_SEL_MASK | TLMM_GPIO_DISABLE, func << 2);
return 0;
}

View File

@@ -18,7 +18,8 @@ struct msm_pinctrl_data {
int functions_count;
const char *(*get_function_name)(struct udevice *dev,
unsigned int selector);
unsigned int (*get_function_mux)(unsigned int selector);
unsigned int (*get_function_mux)(unsigned int pin,
unsigned int selector);
const char *(*get_pin_name)(struct udevice *dev,
unsigned int selector);
};

View File

@@ -94,7 +94,8 @@ static const char *qcs404_get_pin_name(struct udevice *dev,
}
}
static unsigned int qcs404_get_function_mux(unsigned int selector)
static unsigned int qcs404_get_function_mux(__maybe_unused unsigned int pin,
unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

View File

@@ -70,7 +70,8 @@ static const char *sdm845_get_pin_name(struct udevice *dev,
return pin_name;
}
static unsigned int sdm845_get_function_mux(unsigned int selector)
static unsigned int sdm845_get_function_mux(__maybe_unused unsigned int pin,
unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}