f2f42a54e8
The qca8k patch series brings the numbering to 799. This patch renames 7xx patches to create space for more backports to be added. Signed-off-by: Matthew Hagan <mnhagan88@gmail.com> [rename 729->719] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
93 lines
2.4 KiB
Diff
93 lines
2.4 KiB
Diff
From a5538a777b73b35750ed1ffff8c1ef539e861624 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
Date: Wed, 17 Mar 2021 10:23:17 +0100
|
|
Subject: [PATCH] net: dsa: b53: mmap: Add device tree support
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Add device tree support to b53_mmap.c while keeping platform devices support.
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/b53/b53_mmap.c | 55 ++++++++++++++++++++++++++++++++++
|
|
1 file changed, 55 insertions(+)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_mmap.c
|
|
+++ b/drivers/net/dsa/b53/b53_mmap.c
|
|
@@ -16,6 +16,7 @@
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
+#include <linux/bits.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/io.h>
|
|
@@ -228,11 +229,65 @@ static const struct b53_io_ops b53_mmap_
|
|
.write64 = b53_mmap_write64,
|
|
};
|
|
|
|
+static int b53_mmap_probe_of(struct platform_device *pdev,
|
|
+ struct b53_platform_data **ppdata)
|
|
+{
|
|
+ struct device_node *np = pdev->dev.of_node;
|
|
+ struct device_node *of_ports, *of_port;
|
|
+ struct device *dev = &pdev->dev;
|
|
+ struct b53_platform_data *pdata;
|
|
+ void __iomem *mem;
|
|
+
|
|
+ mem = devm_platform_ioremap_resource(pdev, 0);
|
|
+ if (IS_ERR(mem))
|
|
+ return PTR_ERR(mem);
|
|
+
|
|
+ pdata = devm_kzalloc(dev, sizeof(struct b53_platform_data),
|
|
+ GFP_KERNEL);
|
|
+ if (!pdata)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ pdata->regs = mem;
|
|
+ pdata->chip_id = BCM63XX_DEVICE_ID;
|
|
+ pdata->big_endian = of_property_read_bool(np, "big-endian");
|
|
+
|
|
+ of_ports = of_get_child_by_name(np, "ports");
|
|
+ if (!of_ports) {
|
|
+ dev_err(dev, "no ports child node found\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ for_each_available_child_of_node(of_ports, of_port) {
|
|
+ u32 reg;
|
|
+
|
|
+ if (of_property_read_u32(of_port, "reg", ®))
|
|
+ continue;
|
|
+
|
|
+ if (reg < B53_CPU_PORT)
|
|
+ pdata->enabled_ports |= BIT(reg);
|
|
+ }
|
|
+
|
|
+ of_node_put(of_ports);
|
|
+ *ppdata = pdata;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int b53_mmap_probe(struct platform_device *pdev)
|
|
{
|
|
+ struct device_node *np = pdev->dev.of_node;
|
|
struct b53_platform_data *pdata = pdev->dev.platform_data;
|
|
struct b53_mmap_priv *priv;
|
|
struct b53_device *dev;
|
|
+ int ret;
|
|
+
|
|
+ if (!pdata && np) {
|
|
+ ret = b53_mmap_probe_of(pdev, &pdata);
|
|
+ if (ret) {
|
|
+ dev_err(&pdev->dev, "OF probe error\n");
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
|
|
if (!pdata)
|
|
return -EINVAL;
|