summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch')
-rw-r--r--meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch19
1 files changed, 9 insertions, 10 deletions
diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
index 8659e4bfc..3a15830f7 100644
--- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
+++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0004-AST2600-Adjust-default-GPIO-settings.patch
@@ -1,4 +1,4 @@
-From 0381bd2a345dade03721a1244fa30eed4fade9fa Mon Sep 17 00:00:00 2001
+From 538ebb0466d1063963e0d3a489b98c5fb8b62fb2 Mon Sep 17 00:00:00 2001
From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
Date: Fri, 3 Jan 2020 15:14:09 -0800
Subject: [PATCH] AST2600: Adjust default GPIO settings
@@ -11,14 +11,14 @@ Subject: [PATCH] AST2600: Adjust default GPIO settings
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
---
- board/aspeed/ast2600_intel/intel.c | 56 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 56 insertions(+)
+ board/aspeed/ast2600_intel/intel.c | 55 ++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
diff --git a/board/aspeed/ast2600_intel/intel.c b/board/aspeed/ast2600_intel/intel.c
-index d1ac8651ac6c..45f01a095340 100644
+index d1ac8651ac6c..fc4745a11585 100644
--- a/board/aspeed/ast2600_intel/intel.c
+++ b/board/aspeed/ast2600_intel/intel.c
-@@ -162,6 +162,60 @@ static void sgpio_init(void)
+@@ -162,6 +162,59 @@ static void sgpio_init(void)
SCU_BASE | SCU_414);
}
@@ -69,17 +69,16 @@ index d1ac8651ac6c..45f01a095340 100644
+ writel(readl(AST_GPIO_BASE | GPIO_004) & ~GPIO_C5,
+ AST_GPIO_BASE | GPIO_004);
+
++ /* GPIO G6 is also an open-drain output so set it as an input. */
+#define GPIO_G6 BIT(22)
-+ writel(readl(AST_GPIO_BASE | GPIO_024) | GPIO_G6,
++ writel(readl(AST_GPIO_BASE | GPIO_024) & ~GPIO_G6,
+ AST_GPIO_BASE | GPIO_024);
-+ writel(readl(AST_GPIO_BASE | GPIO_020) | GPIO_G6,
-+ AST_GPIO_BASE | GPIO_020);
+}
+
static void timer_handler(void *regs)
{
printf("+");
-@@ -175,6 +229,8 @@ int board_early_init_f(void)
+@@ -175,6 +228,8 @@ int board_early_init_f(void)
* I am not sure if it actually does anything... */
arch_interrupt_init_early();
@@ -89,5 +88,5 @@ index d1ac8651ac6c..45f01a095340 100644
port80h_snoop_init();
--
-2.7.4
+2.17.1