Skip to content

Commit

Permalink
ARM: EXYNOS: Move SYSREG definition into sys-reg specific file
Browse files Browse the repository at this point in the history
While making PMU implementation to be device tree based, there are
few register offsets related with SYSREG present in regs-pmu.h, so
let's make a new header file "regs-sys.h" to keep all such SYSREG
related register offsets and remove them from "regs-pmu.h"

Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Pankaj Dubey authored and Kukjin Kim committed Jul 14, 2014
1 parent 5e299f6 commit 318fd20
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 3 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-exynos/exynos.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "common.h"
#include "mfc.h"
#include "regs-pmu.h"
#include "regs-sys.h"

static struct map_desc exynos4_iodesc[] __initdata = {
{
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-exynos/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

#include "common.h"
#include "regs-pmu.h"
#include "regs-sys.h"

/**
* struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/mach-exynos/regs-pmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <mach/map.h>

#define S5P_PMUREG(x) (S5P_VA_PMU + (x))
#define S5P_SYSREG(x) (S3C_VA_SYS + (x))

#define S5P_CENTRAL_SEQ_CONFIGURATION S5P_PMUREG(0x0200)

Expand Down Expand Up @@ -188,8 +187,6 @@

/* For EXYNOS5 */

#define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234)

#define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408)
#define EXYNOS5_MASK_WDTRESET_REQUEST S5P_PMUREG(0x040C)

Expand Down
22 changes: 22 additions & 0 deletions arch/arm/mach-exynos/regs-sys.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* EXYNOS - system register definition
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#ifndef __ASM_ARCH_REGS_SYS_H
#define __ASM_ARCH_REGS_SYS_H __FILE__

#include <mach/map.h>

#define S5P_SYSREG(x) (S3C_VA_SYS + (x))

/* For EXYNOS5 */
#define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234)

#endif /* __ASM_ARCH_REGS_SYS_H */

0 comments on commit 318fd20

Please sign in to comment.