aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Petrov <andrey.petrov@intel.com>2016-02-09 17:02:57 -0800
committerAaron Durbin <adurbin@chromium.org>2016-02-11 21:10:47 +0100
commit57799dcdd1d80e8f1c8f5cd602796c34522bbb15 (patch)
treeb5ad66de4f5f90418b7fecca55e085a4ac523791
parent86f6a135a18d8de1c0a02f3c9b8ea2c505056312 (diff)
soc/apollolake: Add minimal GPIO driver
This adds the minimal functionality needed to configure SoC pads. Change-Id: I2e2268eee2b8c822b42a48a95604b0fab86c9833 Signed-off-by: Andrey Petrov <andrey.petrov@intel.com> Reviewed-on: https://review.coreboot.org/13676 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins)
-rw-r--r--src/soc/intel/apollolake/Makefile.inc3
-rw-r--r--src/soc/intel/apollolake/gpio.c60
-rw-r--r--src/soc/intel/apollolake/include/soc/gpio.h88
-rw-r--r--src/soc/intel/apollolake/include/soc/gpio_defs.h332
-rw-r--r--src/soc/intel/apollolake/include/soc/iosf.h30
5 files changed, 513 insertions, 0 deletions
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index b429b29ef8..e58be867fc 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -9,11 +9,14 @@ subdirs-y += ../../../cpu/x86/tsc
bootblock-y += bootblock/bootblock.c
bootblock-y += bootblock/cache_as_ram.S
+bootblock-y += gpio.c
bootblock-y += placeholders.c
romstage-y += placeholders.c
+romstage-y += gpio.c
smm-y += placeholders.c
ramstage-y += placeholders.c
+ramstage-y += gpio.c
CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
diff --git a/src/soc/intel/apollolake/gpio.c b/src/soc/intel/apollolake/gpio.c
new file mode 100644
index 0000000000..33500da558
--- /dev/null
+++ b/src/soc/intel/apollolake/gpio.c
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015 Intel Corp.
+ * (Written by Alexandru Gagniuc <alexandrux.gagniuc@intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <soc/gpio.h>
+#include <soc/iosf.h>
+
+/* This list must be in order, from highest pad numbers, to lowest pad numbers*/
+static const struct pad_community {
+ uint16_t first_pad;
+ uint8_t port;
+} gpio_communities[] = {
+ {
+ .port = GPIO_SOUTHWEST,
+ .first_pad = SW_OFFSET,
+ }, {
+ .port = GPIO_WEST,
+ .first_pad = W_OFFSET,
+ }, {
+ .port = GPIO_NORTHWEST,
+ .first_pad = NW_OFFSET,
+ }, {
+ .port = GPIO_NORTH,
+ .first_pad = 0,
+ }
+};
+
+static const struct pad_community *gpio_get_community(uint16_t pad)
+{
+ const struct pad_community *map = gpio_communities;
+
+ while (map->first_pad > pad)
+ map++;
+
+ return map;
+}
+
+void gpio_configure_pad(const struct pad_config *cfg)
+{
+ const struct pad_community *comm = gpio_get_community(cfg->pad);
+ uint16_t config_offset = PAD_CFG_OFFSET(cfg->pad - comm->first_pad);
+ iosf_write(comm->port, config_offset, cfg->config0);
+ iosf_write(comm->port, config_offset + sizeof(uint32_t), cfg->config1);
+}
+
+void gpio_configure_pads(const struct pad_config *cfg, size_t num_pads)
+{
+ uint32_t i;
+
+ for (i = 0; i < num_pads; i++)
+ gpio_configure_pad(cfg + i);
+}
diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h
new file mode 100644
index 0000000000..8f78de2164
--- /dev/null
+++ b/src/soc/intel/apollolake/include/soc/gpio.h
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015 Intel Corp.
+ * (Written by Alexandru Gagniuc <alexandrux.gagniuc@intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _SOC_APOLLOLAKE_GPIO_H_
+#define _SOC_APOLLOLAKE_GPIO_H_
+
+#include <types.h>
+#include <soc/gpio_defs.h>
+
+#define PAD_FUNC(value) PAD_CFG0_MODE_##value
+#define PAD_RESET(value) PAD_CFG0_RESET_##value
+#define PAD_PULL(value) PAD_CFG1_PULL_##value
+#define PAD_IRQ_CFG(route, trig, inv) \
+ (PAD_CFG0_ROUTE_##route | \
+ PAD_CFG0_TRIG_##trig | \
+ (PAD_CFG0_RX_POL_##inv))
+
+#define _PAD_CFG_STRUCT(__pad, __config0, __config1) \
+ { \
+ .pad = __pad, \
+ .config0 = __config0, \
+ .config1 = __config1, \
+ }
+
+/* Native function configuration */
+#define PAD_CFG_NF(pad, pull, rst, func) \
+ _PAD_CFG_STRUCT(pad, PAD_RESET(rst) | PAD_FUNC(func), PAD_PULL(pull))
+
+/* General purpose output, no pullup/down. */
+#define PAD_CFG_GPO(pad, val, rst) \
+ _PAD_CFG_STRUCT(pad, \
+ PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_CFG0_RX_DISABLE | !!val, \
+ PAD_PULL(NONE))
+
+/* General purpose input */
+#define PAD_CFG_GPI(pad, pull, rst) \
+ _PAD_CFG_STRUCT(pad, \
+ PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_CFG0_TX_DISABLE, \
+ PAD_PULL(pull))
+
+/* General purpose input, routed to APIC */
+#define PAD_CFG_GPI_APIC(pad, pull, rst) \
+ _PAD_CFG_STRUCT(pad, \
+ PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_CFG0_TX_DISABLE | \
+ PAD_IRQ_CFG(IOAPIC, LEVEL, NONE), PAD_PULL(pull))
+
+/* General purpose input, routed to SMI */
+#define PAD_CFG_GPI_SMI(pad, pull, rst, inv) \
+ _PAD_CFG_STRUCT(pad, \
+ PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_CFG0_TX_DISABLE | \
+ PAD_IRQ_CFG(SMI, LEVEL, inv), PAD_PULL(pull))
+
+/* General purpose input, routed to SCI */
+#define PAD_CFG_GPI_SCI(pad, pull, rst, inv) \
+ _PAD_CFG_STRUCT(pad, \
+ PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_CFG0_TX_DISABLE | \
+ PAD_IRQ_CFG(SCI, LEVEL, inv), PAD_PULL(pull))
+
+/* General purpose input, routed to NMI */
+#define PAD_CFG_GPI_NMI(pad, pull, rst, inv) \
+ _PAD_CFG_STRUCT(pad, \
+ PAD_FUNC(GPIO) | PAD_RESET(rst) | PAD_CFG0_TX_DISABLE | \
+ PAD_IRQ_CFG(NMI, LEVEL, inv), PAD_PULL(pull))
+
+struct pad_config {
+ uint32_t config0;
+ uint16_t config1;
+ uint16_t pad;
+};
+
+/*
+ * Configuration for raw pads. Some pads are designated as only special function
+ * pins, and don't have an associated GPIO number, so we need to expose the raw
+ * pad configuration functionality.
+ */
+void gpio_configure_pad(const struct pad_config *cfg);
+void gpio_configure_pads(const struct pad_config *cfg, size_t num_pads);
+
+#endif /* _SOC_APOLLOLAKE_GPIO_H_ */
diff --git a/src/soc/intel/apollolake/include/soc/gpio_defs.h b/src/soc/intel/apollolake/include/soc/gpio_defs.h
new file mode 100644
index 0000000000..b6aa7ef851
--- /dev/null
+++ b/src/soc/intel/apollolake/include/soc/gpio_defs.h
@@ -0,0 +1,332 @@
+/*
+ * Definitions for the GPIO subsystem on Apollolake
+ *
+ * Placed in a separate file since some of these definitions can be used from
+ * assembly code
+ *
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015 Intel Corp.
+ * (Written by Alexandru Gagniuc <alexandrux.gagniuc@intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _SOC_APOLLOLAKE_GPIO_DEFS_H_
+#define _SOC_APOLLOLAKE_GPIO_DEFS_H_
+
+#define PAD_CFG0_TX_DISABLE (1 << 8)
+#define PAD_CFG0_RX_DISABLE (1 << 9)
+#define PAD_CFG0_MODE_MASK (7 << 10)
+#define PAD_CFG0_MODE_GPIO (0 << 10)
+#define PAD_CFG0_MODE_FUNC(x) ((x) << 10)
+#define PAD_CFG0_MODE_NF1 (1 << 10)
+#define PAD_CFG0_MODE_NF2 (2 << 10)
+#define PAD_CFG0_MODE_NF3 (3 << 10)
+#define PAD_CFG0_MODE_NF4 (4 << 10)
+#define PAD_CFG0_MODE_NF5 (5 << 10)
+#define PAD_CFG0_ROUTE_NMI (1 << 17)
+#define PAD_CFG0_ROUTE_SMI (1 << 18)
+#define PAD_CFG0_ROUTE_SCI (1 << 19)
+#define PAD_CFG0_ROUTE_IOAPIC (1 << 20)
+#define PAD_CFG0_RX_POL_INVERT (1 << 23)
+#define PAD_CFG0_RX_POL_NONE (0 << 23)
+
+#define PAD_CFG0_TRIG_MASK (3 << 25)
+#define PAD_CFG0_TRIG_LEVEL (0 << 25)
+#define PAD_CFG0_TRIG_EDGE_SINGLE (1 << 25) /* controlled by RX_INVERT*/
+#define PAD_CFG0_TRIG_OFF (2 << 25)
+#define PAD_CFG0_TRIG_EDGE_BOTH (3 << 25)
+#define PAD_CFG0_RESET_MASK (3 << 30)
+#define PAD_CFG0_RESET_PWROK (0 << 30)
+#define PAD_CFG0_RESET_DEEP (1 << 30)
+#define PAD_CFG0_RESET_PLTRST (2 << 30)
+#define PAD_CFG0_RESET_RSMRST (3 << 30)
+
+#define PAD_CFG1_PULL_MASK (0xf << 10)
+#define PAD_CFG1_PULL_NONE (0x0 << 10)
+#define PAD_CFG1_PULL_DN_5K (0x2 << 10)
+#define PAD_CFG1_PULL_DN_20K (0x4 << 10)
+#define PAD_CFG1_PULL_UP_1K (0x9 << 10)
+#define PAD_CFG1_PULL_UP_5K (0xa << 10)
+#define PAD_CFG1_PULL_UP_2K (0xb << 10)
+#define PAD_CFG1_PULL_UP_20K (0xc << 10)
+#define PAD_CFG1_PULL_UP_667 (0xd << 10)
+#define PAD_CFG1_PULL_NATIVE (0xf << 10)
+
+#define PAD_CFG_BASE 0x500
+#define PAD_CFG_OFFSET(pad) (PAD_CFG_BASE + ((pad) * 8))
+
+/* IOSF port numbers for GPIO comminuties*/
+#define GPIO_SOUTHWEST 0xc0
+#define GPIO_SOUTH 0xc2
+#define GPIO_NORTHWEST 0xc4
+#define GPIO_NORTH 0xc5
+#define GPIO_WEST 0xc7
+
+/* North community pads */
+#define GPIO_0 0
+#define GPIO_1 1
+#define GPIO_2 2
+#define GPIO_3 3
+#define GPIO_4 4
+#define GPIO_5 5
+#define GPIO_6 6
+#define GPIO_7 7
+#define GPIO_8 8
+#define GPIO_9 9
+#define GPIO_10 10
+#define GPIO_11 11
+#define GPIO_12 12
+#define GPIO_13 13
+#define GPIO_14 14
+#define GPIO_15 15
+#define GPIO_16 16
+#define GPIO_17 17
+#define GPIO_18 18
+#define GPIO_19 19
+#define GPIO_20 20
+#define GPIO_21 21
+#define GPIO_22 22
+#define GPIO_23 23
+#define GPIO_24 24
+#define GPIO_25 25
+#define GPIO_26 26
+#define GPIO_27 27
+#define GPIO_28 28
+#define GPIO_29 29
+#define GPIO_30 30
+#define GPIO_31 31
+#define GPIO_32 32
+#define GPIO_33 33
+#define GPIO_34 34
+#define GPIO_35 35
+#define GPIO_36 36
+#define GPIO_37 37
+#define GPIO_38 38
+#define GPIO_39 39
+#define GPIO_40 40
+#define GPIO_41 41
+#define GPIO_42 42
+#define GPIO_43 43
+#define GPIO_44 44
+#define GPIO_45 45
+#define GPIO_46 46
+#define GPIO_47 47
+#define GPIO_48 48
+#define GPIO_49 49
+#define GPIO_62 50
+#define GPIO_63 51
+#define GPIO_64 52
+#define GPIO_65 53
+#define GPIO_66 54
+#define GPIO_67 55
+#define GPIO_68 56
+#define GPIO_69 57
+#define GPIO_70 58
+#define GPIO_71 59
+#define GPIO_72 60
+#define GPIO_73 61
+#define TCK 62
+#define TRST_B 63
+#define TMS 64
+#define TDI 65
+#define CX_PMODE 66
+#define CX_PREQ_B 67
+#define JTAGX 68
+#define CX_PRDY_B 69
+#define TDO 70
+#define CNV_BRI_DT 71
+#define CNV_BRI_RSP 72
+#define CNV_RGI_DT 73
+#define CNV_RGI_RSP 74
+#define SVID0_ALERT_B 75
+#define SVID0_DATA 76
+#define SVID0_CLK 77
+
+/* North community pads */
+#define NW_OFFSET 78
+#define GPIO_187 NW_OFFSET + 0
+#define GPIO_188 NW_OFFSET + 1
+#define GPIO_189 NW_OFFSET + 2
+#define GPIO_190 NW_OFFSET + 3
+#define GPIO_191 NW_OFFSET + 4
+#define GPIO_192 NW_OFFSET + 5
+#define GPIO_193 NW_OFFSET + 6
+#define GPIO_194 NW_OFFSET + 7
+#define GPIO_195 NW_OFFSET + 8
+#define GPIO_196 NW_OFFSET + 9
+#define GPIO_197 NW_OFFSET + 10
+#define GPIO_198 NW_OFFSET + 11
+#define GPIO_199 NW_OFFSET + 12
+#define GPIO_200 NW_OFFSET + 13
+#define GPIO_201 NW_OFFSET + 14
+#define GPIO_202 NW_OFFSET + 15
+#define GPIO_203 NW_OFFSET + 16
+#define GPIO_204 NW_OFFSET + 17
+#define PMC_SPI_FS0 NW_OFFSET + 18
+#define PMC_SPI_FS1 NW_OFFSET + 19
+#define PMC_SPI_FS2 NW_OFFSET + 20
+#define PMC_SPI_RXD NW_OFFSET + 21
+#define PMC_SPI_TXD NW_OFFSET + 22
+#define PMC_SPI_CLK NW_OFFSET + 23
+#define PMIC_PWRGOOD NW_OFFSET + 24
+#define PMIC_RESET_B NW_OFFSET + 25
+#define GPIO_213 NW_OFFSET + 26
+#define GPIO_214 NW_OFFSET + 27
+#define GPIO_215 NW_OFFSET + 28
+#define PMIC_THERMTRIP_B NW_OFFSET + 29
+#define PMIC_STDBY NW_OFFSET + 30
+#define PROCHOT_B NW_OFFSET + 31
+#define PMIC_I2C_SCL NW_OFFSET + 32
+#define PMIC_I2C_SDA NW_OFFSET + 33
+#define GPIO_74 NW_OFFSET + 34
+#define GPIO_75 NW_OFFSET + 35
+#define GPIO_76 NW_OFFSET + 36
+#define GPIO_77 NW_OFFSET + 37
+#define GPIO_78 NW_OFFSET + 38
+#define GPIO_79 NW_OFFSET + 39
+#define GPIO_80 NW_OFFSET + 40
+#define GPIO_81 NW_OFFSET + 41
+#define GPIO_82 NW_OFFSET + 42
+#define GPIO_83 NW_OFFSET + 43
+#define GPIO_84 NW_OFFSET + 44
+#define GPIO_85 NW_OFFSET + 45
+#define GPIO_86 NW_OFFSET + 46
+#define GPIO_87 NW_OFFSET + 47
+#define GPIO_88 NW_OFFSET + 48
+#define GPIO_89 NW_OFFSET + 49
+#define GPIO_90 NW_OFFSET + 50
+#define GPIO_91 NW_OFFSET + 51
+#define GPIO_92 NW_OFFSET + 52
+#define GPIO_97 NW_OFFSET + 53
+#define GPIO_98 NW_OFFSET + 54
+#define GPIO_99 NW_OFFSET + 55
+#define GPIO_100 NW_OFFSET + 56
+#define GPIO_101 NW_OFFSET + 57
+#define GPIO_102 NW_OFFSET + 58
+#define GPIO_103 NW_OFFSET + 59
+#define FST_SPI_CLK_FB NW_OFFSET + 60
+#define GPIO_104 NW_OFFSET + 61
+#define GPIO_105 NW_OFFSET + 62
+#define GPIO_106 NW_OFFSET + 63
+#define GPIO_109 NW_OFFSET + 64
+#define GPIO_110 NW_OFFSET + 65
+#define GPIO_111 NW_OFFSET + 66
+#define GPIO_112 NW_OFFSET + 67
+#define GPIO_113 NW_OFFSET + 68
+#define GPIO_116 NW_OFFSET + 69
+#define GPIO_117 NW_OFFSET + 70
+#define GPIO_118 NW_OFFSET + 71
+#define GPIO_119 NW_OFFSET + 72
+#define GPIO_120 NW_OFFSET + 73
+#define GPIO_121 NW_OFFSET + 74
+#define GPIO_122 NW_OFFSET + 75
+#define GPIO_123 NW_OFFSET + 76
+
+/* West community pads */
+#define W_OFFSET (NW_OFFSET + 77)
+#define GPIO_124 W_OFFSET + 0
+#define GPIO_125 W_OFFSET + 1
+#define GPIO_126 W_OFFSET + 2
+#define GPIO_127 W_OFFSET + 3
+#define GPIO_128 W_OFFSET + 4
+#define GPIO_129 W_OFFSET + 5
+#define GPIO_130 W_OFFSET + 6
+#define GPIO_131 W_OFFSET + 7
+#define GPIO_132 W_OFFSET + 8
+#define GPIO_133 W_OFFSET + 9
+#define GPIO_134 W_OFFSET + 10
+#define GPIO_135 W_OFFSET + 11
+#define GPIO_136 W_OFFSET + 12
+#define GPIO_137 W_OFFSET + 13
+#define GPIO_138 W_OFFSET + 14
+#define GPIO_139 W_OFFSET + 15
+#define GPIO_146 W_OFFSET + 16
+#define GPIO_147 W_OFFSET + 17
+#define GPIO_148 W_OFFSET + 18
+#define GPIO_149 W_OFFSET + 19
+#define GPIO_150 W_OFFSET + 20
+#define GPIO_151 W_OFFSET + 21
+#define GPIO_152 W_OFFSET + 22
+#define GPIO_153 W_OFFSET + 23
+#define GPIO_154 W_OFFSET + 24
+#define GPIO_155 W_OFFSET + 25
+#define GPIO_209 W_OFFSET + 26
+#define GPIO_210 W_OFFSET + 27
+#define GPIO_211 W_OFFSET + 28
+#define GPIO_212 W_OFFSET + 29
+#define OSC_CLK_OUT_0 W_OFFSET + 30
+#define OSC_CLK_OUT_1 W_OFFSET + 31
+#define OSC_CLK_OUT_2 W_OFFSET + 32
+#define OSC_CLK_OUT_3 W_OFFSET + 33
+#define OSC_CLK_OUT_4 W_OFFSET + 34
+#define PMU_AC_PRESENT W_OFFSET + 35
+#define PMU_BATLOW_B W_OFFSET + 36
+#define PMU_PLTRST_B W_OFFSET + 37
+#define PMU_PWRBTN_B W_OFFSET + 38
+#define PMU_RESETBUTTON_B W_OFFSET + 39
+#define PMU_SLP_S0_B W_OFFSET + 40
+#define PMU_SLP_S3_B W_OFFSET + 41
+#define PMU_SLP_S4_B W_OFFSET + 42
+#define PMU_SUSCLK W_OFFSET + 43
+#define PMU_WAKE_B W_OFFSET + 44
+#define SUS_STAT_B W_OFFSET + 45
+#define SUSPWRDNACK W_OFFSET + 46
+
+/* Southwest community pads */
+#define SW_OFFSET (W_OFFSET + 47)
+#define GPIO_205 SW_OFFSET + 0
+#define GPIO_206 SW_OFFSET + 1
+#define GPIO_207 SW_OFFSET + 2
+#define GPIO_208 SW_OFFSET + 3
+#define GPIO_156 SW_OFFSET + 4
+#define GPIO_157 SW_OFFSET + 5
+#define GPIO_158 SW_OFFSET + 6
+#define GPIO_159 SW_OFFSET + 7
+#define GPIO_160 SW_OFFSET + 8
+#define GPIO_161 SW_OFFSET + 9
+#define GPIO_162 SW_OFFSET + 10
+#define GPIO_163 SW_OFFSET + 11
+#define GPIO_164 SW_OFFSET + 12
+#define GPIO_165 SW_OFFSET + 13
+#define GPIO_166 SW_OFFSET + 14
+#define GPIO_167 SW_OFFSET + 15
+#define GPIO_168 SW_OFFSET + 16
+#define GPIO_169 SW_OFFSET + 17
+#define GPIO_170 SW_OFFSET + 18
+#define GPIO_171 SW_OFFSET + 19
+#define GPIO_172 SW_OFFSET + 20
+#define GPIO_179 SW_OFFSET + 21
+#define GPIO_173 SW_OFFSET + 22
+#define GPIO_174 SW_OFFSET + 23
+#define GPIO_175 SW_OFFSET + 24
+#define GPIO_176 SW_OFFSET + 25
+#define GPIO_177 SW_OFFSET + 26
+#define GPIO_178 SW_OFFSET + 27
+#define GPIO_186 SW_OFFSET + 28
+#define GPIO_182 SW_OFFSET + 29
+#define GPIO_183 SW_OFFSET + 30
+#define SMB_ALERTB SW_OFFSET + 31
+#define SMB_CLK SW_OFFSET + 32
+#define SMB_DATA SW_OFFSET + 33
+#define LPC_ILB_SERIRQ SW_OFFSET + 34
+#define LPC_CLKOUT0 SW_OFFSET + 35
+#define LPC_CLKOUT1 SW_OFFSET + 36
+#define LPC_AD0 SW_OFFSET + 37
+#define LPC_AD1 SW_OFFSET + 38
+#define LPC_AD2 SW_OFFSET + 39
+#define LPC_AD3 SW_OFFSET + 40
+#define LPC_CLKRUNB SW_OFFSET + 41
+#define LPC_FRAMEB SW_OFFSET + 42
+
+/* Macros for translating a global pad offset to a local offset */
+#define PAD_N(pad) (pad)
+#define PAD_NW(pad) (pad - NW_OFFSET)
+#define PAD_W(pad) (pad - W_OFFSET)
+#define PAD_SW(pad) (pad - SW_OFFSET)
+
+#endif /* _SOC_APOLLOLAKE_GPIO_DEFS_H_ */
diff --git a/src/soc/intel/apollolake/include/soc/iosf.h b/src/soc/intel/apollolake/include/soc/iosf.h
new file mode 100644
index 0000000000..5299075ef3
--- /dev/null
+++ b/src/soc/intel/apollolake/include/soc/iosf.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015 Intel Corp.
+ * (Written by Alexandru Gagniuc <alexandrux.gagniuc@intel.com> for Intel Corp.)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _SOC_APOLLOLAKE_IOSF_H_
+#define _SOC_APOLLOLAKE_IOSF_H_
+
+#include <arch/io.h>
+
+inline static void iosf_write(uint16_t port, uint16_t reg, uint32_t val)
+{
+ uintptr_t base = CONFIG_IOSF_BASE_ADDRESS | (port << 16) | (reg & ~3);
+ write32((void *)base, val);
+}
+
+inline static uint32_t iosf_read(uint16_t port, uint16_t reg)
+{
+ uintptr_t base = CONFIG_IOSF_BASE_ADDRESS | (port << 16) | (reg & ~3);
+ return read32((void *)base);
+}
+
+#endif /* _SOC_APOLLOLAKE_IOSF_H_ */