diff options
| author | Mattis Fjallstrom <mattis@acm.org> | 2015-01-05 03:51:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2014-10-09 19:34:20 +0000 |
| commit | 3140cc8cbcd8ef47235ba6268b780a8f3009b36f (patch) | |
| tree | 74de53906cba1c6bf235cfb3c702ccedf127b193 | |
| parent | 6fe511f24e0dd5029904ded72b4d93e2db06b4ca (diff) | |
| parent | 558d472b01a6929a5584c8448774ae16ec61a54a (diff) | |
| download | olio-uboot-2014.01-3140cc8cbcd8ef47235ba6268b780a8f3009b36f.tar.xz olio-uboot-2014.01-3140cc8cbcd8ef47235ba6268b780a8f3009b36f.zip | |
Merge "olio h1: pinmux: Pulling up MCSPI2_SIMO (Bluetooth reset pin)" into H1-2014.01
| -rw-r--r-- | board/olio/h1/pinmux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/olio/h1/pinmux.h b/board/olio/h1/pinmux.h index 3cdf5a3d1..50c93ac2a 100644 --- a/board/olio/h1/pinmux.h +++ b/board/olio/h1/pinmux.h @@ -203,7 +203,7 @@ MUX_VAL(CONTROL_PADCONF_MCSPI1_SOMI, (IEN | PU | M7 )) /* safe_mode */\ MUX_VAL(CONTROL_PADCONF_MCSPI2_CLK, (IEN | PD | M7 )) /* safe_mode */\
MUX_VAL(CONTROL_PADCONF_MCSPI2_CS0, (IEN | PU | M7 )) /* safe_mode */\
MUX_VAL(CONTROL_PADCONF_MCSPI2_CS1, (IEN | PD | M7 )) /* safe_mode */\
-MUX_VAL(CONTROL_PADCONF_MCSPI2_SIMO, (IEN | PD | M7 )) /* safe_mode */\
+MUX_VAL(CONTROL_PADCONF_MCSPI2_SIMO, (IEN | PU | M7 )) /* safe_mode */\
MUX_VAL(CONTROL_PADCONF_MCSPI2_SOMI, (IDIS | PI | M4 )) /* gpio_180 */\
MUX_VAL(CONTROL_PADCONF_MMC1_CLK, (IEN | PD | M7 )) /* safe_mode */\
MUX_VAL(CONTROL_PADCONF_MMC1_CMD, (IEN | PD | M7 )) /* safe_mode */\
|