diff options
Diffstat (limited to 'src/soc/intel/apollolake')
| -rw-r--r-- | src/soc/intel/apollolake/bootblock/bootblock.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/gpio.c | 7 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/graphics.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/northbridge.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/pmutil.c | 8 |
5 files changed, 13 insertions, 12 deletions
diff --git a/src/soc/intel/apollolake/bootblock/bootblock.c b/src/soc/intel/apollolake/bootblock/bootblock.c index 1f5055d6a3..f519463071 100644 --- a/src/soc/intel/apollolake/bootblock/bootblock.c +++ b/src/soc/intel/apollolake/bootblock/bootblock.c @@ -89,7 +89,7 @@ static void cache_bios_region(void) mtrr = get_free_var_mtrr(); - if (mtrr==-1) + if (mtrr == -1) return; /* Only the IFD BIOS region is memory mapped (at top of 4G) */ diff --git a/src/soc/intel/apollolake/gpio.c b/src/soc/intel/apollolake/gpio.c index c373441d96..95e229426b 100644 --- a/src/soc/intel/apollolake/gpio.c +++ b/src/soc/intel/apollolake/gpio.c @@ -52,7 +52,8 @@ static const struct pad_community { .port = GPIO_N, .first_pad = N_OFFSET, .num_gpi_regs = NUM_N_GPI_REGS, - .gpi_offset = NUM_NW_GPI_REGS+ NUM_W_GPI_REGS + NUM_SW_GPI_REGS, + .gpi_offset = NUM_NW_GPI_REGS + NUM_W_GPI_REGS + + NUM_SW_GPI_REGS, .grp_name = "GPIO_GPE_N", } }; @@ -144,7 +145,7 @@ static void gpi_enable_smi(const struct pad_config *cfg, uint16_t port, int pin) en_reg = GPI_SMI_EN_OFFSET(group); value = iosf_read(port, en_reg ); value |= 1 << (pin % GPIO_MAX_NUM_PER_GROUP); - iosf_write(port, en_reg , value); + iosf_write(port, en_reg, value); } void gpio_configure_pad(const struct pad_config *cfg) @@ -291,7 +292,7 @@ static void print_gpi_status(const struct gpi_status *sts) abs_bit = bit_set; abs_bit += group * GPIO_MAX_NUM_PER_GROUP; - printk(BIOS_DEBUG, "%s %d\n",comm->grp_name, + printk(BIOS_DEBUG, "%s %d\n", comm->grp_name, abs_bit); } } diff --git a/src/soc/intel/apollolake/graphics.c b/src/soc/intel/apollolake/graphics.c index 9b4dbc97da..18348e367e 100644 --- a/src/soc/intel/apollolake/graphics.c +++ b/src/soc/intel/apollolake/graphics.c @@ -97,7 +97,7 @@ static const unsigned short pci_device_ids[] = { }; static const struct pci_driver integrated_graphics_driver __pci_driver = { - .ops = &igd_ops, - .vendor = PCI_VENDOR_ID_INTEL, - .devices= pci_device_ids, + .ops = &igd_ops, + .vendor = PCI_VENDOR_ID_INTEL, + .devices = pci_device_ids, }; diff --git a/src/soc/intel/apollolake/northbridge.c b/src/soc/intel/apollolake/northbridge.c index cc097ba85f..db595f5614 100644 --- a/src/soc/intel/apollolake/northbridge.c +++ b/src/soc/intel/apollolake/northbridge.c @@ -76,7 +76,7 @@ static int mc_add_imr_resources(device_t dev, int index) mchbar = (void *)(ALIGN_DOWN(get_bar(dev, MCHBAR), 32*KiB)); - for (i = 0; i < MCH_NUM_IMRS; i ++) { + for (i = 0; i < MCH_NUM_IMRS; i++) { imr_offset = i * MCH_IMR_PITCH; base = read32(mchbar + imr_offset + MCHBAR_IMR0BASE); mask = read32(mchbar + imr_offset + MCHBAR_IMR0MASK); diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c index 12a1051246..f2bb0eef95 100644 --- a/src/soc/intel/apollolake/pmutil.c +++ b/src/soc/intel/apollolake/pmutil.c @@ -72,8 +72,8 @@ static uint32_t print_smi_status(uint32_t smi_sts) [APM_SMI_STS] = "APM", [SWSMI_TMR_SMI_STS] = "SWSMI_TMR", [FAKE_PM1_SMI_STS] = "PM1", - [GPIO_SMI_STS]= "GPIO_SMI", - [GPIO_UNLOCK_SMI_STS]= "GPIO_UNLOCK_SSMI", + [GPIO_SMI_STS] = "GPIO_SMI", + [GPIO_UNLOCK_SMI_STS] = "GPIO_UNLOCK_SSMI", [MC_SMI_STS] = "MCSMI", [TCO_SMI_STS] = "TCO", [PERIODIC_SMI_STS] = "PERIODIC", @@ -407,7 +407,7 @@ int fill_power_state(struct chipset_power_state *ps) ps->pm1_cnt = inl(ACPI_PMIO_BASE + PM1_CNT); ps->tco_sts = inl(ACPI_PMIO_BASE + TCO_STS); ps->prsts = read32((void *)(pmc_bar0 + PRSTS)); - ps->gen_pmcon1 =read32((void *)(pmc_bar0 + GEN_PMCON1)); + ps->gen_pmcon1 = read32((void *)(pmc_bar0 + GEN_PMCON1)); ps->gen_pmcon2 = read32((void *)(pmc_bar0 + GEN_PMCON2)); ps->gen_pmcon3 = read32((void *)(pmc_bar0 + GEN_PMCON3)); @@ -422,7 +422,7 @@ int fill_power_state(struct chipset_power_state *ps) ps->gen_pmcon1, ps->gen_pmcon2, ps->gen_pmcon3); printk(BIOS_DEBUG, "smi_en: %08x smi_sts: %08x\n", inl(ACPI_PMIO_BASE + SMI_EN), inl(ACPI_PMIO_BASE + SMI_STS)); - for (i=0; i < GPE0_REG_MAX; i++) { + for (i = 0; i < GPE0_REG_MAX; i++) { ps->gpe0_sts[i] = inl(ACPI_PMIO_BASE + GPE0_STS(i)); ps->gpe0_en[i] = inl(ACPI_PMIO_BASE + GPE0_EN(i)); printk(BIOS_DEBUG, "gpe0_sts[%d]: %08x gpe0_en[%d]: %08x\n", |