Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: qcom: Handle get_function_mux failure

Browse Source 
Presently, get_function_mux returns an unsigned int and cannot
differentiate between failure and correct function value. Change its
return type to int and check for failure in the caller.

Additionally, updated drivers/pinctrl/qcom/pinctrl-*.c to accommodate the
above return type change. Only compile test done.

Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com>
Link: https://lore.kernel.org/r/20250226064505.1178054-5-quic_varada@quicinc.com
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Varadarajan Narayanan
2025-02-26 12:15:02 +05:30
committed by Caleb Connolly
parent ad3e8a2f59
commit 6ec61fd462
14 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/qcom/pinctrl-apq8016.c
View File

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

4
drivers/pinctrl/qcom/pinctrl-apq8096.c
View File

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

3
drivers/pinctrl/qcom/pinctrl-ipq4019.c
View File

@@ -311,8 +311,7 @@ static const char *ipq4019_get_pin_name(struct udevice *dev,
return pin_name;
}
static unsigned int ipq4019_get_function_mux(unsigned int pin,
unsigned int selector)
static int ipq4019_get_function_mux(unsigned int pin, unsigned int selector)
{
unsigned int i;
const msm_pin_function *func = ipq4019_pin_functions + pin;

2
drivers/pinctrl/qcom/pinctrl-qcm2290.c
View File

@@ -38,7 +38,7 @@ static const char *qcm2290_get_pin_name(struct udevice *dev, unsigned int select
return pin_name;
}
static unsigned int qcm2290_get_function_mux(__maybe_unused unsigned int pin, unsigned int selector)
static int qcm2290_get_function_mux(__maybe_unused unsigned int pin, unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

5
drivers/pinctrl/qcom/pinctrl-qcom.c
View File

@@ -92,7 +92,10 @@ 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);
int func = priv->data->get_function_mux(pin_selector, func_selector);
if (func < 0)
return func;
/* Always NOP for special pins, assume they're in the correct state */
if (qcom_is_special_pin(&priv->data->pin_data, pin_selector))

3
drivers/pinctrl/qcom/pinctrl-qcom.h
View File

@@ -18,8 +18,7 @@ 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 pin,
unsigned int selector);
int (*get_function_mux)(unsigned int pin, unsigned int selector);
const char *(*get_pin_name)(struct udevice *dev,
unsigned int selector);
};

4
drivers/pinctrl/qcom/pinctrl-qcs404.c
View File

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

4
drivers/pinctrl/qcom/pinctrl-sdm845.c
View File

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

2
drivers/pinctrl/qcom/pinctrl-sm6115.c
View File

@@ -167,7 +167,7 @@ static const char *sm6115_get_pin_name(struct udevice *dev, unsigned int selecto
return pin_name;
}
static unsigned int sm6115_get_function_mux(__maybe_unused unsigned int pin, unsigned int selector)
static int sm6115_get_function_mux(__maybe_unused unsigned int pin, unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

4
drivers/pinctrl/qcom/pinctrl-sm8150.c
View File

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

2
drivers/pinctrl/qcom/pinctrl-sm8250.c
View File

@@ -99,7 +99,7 @@ static const char *sm8250_get_pin_name(struct udevice *dev, unsigned int selecto
return pin_name;
}
static unsigned int sm8250_get_function_mux(__maybe_unused unsigned int pin, unsigned int selector)
static int sm8250_get_function_mux(__maybe_unused unsigned int pin, unsigned int selector)
{
return msm_pinctrl_functions[selector].val;
}

4
drivers/pinctrl/qcom/pinctrl-sm8550.c
View File

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

4
drivers/pinctrl/qcom/pinctrl-sm8650.c
View File

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

4
drivers/pinctrl/qcom/pinctrl-x1e80100.c
View File

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