Update 4-15-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

4 files changed, 50 insertions, 38 deletions

diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch
index 9b4d9bbc7..2a3f547d5 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch
+++ b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch
@@ -1,4 +1,4 @@
-From f631d7dc034be1de17213b1498651ad37f3ce98b Mon Sep 17 00:00:00 2001
+From 7bee096fd87485d1095c6b6940b62681ff873045 Mon Sep 17 00:00:00 2001
 From: Yuan Li <yuan.li@linux.intel.com>
 Date: Tue, 19 Sep 2017 15:55:39 +0800
 Subject: [PATCH] ARM: dts: purley: Merge all dts node in the unified patch.
@@ -22,22 +22,23 @@ The below changes to the dts file are merged together:
 * enable high speed uart clock
 * timer pwm
 * cpu0/1fault LEDs
+* i2c9 for SPD on WP / Disable beeper and timer-pwm
 
 Signed-off-by: Yuan Li <yuan.li@linux.intel.com>
 Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
 Signed-off-by: James Feist <james.feist@linux.intel.com>
 Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
 ---
- arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 346 ++++++++++++++++++++++++++
- 1 file changed, 346 insertions(+)
+ arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 358 ++++++++++++++++++++++++++
+ 1 file changed, 358 insertions(+)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 new file mode 100644
-index 000000000000..144d59642a71
+index 000000000000..432f10186547
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -0,0 +1,346 @@
+@@ -0,0 +1,358 @@
 +/dts-v1/;
 +
 +#include "aspeed-g5.dtsi"
@@ -72,7 +73,14 @@ index 000000000000..144d59642a71
 +		};
 +
 +		gfx_memory: framebuffer {
-+			size = <0x04000000>;
++			size = <0x01000000>;
++			alignment = <0x01000000>;
++			compatible = "shared-dma-pool";
++			reusable;
++		};
++
++		video_engine_memory: jpegbuffer {
++			size = <0x02000000>;	/* 32MM */
 +			alignment = <0x01000000>;
 +			compatible = "shared-dma-pool";
 +			reusable;
@@ -119,10 +127,10 @@ index 000000000000..144d59642a71
 +		};
 +	};
 +
-+	beeper {
-+		compatible = "pwm-beeper";
-+		pwms = <&timer 5 1000000 0>;
-+	};
++	//beeper {
++	//	compatible = "pwm-beeper";
++	//	pwms = <&timer 5 1000000 0>;
++	//};
 +};
 +
 +&fmc {
@@ -310,6 +318,11 @@ index 000000000000..144d59642a71
 +	status = "okay";
 +};
 +
++&i2c9 {
++	multi-master;
++	status = "okay";
++};
++
 +&gfx {
 +	status = "okay";
 +	memory-region = <&gfx_memory>;
@@ -362,23 +375,23 @@ index 000000000000..144d59642a71
 +
 +};
 +
