summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Trumtrar <s.trumtrar@pengutronix.de>2013-06-29 09:20:17 +0200
committerMichal Simek <michal.simek@xilinx.com>2014-02-10 11:21:19 +0100
commit7b274efef794fe566ee42f3091276d0598952558 (patch)
tree80ae881d2c64b7319ddc4f122d10e9f63335e235
parentARM: zynq: Map I/O memory on clkc init (diff)
downloadlinux-7b274efef794fe566ee42f3091276d0598952558.tar.xz
linux-7b274efef794fe566ee42f3091276d0598952558.zip
ARM: zynq: Make zynq_slcr_base static
The pointer doesn't need to be passed around any more. Make it static. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--arch/arm/mach-zynq/common.h1
-rw-r--r--arch/arm/mach-zynq/slcr.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h
index 1548b85b56ad..b097844d3175 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@ -34,7 +34,6 @@ extern int zynq_cpun_start(u32 address, int cpu);
extern struct smp_operations zynq_smp_ops __initdata;
#endif
-extern void __iomem *zynq_slcr_base;
extern void __iomem *zynq_scu_base;
/* Hotplug */
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index db5cb313bb13..34c1c2a20d8b 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -31,7 +31,7 @@
#define SLCR_A9_CPU_CLKSTOP 0x10
#define SLCR_A9_CPU_RST 0x1
-void __iomem *zynq_slcr_base;
+static void __iomem *zynq_slcr_base;
static struct regmap *zynq_slcr_regmap;
/**