lynxpoint: PMIR register rename

The register that controls global reset is named the Power
Mangement Initialization Regiser (PMIR). Update the defines
to reflect the documentation.

Additionally, there is no core well reset control according to the
EDS. There is, however, a CF9 lock field to lock this register down.

Change-Id: I773c33bec63a06cdb869eb9f94553d476e492798
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/2619
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Aaron Durbin 2012-11-02 09:10:30 -05:00 committed by Ronald G. Minnich
parent 9aa031e471
commit b9ea8b3fb0
2 changed files with 7 additions and 10 deletions

View File

@ -112,18 +112,15 @@ int intel_early_me_uma_size(void)
static inline void set_global_reset(int enable) static inline void set_global_reset(int enable)
{ {
u32 etr3 = pci_read_config32(PCH_LPC_DEV, ETR3); u32 pmir = pci_read_config32(PCH_LPC_DEV, PMIR);
/* Clear CF9 Without Resume Well Reset Enable */
etr3 &= ~ETR3_CWORWRE;
/* CF9GR indicates a Global Reset */ /* CF9GR indicates a Global Reset */
if (enable) if (enable)
etr3 |= ETR3_CF9GR; pmir |= PMIR_CF9GR;
else else
etr3 &= ~ETR3_CF9GR; pmir &= ~PMIR_CF9GR;
pci_write_config32(PCH_LPC_DEV, ETR3, etr3); pci_write_config32(PCH_LPC_DEV, PMIR, pmir);
} }
int intel_early_me_init_done(u8 status) int intel_early_me_init_done(u8 status)

View File

@ -129,9 +129,9 @@ int early_spi_read(u32 offset, u32 size, u8 *buffer);
#define GEN_PMCON_1 0xa0 #define GEN_PMCON_1 0xa0
#define GEN_PMCON_2 0xa2 #define GEN_PMCON_2 0xa2
#define GEN_PMCON_3 0xa4 #define GEN_PMCON_3 0xa4
#define ETR3 0xac #define PMIR 0xac
#define ETR3_CWORWRE (1 << 18) #define PMIR_CF9LOCK (1 << 31)
#define ETR3_CF9GR (1 << 20) #define PMIR_CF9GR (1 << 20)
/* GEN_PMCON_3 bits */ /* GEN_PMCON_3 bits */
#define RTC_BATTERY_DEAD (1 << 2) #define RTC_BATTERY_DEAD (1 << 2)