mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers changes
for 4.18, please pull the following: - Florian removes the synthetic struct device in the DPFE driver which was used to attach sysfs attributes and uses the platform_device we are probed from instead. -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJa9cwTAAoJEIfQlpxEBwcE9lcQANFIweVf91Y6+HxD/Tm+j9Zr xBCsBWA/YYbSGXuXCzLzMY+tOEstAThxptWMDjmL801uhpBW/2w26DhoNIYz1gpg cfWy0c+984HUdmtyoyoM1tnWZ++W9bzugC9ELRT/QNtKUD3dbBNpFnSB1UmI/WPU ibxwDHjRvpslASdVq2+FFj/OVQx4VF+J5OPSKRJjaf8yN5xaaKkyKbpf31mNLsVE zCnzc78Awyv6+As0hSyQaFI98ipkWIkrQfhKzXAx01ymqj8b7TaIBgRevTt3Oaj2 gAQa4cNlvV4FyrFoTmUO63GDBXbSldSDgGhRkXCA+dHEyzFLGGER/epAnrdsxfOT eBPliwcvss6P8jXNAGUxX18BHrHqLllsLyWpYs16/m8hc4foytdI4KX6XmAfQY7F ThKzu2N9uElpDaqN33hzl7wtkVqJLnFFmQDNR38pf/txgtPpHJ3i2DVMyF9Bo4e5 QAI1PMoEOxGNspidtLbZdKStvn2mYXP6j08yNcMfo9HCznOOjFEUJFlcB4Ne+Kdc fxt+Ivh3l5rSM5kYqH2F0zuUJax4dYG72CdYlJ4P2JKagpPTYqsLQSC72BePpMTu YIupobgxY92Kq86bHqIHDC8YWDegB7Js6JNXIk/aR6ffrAs5wH360M9SLfDsC9yS 0xOhhMTZCSPqKflH1NGg =33Be -----END PGP SIGNATURE----- Merge tag 'arm-soc/for-4.18/drivers' of https://github.com/Broadcom/stblinux into next/drivers This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers changes for 4.18, please pull the following: - Florian removes the synthetic struct device in the DPFE driver which was used to attach sysfs attributes and uses the platform_device we are probed from instead. * tag 'arm-soc/for-4.18/drivers' of https://github.com/Broadcom/stblinux: memory: brcmstb: dpfe: Remove need for dpfe_dev Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
4e7383e14e
1 changed files with 12 additions and 34 deletions
|
@ -176,7 +176,6 @@ struct private_data {
|
|||
void __iomem *dmem;
|
||||
void __iomem *imem;
|
||||
struct device *dev;
|
||||
unsigned int index;
|
||||
struct mutex lock;
|
||||
};
|
||||
|
||||
|
@ -674,10 +673,8 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
|
|||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct private_data *priv;
|
||||
struct device *dpfe_dev;
|
||||
struct init_data init;
|
||||
struct resource *res;
|
||||
u32 index;
|
||||
int ret;
|
||||
|
||||
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
||||
|
@ -687,11 +684,6 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
|
|||
mutex_init(&priv->lock);
|
||||
platform_set_drvdata(pdev, priv);
|
||||
|
||||
/* Cell index is optional; default to 0 if not present. */
|
||||
ret = of_property_read_u32(dev->of_node, "cell-index", &index);
|
||||
if (ret)
|
||||
index = 0;
|
||||
|
||||
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dpfe-cpu");
|
||||
priv->regs = devm_ioremap_resource(dev, res);
|
||||
if (IS_ERR(priv->regs)) {
|
||||
|
@ -715,37 +707,22 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
|
|||
|
||||
ret = brcmstb_dpfe_download_firmware(pdev, &init);
|
||||
if (ret)
|
||||
goto err;
|
||||
return ret;
|
||||
|
||||
dpfe_dev = devm_kzalloc(dev, sizeof(*dpfe_dev), GFP_KERNEL);
|
||||
if (!dpfe_dev) {
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
priv->dev = dpfe_dev;
|
||||
priv->index = index;
|
||||
|
||||
dpfe_dev->parent = dev;
|
||||
dpfe_dev->groups = dpfe_groups;
|
||||
dpfe_dev->of_node = dev->of_node;
|
||||
dev_set_drvdata(dpfe_dev, priv);
|
||||
dev_set_name(dpfe_dev, "dpfe%u", index);
|
||||
|
||||
ret = device_register(dpfe_dev);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
dev_info(dev, "registered.\n");
|
||||
|
||||
return 0;
|
||||
|
||||
err:
|
||||
dev_err(dev, "failed to initialize -- error %d\n", ret);
|
||||
ret = sysfs_create_groups(&pdev->dev.kobj, dpfe_groups);
|
||||
if (!ret)
|
||||
dev_info(dev, "registered.\n");
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int brcmstb_dpfe_remove(struct platform_device *pdev)
|
||||
{
|
||||
sysfs_remove_groups(&pdev->dev.kobj, dpfe_groups);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id brcmstb_dpfe_of_match[] = {
|
||||
{ .compatible = "brcm,dpfe-cpu", },
|
||||
{}
|
||||
|
@ -758,6 +735,7 @@ static struct platform_driver brcmstb_dpfe_driver = {
|
|||
.of_match_table = brcmstb_dpfe_of_match,
|
||||
},
|
||||
.probe = brcmstb_dpfe_probe,
|
||||
.remove = brcmstb_dpfe_remove,
|
||||
.resume = brcmstb_dpfe_resume,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue