mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-17 20:57:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: imx: Convert to use livetree API for fdt access

Browse Source 
Convert to using livetree API functions.

Without this if livetree is enabled (OF_LIVE) the imx8mq-pinctrl
driver will (silently) fail to probe causing issues with multiple
devices.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2024-10-23 13:28:52 -07:00 committed by Fabio Estevam
parent 7f62b52305
commit 59382d2cb9
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/pinctrl/nxp/pinctrl-imx.c
View File

@ -22,7 +22,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
{ {
struct imx_pinctrl_priv *priv = dev_get_priv(dev); struct imx_pinctrl_priv *priv = dev_get_priv(dev);
struct imx_pinctrl_soc_info *info = priv->info; struct imx_pinctrl_soc_info *info = priv->info;
int node = dev_of_offset(config); ofnode node = dev_ofnode(config);
const struct fdt_property *prop; const struct fdt_property *prop;
u32 *pin_data; u32 *pin_data;
int npins, size, pin_size; int npins, size, pin_size;
@ -40,7 +40,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
else else
pin_size = FSL_PIN_SIZE; pin_size = FSL_PIN_SIZE;
prop = fdt_getprop(gd->fdt_blob, node, "fsl,pins", &size); prop = ofnode_get_property(node, "fsl,pins", &size);
if (!prop) { if (!prop) {
dev_err(dev, "No fsl,pins property in node %s\n", config->name); dev_err(dev, "No fsl,pins property in node %s\n", config->name);
return -EINVAL; return -EINVAL;
@ -56,8 +56,8 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
if (!pin_data) if (!pin_data)
return -ENOMEM; return -ENOMEM;
if (fdtdec_get_int_array(gd->fdt_blob, node, "fsl,pins", if (ofnode_read_u32_array(node, "fsl,pins",
pin_data, size >> 2)) { pin_data, size >> 2)) {
dev_err(dev, "Error reading pin data.\n"); dev_err(dev, "Error reading pin data.\n");
devm_kfree(dev, pin_data); devm_kfree(dev, pin_data);
return -EINVAL; return -EINVAL;
@ -202,10 +202,11 @@ int imx_pinctrl_probe(struct udevice *dev,
struct imx_pinctrl_soc_info *info) struct imx_pinctrl_soc_info *info)
{ {
struct imx_pinctrl_priv *priv = dev_get_priv(dev); struct imx_pinctrl_priv *priv = dev_get_priv(dev);
int node = dev_of_offset(dev), ret; struct ofnode_phandle_args arg;
struct fdtdec_phandle_args arg; ofnode node = dev_ofnode(dev);
fdt_addr_t addr; fdt_addr_t addr;
fdt_size_t size; fdt_size_t size;
int ret;
if (!info) { if (!info) {
dev_err(dev, "wrong pinctrl info\n"); dev_err(dev, "wrong pinctrl info\n");
@ -218,7 +219,7 @@ int imx_pinctrl_probe(struct udevice *dev,
if (info->flags & IMX8_USE_SCU) if (info->flags & IMX8_USE_SCU)
return 0; return 0;
addr = devfdt_get_addr_size_index(dev, 0, &size); addr = ofnode_get_addr_size_index(dev_ofnode(dev), 0, &size);
if (addr == FDT_ADDR_T_NONE) if (addr == FDT_ADDR_T_NONE)
return -EINVAL; return -EINVAL;
@ -227,22 +228,20 @@ int imx_pinctrl_probe(struct udevice *dev,
return -ENOMEM; return -ENOMEM;
priv->info = info; priv->info = info;
info->mux_mask = fdtdec_get_int(gd->fdt_blob, node, "fsl,mux_mask", 0); info->mux_mask = ofnode_read_u32(node, "fsl,mux_mask", 0);
/* /*
* Refer to linux documentation for details: * Refer to linux documentation for details:
* Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt * Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
*/ */
if (fdtdec_get_bool(gd->fdt_blob, node, "fsl,input-sel")) { if (ofnode_read_bool(node, "fsl,input-sel")) {
ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, ret = ofnode_parse_phandle_with_args(node, "fsl,input-sel",
node, "fsl,input-sel",
NULL, 0, 0, &arg); NULL, 0, 0, &arg);
if (ret) { if (ret) {
dev_err(dev, "iomuxc fsl,input-sel property not found\n"); dev_err(dev, "iomuxc fsl,input-sel property not found\n");
return -EINVAL; return -EINVAL;
} }
addr = fdtdec_get_addr_size(gd->fdt_blob, arg.node, "reg", addr = ofnode_get_addr_size(arg.node, "reg", &size);
&size);
if (addr == FDT_ADDR_T_NONE) if (addr == FDT_ADDR_T_NONE)
return -EINVAL; return -EINVAL;