GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: imx8: scu: use platdata instead of priv data

Browse source 
priv data has not been allocated when doing bind, so it is
wrong to use dev_get_priv in bind call back.

Let's switch to use platdata in the driver to fix the issue.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Peng Fan 2018-12-15 12:19:52 +00:00 • committed by Stefano Babic
parent ecab65e4cd
commit 026381fc5a
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/misc/imx8/scu.c
View file

@ -158,7 +158,7 @@ static int sc_ipc_write(struct mu_type *base, void *data)
static int imx8_scu_call(struct udevice *dev, int no_resp, void *tx_msg, static int imx8_scu_call(struct udevice *dev, int no_resp, void *tx_msg,
int tx_size, void *rx_msg, int rx_size) int tx_size, void *rx_msg, int rx_size)
{ {
struct imx8_scu *priv = dev_get_priv(dev); struct imx8_scu *plat = dev_get_platdata(dev);
sc_err_t result; sc_err_t result;
int ret; int ret;
@ -166,11 +166,11 @@ static int imx8_scu_call(struct udevice *dev, int no_resp, void *tx_msg,
if (rx_msg && tx_msg != rx_msg) if (rx_msg && tx_msg != rx_msg)
printf("tx_msg %p, rx_msg %p\n", tx_msg, rx_msg); printf("tx_msg %p, rx_msg %p\n", tx_msg, rx_msg);
ret = sc_ipc_write(priv->base, tx_msg); ret = sc_ipc_write(plat->base, tx_msg);
if (ret) if (ret)
return ret; return ret;
if (!no_resp) { if (!no_resp) {
ret = sc_ipc_read(priv->base, rx_msg); ret = sc_ipc_read(plat->base, rx_msg);
if (ret) if (ret)
return ret; return ret;
} }
@ -182,24 +182,24 @@ static int imx8_scu_call(struct udevice *dev, int no_resp, void *tx_msg,
static int imx8_scu_probe(struct udevice *dev) static int imx8_scu_probe(struct udevice *dev)
{ {
struct imx8_scu *priv = dev_get_priv(dev); struct imx8_scu *plat = dev_get_platdata(dev);
fdt_addr_t addr; fdt_addr_t addr;
debug("%s(dev=%p) (priv=%p)\n", __func__, dev, priv); debug("%s(dev=%p) (plat=%p)\n", __func__, dev, plat);
addr = devfdt_get_addr(dev); addr = devfdt_get_addr(dev);
if (addr == FDT_ADDR_T_NONE) if (addr == FDT_ADDR_T_NONE)
return -EINVAL; return -EINVAL;
priv->base = (struct mu_type *)addr; plat->base = (struct mu_type *)addr;
/* U-Boot not enable interrupts, so need to enable RX interrupts */ /* U-Boot not enable interrupts, so need to enable RX interrupts */
mu_hal_init(priv->base); mu_hal_init(plat->base);
gd->arch.scu_dev = dev; gd->arch.scu_dev = dev;
device_probe(priv->clk); device_probe(plat->clk);
device_probe(priv->pinclk); device_probe(plat->pinclk);
return 0; return 0;
} }
@ -211,7 +211,7 @@ static int imx8_scu_remove(struct udevice *dev)
static int imx8_scu_bind(struct udevice *dev) static int imx8_scu_bind(struct udevice *dev)
{ {
struct imx8_scu *priv = dev_get_priv(dev); struct imx8_scu *plat = dev_get_platdata(dev);
int ret; int ret;
struct udevice *child; struct udevice *child;
int node; int node;
@ -227,7 +227,7 @@ static int imx8_scu_bind(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
priv->clk = child; plat->clk = child;
node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, node = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
"fsl,imx8qxp-iomuxc"); "fsl,imx8qxp-iomuxc");
@ -238,7 +238,7 @@ static int imx8_scu_bind(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
priv->pinclk = child; plat->pinclk = child;
return 0; return 0;
} }
@ -261,6 +261,6 @@ U_BOOT_DRIVER(imx8_scu) = {
.bind = imx8_scu_bind, .bind = imx8_scu_bind,
.remove = imx8_scu_remove, .remove = imx8_scu_remove,
.ops = &imx8_scu_ops, .ops = &imx8_scu_ops,
.priv_auto_alloc_size = sizeof(struct imx8_scu), .platdata_auto_alloc_size = sizeof(struct imx8_scu),
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,
}; };