Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ccd458c1
Commit
ccd458c1
authored
Dec 31, 2012
by
Kukjin Kim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: EXYNOS: move mach/pmu.h file into common.h
Signed-off-by:
Kukjin Kim
<
kgene.kim@samsung.com
>
parent
c48bcc2d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
38 deletions
+26
-38
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/common.c
+0
-1
arch/arm/mach-exynos/common.h
arch/arm/mach-exynos/common.h
+20
-0
arch/arm/mach-exynos/cpuidle.c
arch/arm/mach-exynos/cpuidle.c
+2
-1
arch/arm/mach-exynos/include/mach/pmu.h
arch/arm/mach-exynos/include/mach/pmu.h
+0
-34
arch/arm/mach-exynos/pm.c
arch/arm/mach-exynos/pm.c
+2
-1
arch/arm/mach-exynos/pmu.c
arch/arm/mach-exynos/pmu.c
+2
-1
No files found.
arch/arm/mach-exynos/common.c
View file @
ccd458c1
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
#include <mach/regs-irq.h>
#include <mach/regs-irq.h>
#include <mach/regs-pmu.h>
#include <mach/regs-pmu.h>
#include <mach/regs-gpio.h>
#include <mach/regs-gpio.h>
#include <mach/pmu.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
#include <plat/clock.h>
#include <plat/clock.h>
...
...
arch/arm/mach-exynos/common.h
View file @
ccd458c1
...
@@ -64,4 +64,24 @@ extern struct smp_operations exynos_smp_ops;
...
@@ -64,4 +64,24 @@ extern struct smp_operations exynos_smp_ops;
extern
void
exynos_cpu_die
(
unsigned
int
cpu
);
extern
void
exynos_cpu_die
(
unsigned
int
cpu
);
/* PMU(Power Management Unit) support */
#define PMU_TABLE_END NULL
enum
sys_powerdown
{
SYS_AFTR
,
SYS_LPA
,
SYS_SLEEP
,
NUM_SYS_POWERDOWN
,
};
extern
unsigned
long
l2x0_regs_phys
;
struct
exynos_pmu_conf
{
void
__iomem
*
reg
;
unsigned
int
val
[
NUM_SYS_POWERDOWN
];
};
extern
void
exynos_sys_powerdown_conf
(
enum
sys_powerdown
mode
);
extern
void
s3c_cpu_resume
(
void
);
#endif
/* __ARCH_ARM_MACH_EXYNOS_COMMON_H */
#endif
/* __ARCH_ARM_MACH_EXYNOS_COMMON_H */
arch/arm/mach-exynos/cpuidle.c
View file @
ccd458c1
...
@@ -23,10 +23,11 @@
...
@@ -23,10 +23,11 @@
#include <asm/cpuidle.h>
#include <asm/cpuidle.h>
#include <mach/regs-clock.h>
#include <mach/regs-clock.h>
#include <mach/regs-pmu.h>
#include <mach/regs-pmu.h>
#include <mach/pmu.h>
#include <plat/cpu.h>
#include <plat/cpu.h>
#include "common.h"
#define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \
#define REG_DIRECTGO_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \
S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
(S5P_VA_SYSRAM + 0x24) : S5P_INFORM0))
(S5P_VA_SYSRAM + 0x24) : S5P_INFORM0))
...
...
arch/arm/mach-exynos/include/mach/pmu.h
deleted
100644 → 0
View file @
c48bcc2d
/* linux/arch/arm/mach-exynos4/include/mach/pmu.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* EXYNOS4210 - PMU(Power Management Unit) support
*
* 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_PMU_H
#define __ASM_ARCH_PMU_H __FILE__
#define PMU_TABLE_END NULL
enum
sys_powerdown
{
SYS_AFTR
,
SYS_LPA
,
SYS_SLEEP
,
NUM_SYS_POWERDOWN
,
};
extern
unsigned
long
l2x0_regs_phys
;
struct
exynos_pmu_conf
{
void
__iomem
*
reg
;
unsigned
int
val
[
NUM_SYS_POWERDOWN
];
};
extern
void
exynos_sys_powerdown_conf
(
enum
sys_powerdown
mode
);
extern
void
s3c_cpu_resume
(
void
);
#endif
/* __ASM_ARCH_PMU_H */
arch/arm/mach-exynos/pm.c
View file @
ccd458c1
...
@@ -34,7 +34,8 @@
...
@@ -34,7 +34,8 @@
#include <mach/regs-clock.h>
#include <mach/regs-clock.h>
#include <mach/regs-pmu.h>
#include <mach/regs-pmu.h>
#include <mach/pm-core.h>
#include <mach/pm-core.h>
#include <mach/pmu.h>
#include "common.h"
static
struct
sleep_save
exynos4_set_clksrc
[]
=
{
static
struct
sleep_save
exynos4_set_clksrc
[]
=
{
{
.
reg
=
EXYNOS4_CLKSRC_MASK_TOP
,
.
val
=
0x00000001
,
},
{
.
reg
=
EXYNOS4_CLKSRC_MASK_TOP
,
.
val
=
0x00000001
,
},
...
...
arch/arm/mach-exynos/pmu.c
View file @
ccd458c1
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
#include <linux/bug.h>
#include <linux/bug.h>
#include <mach/regs-clock.h>
#include <mach/regs-clock.h>
#include <mach/pmu.h>
#include "common.h"
static
struct
exynos_pmu_conf
*
exynos_pmu_config
;
static
struct
exynos_pmu_conf
*
exynos_pmu_config
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment