From: John Jacques <john.jacq...@intel.com>
The base address for node 0x115 changed from previous
Axxia devices.
Signed-off-by: John Jacques <john.jacq...@intel.com>
---
drivers/misc/lsi-ncr.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/lsi-ncr.c b/drivers/misc/lsi-ncr.c
index 3141b1c..db20101 100644
--- a/drivers/misc/lsi-ncr.c
+++ b/drivers/misc/lsi-ncr.c
@@ -29,6 +29,8 @@
static int ncr_available;
static int nca_big_endian = 1;
static int is_5500;
+static int is_5600;
+static int is_6700;
static void __iomem *nca;
static void __iomem *apb2ser0;
@@ -376,7 +378,11 @@ ncr_0x115(unsigned int region, unsigned int offset, int
write,
else
indcmd.bits.hsize = 1;
- base = 0x10000ULL * (0x14 + NCP_TARGET_ID(region));
+ if (0 != is_5600)
+ base = 0x10000ULL * (0x14 + NCP_TARGET_ID(region));
+ else
+ base = 0x10000ULL * (0x1e + NCP_TARGET_ID(region));
+
mdelay(50);
if (0 != write)
@@ -903,6 +909,7 @@ ncr_init(void)
pr_debug("Using AXM5600 Addresses\n");
nca = ioremap(0x8031080000ULL, 0x20000);
apb2ser0 = ioremap(0x8002000000ULL, 0x4000000);
+ is_5600 = 1;
pr_debug("0x%lx 0x%lx\n",
(unsigned long)nca,
(unsigned long)apb2ser0);
@@ -910,6 +917,7 @@ ncr_init(void)
pr_debug("Using AXC6700 Addresses\n");
nca = ioremap(0x8020000000ULL, 0x20000);
apb2ser0 = ioremap(0x8080000000ULL, 0x400000);
+ is_6700 = 1;
nca_big_endian = 0; /* The 6700 NCA is LE */
} else {
pr_debug("No Valid Compatible String Found for NCR!\n");
--
2.7.4
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
