[coreboot-gerrit] Patch set updated for coreboot: 6ac41dc baytrail: Modify GPIO pull-up specification method

Aaron Durbin (adurbin@google.com) gerrit at coreboot.org
Wed Feb 5 17:04:43 CET 2014


Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4886

-gerrit

commit 6ac41dcf8fec62a24ab2df6e3c56d82c22839127
Author: Shawn Nematbakhsh <shawnn at chromium.org>
Date:   Fri Oct 18 17:13:18 2013 -0700

    baytrail: Modify GPIO pull-up specification method
    
    Minor style changes to the way GPIO pull-ups are specified in
    board-specific GPIO maps. Intent is to allow calls to GPIO_FUNC macro
    from such maps.
    
    BUG=chrome-os-partner:22863
    TEST=Manual. Build + boot on bayleybay.
    
    Change-Id: I80134b65d22d3ad8a049837dccc0985e321645da
    Signed-off-by: Shawn Nematbakhsh <shawnn at chromium.org>
    Reviewed-on: https://chromium-review.googlesource.com/173748
    Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Commit-Queue: David James <davidjames at chromium.org>
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/soc/intel/baytrail/baytrail/gpio.h | 49 +++++++++++++---------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/soc/intel/baytrail/baytrail/gpio.h b/src/soc/intel/baytrail/baytrail/gpio.h
index a180ba7..8d7925b 100644
--- a/src/soc/intel/baytrail/baytrail/gpio.h
+++ b/src/soc/intel/baytrail/baytrail/gpio.h
@@ -105,9 +105,9 @@
 #define PAD_PU_40K		(3 << 9)
 
 /* config0[8:7] - Pull assign */
-#define PAD_PU_DISABLE		(0 << 7)
-#define PAD_PU_UP		(1 << 7)
-#define PAD_PU_DOWN		(2 << 7)
+#define PAD_PULL_DISABLE	(0 << 7)
+#define PAD_PULL_UP		(1 << 7)
+#define PAD_PULL_DOWN		(2 << 7)
 
 /* config0[2:0] - Func. pin mux */
 #define PAD_FUNC0		0x0
@@ -146,7 +146,7 @@
  * legacy config -- so also configure the pad regs as GPIO. We rely upon
  * the fact that all GPNCORE pads are function 0 GPIO. */
 #define GPIO_INPUT_PU_10K \
