diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-12 03:21:57 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-12 03:21:57 +0400 |
| commit | 558f08856d91f3d44569dd43769063343b5e05c5 (patch) | |
| tree | ded9c0bc5fcfe690d8158ea4b3c53c9abc126742 | |
| parent | d70830aa7ffcc2c32777f78245ba07aa1c2081b1 (diff) | |
| parent | 933dacd0cfe5e82ad9235f99cfe20fc31aa6dfb5 (diff) | |
Merge branch 'tracking-ll-misc-fixes' into merge-linux-linaroll-20140212.0ll_20140212.0
| -rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index d0b0bde9850e..d935ea768c53 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -133,6 +133,12 @@ void gic_dist_enable(void) __raw_writel(0x1, gic_dist_base_addr + GIC_DIST_CTRL); } +void gic_dist_enable(void) +{ + if (gic_dist_base_addr) + writel_relaxed(0x1, gic_dist_base_addr + GIC_DIST_CTRL); +} + bool gic_dist_disabled(void) { return !(readl_relaxed(gic_dist_base_addr + GIC_DIST_CTRL) & 0x1); |