diff options
| author | Olof Johansson | 2013-02-05 22:19:03 +0100 |
|---|---|---|
| committer | Olof Johansson | 2013-02-05 22:19:03 +0100 |
| commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
| tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/mach-davinci/include/mach/psc.h | |
| parent | ARM: nomadik: fix OF compilation regression (diff) | |
| parent | ARM: tegra: remove empty tegra_smp_init_cpus() (diff) | |
| download | kernel-qcow2-linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.gz kernel-qcow2-linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.xz kernel-qcow2-linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.zip | |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/psc.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/psc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/include/mach/psc.h index 40a0027838e8..0a22710493fd 100644 --- a/arch/arm/mach-davinci/include/mach/psc.h +++ b/arch/arm/mach-davinci/include/mach/psc.h @@ -246,6 +246,7 @@ #define MDSTAT_STATE_MASK 0x3f #define PDSTAT_STATE_MASK 0x1f +#define MDCTL_LRST BIT(8) #define MDCTL_FORCE BIT(31) #define PDCTL_NEXT BIT(0) #define PDCTL_EPCGOOD BIT(8) @@ -253,6 +254,8 @@ #ifndef __ASSEMBLER__ extern int davinci_psc_is_clk_active(unsigned int ctlr, unsigned int id); +extern void davinci_psc_reset(unsigned int ctlr, unsigned int id, + bool reset); extern void davinci_psc_config(unsigned int domain, unsigned int ctlr, unsigned int id, bool enable, u32 flags); |