Merged PR 1062: Merge Bug-669 to master VGA Reserved memory causing B…

…MC reset Related work items: torvalds#669
foxconn-bmc-ks · Oct 20, 2017 · 619741e · 619741e
2 parents 20301a7 + 723d992
commit 619741e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-g50.dts b/arch/arm/boot/dts/aspeed-bmc-opp-g50.dts
@@ -20,17 +20,6 @@
 		reg = <0x40000000 0x20000000>;
 	};
 
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		vga_memory: framebuffer@5f000000 {
-			no-map;
-			reg = <0x5f000000 0x01000000>; /* 16MB */
-		};
-	};
-
 	ahb {
 		bmc_pnor: fmc@1e620000 {
 			reg = < 0x1e620000 0x94
@@ -45,6 +34,13 @@
 			};
 
 		};
+    apb {
+      wdt2: wdt@1e785020 {
+        compatible = "aspeed,ast2400-wdt";
+        reg = <0x1e785020 0x1c>;
+        status = "okay";
+      };
+    };
 	};
 
 	leds {

diff --git a/arch/arm/mach-aspeed/aspeed.c b/arch/arm/mach-aspeed/aspeed.c
@@ -143,7 +143,7 @@ static void __init do_sthelens_setup(void)
         writel(0x10CC5E80, AST_IO(AST_BASE_SCU | 0x0c));
 
         //Disable host SPI mode  bit 12:13 = 00
-        writel(0xFA1C84D6, AST_IO(AST_BASE_SCU | 0x70));
+        writel(0xFA1C84D2, AST_IO(AST_BASE_SCU | 0x70));
         /*config GPIOF0, GPIOF1, GPIOF3, GPIOF7 to gpio pin */
         writel(0x20000000, AST_IO(AST_BASE_SCU | 0x80));
         writel(0x00fff0c0, AST_IO(AST_BASE_SCU | 0x84));