-+&timer {
-+/*
-+ *	Available settings:
-+ *	fttmr010,pwm-outputs = <5>, <6>, <7>, <8>;
-+ *	pinctrl-0 = <&pinctrl_timer5_default &pinctrl_timer6_default
-+ *			&pinctrl_timer7_default &pinctrl_timer8_default>;
-+ */
-+	fttmr010,pwm-outputs = <5>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_timer5_default>;
-+	#pwm-cells = <3>;
-+	status = "okay";
-+};
++//&timer {
++///*
++// *	Available settings:
++// *	fttmr010,pwm-outputs = <5>, <6>, <7>, <8>;
++// *	pinctrl-0 = <&pinctrl_timer5_default &pinctrl_timer6_default
++// *			&pinctrl_timer7_default &pinctrl_timer8_default>;
++// */
++//	fttmr010,pwm-outputs = <5>;
++//	pinctrl-names = "default";
++//	pinctrl-0 = <&pinctrl_timer5_default>;
++//	#pwm-cells = <3>;
++//	status = "okay";
++//};
 +
 +&video {
 +	status = "okay";
-+	memory-region = <&gfx_memory>;
++	memory-region = <&video_engine_memory>;
 +};
 +
 +&vhub {
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Define-the-gpio-line-names-property-for-purley-platform.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Define-the-gpio-line-names-property-for-purley-platform.patch
index 63e8b2006..7055ee575 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Define-the-gpio-line-names-property-for-purley-platform.patch
+++ b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Define-the-gpio-line-names-property-for-purley-platform.patch
@@ -1,4 +1,4 @@
-From 971b69835fcafbac02adf828a744af541c7554d0 Mon Sep 17 00:00:00 2001
+From d36b385e17eb21c305200048007d3cc6ad38f072 Mon Sep 17 00:00:00 2001
 From: Kuiying Wang <kuiying.wang@intel.com>
 Date: Wed, 19 Sep 2018 17:51:06 +0800
 Subject: [PATCH] Define the gpio-line-names property for purley platform
@@ -15,14 +15,14 @@ defined following gpios.
 
 Signed-off-by: Kuiying Wang <kuiying.wang@intel.com>
 ---
- arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 29 +++++++++++++++++++
+ arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 29 +++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-index 1c9aed9fcf94..9e187453750f 100644
+index 144d59642a71..8aba46cdce46 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -91,6 +91,35 @@
+@@ -117,6 +117,35 @@
  
  &gpio {
  	status = "okay";
@@ -59,5 +59,5 @@ index 1c9aed9fcf94..9e187453750f 100644
  
  &kcs3 {
 -- 
-2.17.0
+2.7.4
 
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Leave-GPIOE-in-passthrough-after-boot.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Leave-GPIOE-in-passthrough-after-boot.patch
index dd56cab4b..2593ee8f6 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Leave-GPIOE-in-passthrough-after-boot.patch
+++ b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Leave-GPIOE-in-passthrough-after-boot.patch
@@ -1,7 +1,7 @@
-From 769b30d1b5463291ddffd46f6039321d42f80417 Mon Sep 17 00:00:00 2001
+From c11a8ffcea24352579614d13d13ac4bda9a965cf Mon Sep 17 00:00:00 2001
 From: James Feist <james.feist@linux.intel.com>
 Date: Mon, 5 Nov 2018 15:38:19 -0800
-Subject: [PATCH 1/1] Leave GPIOE in passthrough after boot
+Subject: [PATCH] Leave GPIOE in passthrough after boot
 
 This is a temporary patch that seems to leave exported
 gpio in passthrough mode. It's hard to understand why this
@@ -16,11 +16,11 @@ change that can get us the correct result in the short term.
 
 Signed-off-by: James Feist <james.feist@linux.intel.com>
 ---
- drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 8 ++++----
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-index 0c89647f166f..386ae967835d 100644
+index 187abd7693cf..4230e1038a88 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
 @@ -246,7 +246,7 @@ FUNC_GROUP_DECL(GPID6, G18, C21);
@@ -42,5 +42,5 @@ index 0c89647f166f..386ae967835d 100644
  #define F18 34
  SIG_EXPR_LIST_DECL_SINGLE(NDSR3, NDSR3, SIG_DESC_SET(SCU80, 18));
 -- 
-2.17.1
+2.7.4
 
diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
index 6d92227c7..03b4f4da4 100644
--- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
+++ b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
@@ -1,4 +1,4 @@
-From 0b3a20690483d3a04cb10d785b33f01b9bf4079d Mon Sep 17 00:00:00 2001
+From ddfbe1364c6ecf77f06990e6550dfe5a3791e6bf Mon Sep 17 00:00:00 2001
 From: Vikram Bodireddy <vikram.bodireddy@intel.com>
 Date: Wed, 6 Feb 2019 15:59:34 +0530
 Subject: [PATCH] Selecting 128MB for PFR
@@ -7,17 +7,16 @@ PFR platforms requires 128MB flash mapping.
 This will override the existing 64MB flash map
 and loads 128MB flash map.
 
-Change-Id: If42805139d86061bd409915e8fc6374d6cf69147
 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
 ---
  arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-index 20cc204..aab14fd 100644
+index 8aba46cdce46..6959a06d04e2 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -79,7 +79,7 @@
+@@ -90,7 +90,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;