Commit 54a5afb4 authored Mar 11, 2019 by Thor Thayer Committed by Lee Jones Apr 02, 2019

net: stmmac: socfpga: Use shared System Manager driver



The ARM64 System Manager requires a different method of reading
the System Manager than ARM32. A new System Manager driver was
created to steer ARM32 System Manager calls to regmap_mmio and
ARM64 System Manager calls to the new access method.

Convert from syscon to the shared System Manager driver so that
both ARM64 and ARM32 are supported.

Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 5dd2814b

drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		* Adopted from dwmac-sti.c
		*/

		#include <linux/mfd/syscon.h>
		#include <linux/mfd/altera-sysmgr.h>
		#include <linux/of.h>
		#include <linux/of_address.h>
		#include <linux/of_net.h>
		@@ -114,7 +114,8 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac dwmac, struct device

		dwmac->interface = of_get_phy_mode(np);

		sys_mgr_base_addr = syscon_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
		sys_mgr_base_addr =
		altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
		if (IS_ERR(sys_mgr_base_addr)) {
		dev_info(dev, "No sysmgr-syscon node found\n");
		return PTR_ERR(sys_mgr_base_addr);

Admin message