-	{ .pad_conf0 = PAD_PU_10K | PAD_PU_UP | PAD_CONFIG0_DEFAULT \
+	{ .pad_conf0 = PAD_PU_10K | PAD_PULL_UP | PAD_CONFIG0_DEFAULT \
 		     | PAD_FUNC0, \
 	  .pad_conf1 = PAD_CONFIG1_DEFAULT, \
 	  .pad_val   = PAD_VAL_INPUT_ENABLE, \
@@ -154,7 +154,7 @@
 	  .io_sel    = GPIO_DIR_INPUT }
 
 #define GPIO_INPUT_PD_10K \
-	{ .pad_conf0 = PAD_PU_10K | PAD_PU_DOWN | PAD_CONFIG0_DEFAULT \
+	{ .pad_conf0 = PAD_PU_10K | PAD_PULL_DOWN | PAD_CONFIG0_DEFAULT \
 		     | PAD_FUNC0, \
 	  .pad_conf1 = PAD_CONFIG1_DEFAULT, \
 	  .pad_val   = PAD_VAL_INPUT_ENABLE, \
@@ -162,7 +162,7 @@
 	  .io_sel    = GPIO_DIR_INPUT }
 
 #define GPIO_INPUT_NOPU \
-	{ .pad_conf0 = PAD_PU_10K | PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \
+	{ .pad_conf0 = PAD_PU_10K | PAD_PULL_DISABLE | PAD_CONFIG0_DEFAULT \
 		     | PAD_FUNC0, \
 	  .pad_conf1 = PAD_CONFIG1_DEFAULT, \
 	  .pad_val   = PAD_VAL_INPUT_ENABLE, \
@@ -170,7 +170,7 @@
 	  .io_sel    = GPIO_DIR_INPUT }
 
 #define GPIO_OUT_LOW \
-	{ .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \
+	{ .pad_conf0 = PAD_PULL_DISABLE | PAD_CONFIG0_DEFAULT \
 		     | PAD_FUNC0, \
 	  .pad_conf1 = PAD_CONFIG1_DEFAULT, \
 	  .pad_val   = PAD_VAL_OUTPUT_ENABLE | PAD_VAL_LOW, \
@@ -179,7 +179,7 @@
 	  .gp_lvl    = GPIO_LEVEL_LOW }
 
 #define GPIO_OUT_HIGH \
-	{ .pad_conf0 = PAD_PU_DISABLE | PAD_CONFIG0_DEFAULT \
+	{ .pad_conf0 = PAD_PULL_DISABLE | PAD_CONFIG0_DEFAULT \
 		     | PAD_FUNC0, \
 	  .pad_conf1 = PAD_CONFIG1_DEFAULT, \
 	  .pad_val   = PAD_VAL_OUTPUT_ENABLE | PAD_VAL_HIGH, \
@@ -188,34 +188,21 @@
 	  .gp_lvl    = GPIO_LEVEL_HIGH }
 
 /* Define no-pull / PU / PD configs for each functional config option */
-#define _GPIO_FUNC(_func, _pu, _str) \
+#define GPIO_FUNC(_func, _pudir, _str) \
 	{ .use_sel   = GPIO_USE_PAD, \
-	  .pad_conf0 = PAD_FUNC##_func | PAD_PU_##_pu | PAD_PU_##_str | \
+	  .pad_conf0 = PAD_FUNC##_func | PAD_##_pudir | PAD_PU_##_str | \
 		       PAD_CONFIG0_DEFAULT, \
 	  .pad_conf1 = PAD_CONFIG1_DEFAULT, \
 	  .pad_val   = PAD_VAL_DEFAULT }
 
-#define GPIO_FUNC0		_GPIO_FUNC(0, DISABLE, 10K)
-#define GPIO_FUNC0_PU_10K	_GPIO_FUNC(0, UP, 10K)
-#define GPIO_FUNC0_PD_10K	_GPIO_FUNC(0, DOWN, 10K)
-#define GPIO_FUNC1		_GPIO_FUNC(1, DISABLE, 10K)
-#define GPIO_FUNC1_PU_10K	_GPIO_FUNC(1, UP, 10K)
-#define GPIO_FUNC1_PD_10K	_GPIO_FUNC(1, DOWN, 10K)
-#define GPIO_FUNC2		_GPIO_FUNC(2, DISABLE, 10K)
-#define GPIO_FUNC2_PU_10K	_GPIO_FUNC(2, UP, 10K)
-#define GPIO_FUNC2_PD_10K	_GPIO_FUNC(2, DOWN, 10K)
-#define GPIO_FUNC3		_GPIO_FUNC(3, DISABLE, 10K)
-#define GPIO_FUNC3_PU_10K	_GPIO_FUNC(3, UP, 10K)
-#define GPIO_FUNC3_PD_10K	_GPIO_FUNC(3, DOWN, 10K)
-#define GPIO_FUNC4		_GPIO_FUNC(4, DISABLE, 10K)
-#define GPIO_FUNC4_PU_10K	_GPIO_FUNC(4, UP, 10K)
-#define GPIO_FUNC4_PD_10K	_GPIO_FUNC(4, DOWN, 10K)
-#define GPIO_FUNC5		_GPIO_FUNC(5, DISABLE, 10K)
-#define GPIO_FUNC5_PU_10K	_GPIO_FUNC(5, UP, 10K)
-#define GPIO_FUNC5_PD_10K	_GPIO_FUNC(5, DOWN, 10K)
-#define GPIO_FUNC6		_GPIO_FUNC(6, DISABLE, 10K)
-#define GPIO_FUNC6_PU_10K	_GPIO_FUNC(6, UP, 10K)
-#define GPIO_FUNC6_PD_10K	_GPIO_FUNC(6, DOWN, 10K)
+/* Default functional configs -- no PU */
+#define GPIO_FUNC0		GPIO_FUNC(0, PULL_DISABLE, 10K)
+#define GPIO_FUNC1		GPIO_FUNC(1, PULL_DISABLE, 10K)
+#define GPIO_FUNC2		GPIO_FUNC(2, PULL_DISABLE, 10K)
+#define GPIO_FUNC3		GPIO_FUNC(3, PULL_DISABLE, 10K)
+#define GPIO_FUNC4		GPIO_FUNC(4, PULL_DISABLE, 10K)
+#define GPIO_FUNC5		GPIO_FUNC(5, PULL_DISABLE, 10K)
+#define GPIO_FUNC6		GPIO_FUNC(6, PULL_DISABLE, 10K)
 
 /* End marker */
 #define GPIO_LIST_END		0xffffffff



More information about the coreboot-gerrit mailing list