0d3690a202
This is a backport of bcma and ssb from wireless-tesing/master tag master-2014-07-22. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41804
115 lines
2.9 KiB
Diff
115 lines
2.9 KiB
Diff
From c046c19fc8f1af7cf253fea5b0253143c159948a Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Mon, 6 Jan 2014 23:29:15 +0100
|
|
Subject: [PATCH 6/8] bcma: register bcma as device tree driver
|
|
|
|
This driver is used by the bcm53xx ARM SoC code.Now it is possible to
|
|
give the address of the chipcommon core in device tree.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/bcma/host_soc.c | 70 +++++++++++++++++++++++++++++++++++++++++++++
|
|
include/linux/bcma/bcma.h | 2 ++
|
|
2 files changed, 72 insertions(+)
|
|
|
|
--- a/drivers/bcma/host_soc.c
|
|
+++ b/drivers/bcma/host_soc.c
|
|
@@ -7,6 +7,9 @@
|
|
|
|
#include "bcma_private.h"
|
|
#include "scan.h"
|
|
+#include <linux/slab.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/of_address.h>
|
|
#include <linux/bcma/bcma.h>
|
|
#include <linux/bcma/bcma_soc.h>
|
|
|
|
@@ -173,6 +176,7 @@ int __init bcma_host_soc_register(struct
|
|
/* Host specific */
|
|
bus->hosttype = BCMA_HOSTTYPE_SOC;
|
|
bus->ops = &bcma_host_soc_ops;
|
|
+ bus->host_pdev = NULL;
|
|
|
|
/* Register */
|
|
err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
|
|
@@ -181,3 +185,69 @@ int __init bcma_host_soc_register(struct
|
|
|
|
return err;
|
|
}
|
|
+
|
|
+#ifdef CONFIG_OF
|
|
+static int bcma_host_soc_probe(struct platform_device *pdev)
|
|
+{
|
|
+ struct device *dev = &pdev->dev;
|
|
+ struct device_node *np = dev->of_node;
|
|
+ struct bcma_bus *bus;
|
|
+ int err;
|
|
+
|
|
+ /* Alloc */
|
|
+ bus = devm_kzalloc(dev, sizeof(*bus), GFP_KERNEL);
|
|
+ if (!bus)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ /* Map MMIO */
|
|
+ bus->mmio = of_iomap(np, 0);
|
|
+ if (!bus->mmio)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ /* Host specific */
|
|
+ bus->hosttype = BCMA_HOSTTYPE_SOC;
|
|
+ bus->ops = &bcma_host_soc_ops;
|
|
+ bus->host_pdev = pdev;
|
|
+
|
|
+ /* Register */
|
|
+ err = bcma_bus_register(bus);
|
|
+ if (err)
|
|
+ goto err_unmap_mmio;
|
|
+
|
|
+ platform_set_drvdata(pdev, bus);
|
|
+
|
|
+ return err;
|
|
+
|
|
+err_unmap_mmio:
|
|
+ iounmap(bus->mmio);
|
|
+ return err;
|
|
+}
|
|
+
|
|
+static int bcma_host_soc_remove(struct platform_device *pdev)
|
|
+{
|
|
+ struct bcma_bus *bus = platform_get_drvdata(pdev);
|
|
+
|
|
+ bcma_bus_unregister(bus);
|
|
+ iounmap(bus->mmio);
|
|
+ platform_set_drvdata(pdev, NULL);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct of_device_id bcma_host_soc_of_match[] = {
|
|
+ { .compatible = "brcm,bus-aix", },
|
|
+ {},
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, bcma_host_soc_of_match);
|
|
+
|
|
+static struct platform_driver bcma_host_soc_driver = {
|
|
+ .driver = {
|
|
+ .name = "bcma-host-soc",
|
|
+ .owner = THIS_MODULE,
|
|
+ .of_match_table = bcma_host_soc_of_match,
|
|
+ },
|
|
+ .probe = bcma_host_soc_probe,
|
|
+ .remove = bcma_host_soc_remove,
|
|
+};
|
|
+module_platform_driver(bcma_host_soc_driver);
|
|
+#endif /* CONFIG_OF */
|
|
--- a/include/linux/bcma/bcma.h
|
|
+++ b/include/linux/bcma/bcma.h
|
|
@@ -322,6 +322,8 @@ struct bcma_bus {
|
|
struct pci_dev *host_pci;
|
|
/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
|
|
struct sdio_func *host_sdio;
|
|
+ /* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
|
|
+ struct platform_device *host_pdev;
|
|
};
|
|
|
|
struct bcma_chipinfo chipinfo;
|