[PATCH v4 4/6] ARM: zynq: Extend SLCR driver to read OCM configuration
From: Sören Brinkmann <hidden>
Date: 2014-11-14 15:15:41
Also in:
lkml
On Fri, 2014-11-14 at 11:52AM +0100, Michal Simek wrote:
quoted hunk ↗ jump to hunk
Get OCM configuration from SLCR. Signed-off-by: Michal Simek <redacted> --- Changes in v4: - slcr.h has moved to soc/include/ folder. Move definition there too. Changes in v3: None Changes in v2: None arch/arm/mach-zynq/slcr.c | 15 +++++++++++++++ include/soc/zynq/slcr.h | 1 + 2 files changed, 16 insertions(+)diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index b77e42d999c8..f7c606e57525 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c@@ -29,6 +29,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@@ -128,6 +129,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/slcr.h b/include/soc/zynq/slcr.h index 7b4edab666ee..639723c4f90c 100644 --- a/include/soc/zynq/slcr.h +++ b/include/soc/zynq/slcr.h@@ -25,5 +25,6 @@ extern void zynq_slcr_cpu_start(int cpu); extern bool zynq_slcr_cpu_state_read(int cpu); extern void zynq_slcr_cpu_state_write(int cpu, bool die); extern u32 zynq_slcr_get_device_id(void); +extern u32 zynq_slcr_get_ocm_config(void);
I still believe we should consolidate this somehow instead of adding
another function for each and every register that might have to be read
by something else.
Usage of syscon/regmap might be an option. Or probably something like:
enum zynq_slcr_reg {
zynq_slcr_ocm_cfg,
zynq_slcr_device_id,
...
};
u32 zyn_slcr_read(enum zynq_slcr_reg id)
{
switch (id) {
case ...
}
S?ren