[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <586ef67a22005316fd65cebbbd4019a8a2094e07.1412595859.git.michal.simek@xilinx.com>
Date: Mon, 6 Oct 2014 13:44:26 +0200
From: Michal Simek <michal.simek@...inx.com>
To: linux-arm-kernel@...ts.infradead.org
Cc: monstr@...str.eu, Josh Cartwright <josh.cartwright@...com>,
Steffen Trumtrar <s.trumtrar@...gutronix.de>,
Rob Herring <robherring2@...il.com>,
Peter Crosthwaite <peter.crosthwaite@...inx.com>,
Russell King <linux@....linux.org.uk>,
Soren Brinkmann <soren.brinkmann@...inx.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH 3/3] ARM: zynq: Extend SLCR driver to read OCM configuration
Get OCM configuration from SLCR.
Signed-off-by: Michal Simek <michal.simek@...inx.com>
---
arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++
include/soc/zynq/common.h | 1 +
2 files changed, 16 insertions(+)
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index cb7c46165728..0c3e45090c09 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -27,6 +27,7 @@
#define SLCR_A9_CPU_RST_CTRL_OFFSET 0x244 /* CPU Software Reset Control */
#define SLCR_REBOOT_STATUS_OFFSET 0x258 /* PS Reboot Status */
#define SLCR_PSS_IDCODE 0x530 /* PS IDCODE */
+#define SLCR_OCM_CFG_OFFSET 0x910 /* OCM Address Mapping */
#define SLCR_UNLOCK_MAGIC 0xDF0D
#define SLCR_A9_CPU_CLKSTOP 0x10
@@ -126,6 +127,20 @@ void zynq_slcr_system_reset(void)
}
/**
+ * zynq_slcr_get_ocm_config - Get SLCR OCM config
+ *
+ * Return: OCM config bits
+ */
+u32 zynq_slcr_get_ocm_config(void)
+{
+ u32 val;
+
+ zynq_slcr_read(&val, SLCR_OCM_CFG_OFFSET);
+
+ return val;
+}
+
+/**
* zynq_slcr_cpu_start - Start cpu
* @cpu: cpu number
*/
diff --git a/include/soc/zynq/common.h b/include/soc/zynq/common.h
index f652f0a884a6..fc6b1ed37455 100644
--- a/include/soc/zynq/common.h
+++ b/include/soc/zynq/common.h
@@ -25,6 +25,7 @@ extern void zynq_slcr_system_reset(void);
extern void zynq_slcr_cpu_stop(int cpu);
extern void zynq_slcr_cpu_start(int cpu);
extern u32 zynq_slcr_get_device_id(void);
+extern u32 zynq_slcr_get_ocm_config(void);
#ifdef CONFIG_SMP
extern void secondary_startup(void);
--
1.8.2.3
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists