diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-12 08:32:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-12 13:59:26 -0400 |
| commit | 5ebd27d860ec0c6e36f1b0f973653fe66a7360be (patch) | |
| tree | 71ba0f39cc03c131889ce51803d85cf4c49b2941 /arch/x86/cpu/ivybridge/lpc.c | |
| parent | f812574e61e9bfe37e76e620606fd1a65cc9cdc2 (diff) | |
| parent | 00bcaedd5c4063c677d16af264bbcb991fb9675c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/ivybridge/lpc.c')
| -rw-r--r-- | arch/x86/cpu/ivybridge/lpc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c index 4e0be2a88b..4af89b3a7c 100644 --- a/arch/x86/cpu/ivybridge/lpc.c +++ b/arch/x86/cpu/ivybridge/lpc.c @@ -213,10 +213,10 @@ static int pch_power_options(struct udevice *pch) dm_pci_read_config16(pch, 0x40, &pmbase); pmbase &= 0xfffe; - writel(pmbase + GPE0_EN, fdtdec_get_int(blob, node, - "intel,gpe0-enable", 0)); - writew(pmbase + ALT_GP_SMI_EN, fdtdec_get_int(blob, node, - "intel,alt-gp-smi-enable", 0)); + writel(fdtdec_get_int(blob, node, "intel,gpe0-enable", 0), + (ulong)pmbase + GPE0_EN); + writew(fdtdec_get_int(blob, node, "intel,alt-gp-smi-enable", 0), + (ulong)pmbase + ALT_GP_SMI_EN); /* Set up power management block and determine sleep mode */ reg32 = inl(pmbase + 0x04); /* PM1_CNT */ @@ -355,10 +355,10 @@ static void enable_clock_gating(struct udevice *pch) reg16 |= (1 << 2) | (1 << 11); dm_pci_write_config16(pch, GEN_PMCON_1, reg16); - pch_iobp_update(pch, 0xEB007F07, ~0UL, (1 << 31)); - pch_iobp_update(pch, 0xEB004000, ~0UL, (1 << 7)); - pch_iobp_update(pch, 0xEC007F07, ~0UL, (1 << 31)); - pch_iobp_update(pch, 0xEC004000, ~0UL, (1 << 7)); + pch_iobp_update(pch, 0xeb007f07, ~0U, 1 << 31); + pch_iobp_update(pch, 0xeb004000, ~0U, 1 << 7); + pch_iobp_update(pch, 0xec007f07, ~0U, 1 << 31); + pch_iobp_update(pch, 0xec004000, ~0U, 1 << 7); reg32 = readl(RCB_REG(CG)); reg32 |= (1 << 31); |