[coreboot-gerrit] New patch to review for coreboot: soc/intel/apollolake:iosstate macros for GPIO

[Venkateswarlu V Vinjamuri (venkateswarlu.v.vinjamuri@intel.com)]

Venkateswarlu V Vinjamuri (venkateswarlu.v.vinjamuri at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15776

-gerrit

commit b36875296209c387e6b62ffd662f500c07682e14
Author: Shankar, Vaibhav <vaibhav.shankar at intel.com>
Date:   Wed Jul 13 14:00:08 2016 -0700

    soc/intel/apollolake:iosstate macros for GPIO
    
    IO Standby State (IOSSTATE): The I/O Standby State defines
    which state the pad should be parked in when the I/O is in a
    standby state. Iosstate set to 15 means IO-Standby is ignored
    for this pin(same as functional mode), So that pin keeps on
    functioning in S3/S0iX.
    
    Change-Id: Ie51ff86a2ea63fa6535407fcc2df7a137ee43e8b
    Signed-off-by: venkateswarlu vinjamuri <venkateswarlu.v.vinjamuri at intel.com>
---
 src/soc/intel/apollolake/include/soc/gpio.h      | 15 +++++++++++++++
 src/soc/intel/apollolake/include/soc/gpio_defs.h |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h
index 9c46425..0271588 100644
--- a/src/soc/intel/apollolake/include/soc/gpio.h
+++ b/src/soc/intel/apollolake/include/soc/gpio.h
@@ -28,6 +28,7 @@ typedef uint32_t gpio_t;
 #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_IOSSTATE(value)    PAD_CFG1_IOSSTATE_##value
 #define PAD_IRQ_CFG(route, trig, inv) \
 				(PAD_CFG0_ROUTE_##route | \
 				PAD_CFG0_TRIG_##trig | \
@@ -44,6 +45,20 @@ typedef uint32_t gpio_t;
 #define PAD_CFG_NF(pad, pull, rst, func) \
 	_PAD_CFG_STRUCT(pad, PAD_RESET(rst) | PAD_FUNC(func), PAD_PULL(pull))
 
+/*Iosstate macro*/
+#define PAD_CFG_NF_IOSTATE(pad, pull, rst, func, iostate) \
+       _PAD_CFG_STRUCT(pad,  PAD_RESET(rst) | PAD_FUNC(func), PAD_PULL(pull) | \
+       PAD_IOSSTATE(iostate))
+
+/*Iosstate macro for JTAG*/
+#define PAD_CFG_NF_JTAG_IOSTATE(pad, pull, rst, func, iostate) \
+       _PAD_CFG_STRUCT(pad, PAD_RESET(rst) | PAD_CFG0_TRIG_OFF | PAD_FUNC(func) | PAD_CFG0_RX_DISABLE | PAD_CFG0_TX_DISABLE, PAD_CFG1_CFIO | PAD_PULL(pull) | \
+       PAD_IOSSTATE(iostate))
+
+#define PAD_CFG_NF_JTAG_TDO_IOSTATE(pad, pull, rst, func, iostate) \
+       _PAD_CFG_STRUCT(pad, PAD_RESET(rst) | PAD_CFG0_TRIG_OFF | PAD_FUNC(func) | PAD_CFG0_RX_DISABLE | PAD_CFG0_TX_DISABLE, PAD_CFG1_CFIO_TDO  | PAD_PULL(pull) | \
+       PAD_IOSSTATE(iostate))
+
 /* General purpose output, no pullup/down. */
 #define PAD_CFG_GPO(pad, val, rst)	\
 	_PAD_CFG_STRUCT(pad,		\
diff --git a/src/soc/intel/apollolake/include/soc/gpio_defs.h b/src/soc/intel/apollolake/include/soc/gpio_defs.h
index 48e08e7..320f799 100644
--- a/src/soc/intel/apollolake/include/soc/gpio_defs.h
+++ b/src/soc/intel/apollolake/include/soc/gpio_defs.h
@@ -57,6 +57,7 @@
 #define  PAD_CFG0_MODE_NF3		(3 << 10)
 #define  PAD_CFG0_MODE_NF4		(4 << 10)
 #define  PAD_CFG0_MODE_NF5		(5 << 10)
+#define  PAD_CFG1_IOSSTATE_IOSTANDBY   (0xf << 14)  /*IOSTANDBY*/
 #define PAD_CFG0_ROUTE_NMI		(1 << 17)
 #define PAD_CFG0_ROUTE_SMI		(1 << 18)
 #define PAD_CFG0_ROUTE_SCI		(1 << 19)
@@ -86,6 +87,9 @@
 #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_CFG1_CFIO			(0x3 << 22) /*JTAG*/
+#define  PAD_CFG1_CFIO_TDO		(0x1 << 22) /*JTAG*/
+
 
 #define PAD_CFG_BASE			0x500
 #define PAD_CFG_OFFSET(pad)		(PAD_CFG_BASE + ((pad) * 8))