Update to internal 7-31-19

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

8 files changed, 98 insertions, 156 deletions

diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
index 88a9c5624..613118843 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch
@@ -1,4 +1,4 @@
-From fbbad6c3a18ec7f1e9d95c09e44e765de303329c Mon Sep 17 00:00:00 2001
+From a2505e885fafd674fe0eb3a2e6daa69392e46684 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: add DTS for Intel platforms
@@ -10,17 +10,20 @@ 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>
 Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
+Signed-off-by: Zhu, Yunge <yunge.zhu@linux.intel.com>
+Signed-off-by: Chen Yugang <yugang.chen@linux.intel.com>
+Signed-off-by: Qiang XU <qiang.xu@linux.intel.com>
 ---
- arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 388 ++++++++++++++++++++++++++
- 1 file changed, 388 insertions(+)
+ arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 410 ++++++++++++++++++++++++++
+ 1 file changed, 410 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 0000000..421699c
+index 000000000000..e94a1473045f
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -0,0 +1,388 @@
+@@ -0,0 +1,410 @@
 +/dts-v1/;
 +
 +#include "aspeed-g5.dtsi"
@@ -146,7 +149,7 @@ index 0000000..421699c
 +	/*D0-D7*/	"","","","","","","","",
 +	/*E0-E7*/	"RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","",
 +	/*F0-F7*/	"","","","","CPU_ERR0","CPU_ERR1","","",
-+	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","","","","","","",
++	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","PCH_BMC_THERMTRIP","","","","","",
 +	/*H0-H7*/	"","","","","","","","",
 +	/*I0-I7*/	"","","","","","","","",
 +	/*J0-J7*/	"","","","","","","","",
@@ -166,7 +169,7 @@ index 0000000..421699c
 +	/*X0-X7*/	"","","","","","","","",
 +	/*Y0-Y7*/	"SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","",
 +	/*Z0-Z7*/	"","SIO_POWER_GOOD","","","","","","",
-+	/*AA0-AA7*/	"","","","","","","","POST_COMPLETE",
++	/*AA0-AA7*/	"P3VBAT_BRIDGE_EN","","","","","","SMI","POST_COMPLETE",
 +	/*AB0-AB7*/	"","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","",
 +	/*AC0-AC7*/	"","","","","","","","";
 +};
@@ -270,31 +273,36 @@ index 0000000..421699c
 +&i2c0 {
 +	multi-master;
 +	general-call;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
-+
-+	ipmb0@10 {
-+		compatible = "slave-mqueue";
-+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
-+	};
 +};
 +
 +&i2c1 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c2 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c3 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c4 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +
 +	hsbp0@10 {
@@ -306,6 +314,8 @@ index 0000000..421699c
 +&i2c5 {
 +	bus-frequency = <1000000>;
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +
 +	smlink0@10 {
@@ -316,22 +326,37 @@ index 0000000..421699c
 +
 +&i2c6 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c7 {
 +	multi-master;
 +	#retries = <3>;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c9 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
++	status = "okay";
++};
++
++&i2c11 {
++	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
 +&i2c13 {
 +	multi-master;
++	aspeed,dma-buf-size = <4095>;
++	aspeed,hw-timeout-ms = <300>;
 +	status = "okay";
 +};
 +
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch
new file mode 100644
index 000000000..40afce9be
--- /dev/null
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-aspeed-pwm-tacho-change-default-fan-speed.patch
@@ -0,0 +1,28 @@
+From 80795ca1de706c4111ac7e8874e1490e7ebf8100 Mon Sep 17 00:00:00 2001
+From: James Feist <james.feist@linux.intel.com>
+Date: Tue, 2 Jul 2019 10:14:59 -0700
+Subject: [PATCH] aspeed-pwm-tacho: change default fan speed
+
+Change it from max to 58%
+
+Signed-off-by: James Feist <james.feist@linux.intel.com>
+---
+ drivers/hwmon/aspeed-pwm-tacho.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c
+index 40c489be62ea..ae5771f881b5 100644
+--- a/drivers/hwmon/aspeed-pwm-tacho.c
++++ b/drivers/hwmon/aspeed-pwm-tacho.c
+@@ -160,7 +160,7 @@
+  */
+ #define M_TACH_MODE 0x02 /* 10b */
+ #define M_TACH_UNIT 0x0210
+-#define INIT_FAN_CTRL 0xFF
++#define INIT_FAN_CTRL 150 /* 58% */
+ 
+ /* How long we sleep in us while waiting for an RPM result. */
+ #define ASPEED_RPM_STATUS_SLEEP_USEC	500
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch
index b05ad2502..0ce4163dd 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch
@@ -1,4 +1,4 @@
-From 9537923d6e6a793cb2bf3c1daacd12562263bc0a Mon Sep 17 00:00:00 2001
+From 56faf4c5a3957012f3a3a8467b3dfde760093784 Mon Sep 17 00:00:00 2001
 From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
 Date: Fri, 3 May 2019 16:12:39 -0700
 Subject: [PATCH] Enable pass-through on GPIOE1 and GPIOE3 free
@@ -20,10 +20,10 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
  3 files changed, 64 insertions(+)
 
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-index 187abd7..beb0729 100644
+index e20e2a259141..fbc9a68bd88c 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-@@ -2498,6 +2498,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = {
+@@ -2605,6 +2605,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = {
  	.get_function_groups = aspeed_pinmux_get_fn_groups,
  	.set_mux = aspeed_pinmux_set_mux,
  	.gpio_request_enable = aspeed_gpio_request_enable,
@@ -32,11 +32,11 @@ index 187abd7..beb0729 100644
  };
  
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
-index eb87ab7..f06d752 100644
+index 18f46177b4af..6feea140b438 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
-@@ -538,6 +538,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev,
- 	return aspeed_sig_expr_enable(expr, pdata->maps);
+@@ -356,6 +356,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev,
+ 	return aspeed_sig_expr_enable(&pdata->pinmux, expr);
  }
  
 +void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev,
@@ -68,11 +68,11 @@ index eb87ab7..f06d752 100644
 +		return;
 +
 +	/* Disable any functions of higher priority than GPIO just in case */
-+	while (funcs = *prios) {
++	while ((funcs = *prios)) {
 +		if (aspeed_gpio_in_exprs(funcs))
 +			break;
 +
-+		ret = aspeed_disable_sig(funcs, pdata->maps);
++		ret = aspeed_disable_sig(&pdata->pinmux, funcs);
 +		if (ret)
 +			return;
 +
@@ -96,17 +96,17 @@ index eb87ab7..f06d752 100644
 +	prios--;
 +	funcs = *prios;
 +	expr = *funcs;
-+	aspeed_sig_expr_enable(expr, pdata->maps);
++	aspeed_sig_expr_enable(&pdata->pinmux, expr);
 +}
 +
  int aspeed_pinctrl_probe(struct platform_device *pdev,
  			 struct pinctrl_desc *pdesc,
  			 struct aspeed_pinctrl_data *pdata)
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h
-index d4d7f03..0037b11 100644
+index 11cc0eb6666b..735162ebb855 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h
-@@ -595,6 +595,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function,
+@@ -64,6 +64,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function,
  int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev,
  		struct pinctrl_gpio_range *range,
  		unsigned int offset);
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch
index 1d26b9667..c38134b8c 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch
@@ -1,4 +1,4 @@
-From d26dd7c4ef1a2cb88440420deccc54eb88129c60 Mon Sep 17 00:00:00 2001
+From 7513371d16158cb638dd97e81b402bbef7ed3156 Mon Sep 17 00:00:00 2001
 From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
 Date: Mon, 6 May 2019 14:18:27 -0700
 Subject: [PATCH] Enable GPIOE0 and GPIOE2 pass-through by default
@@ -23,10 +23,10 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
  2 files changed, 14 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-index 45556ac..051e927 100644
+index b049f816bf67..4815104459f1 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -124,6 +124,10 @@
+@@ -116,6 +116,10 @@
  
  &gpio {
  	status = "okay";
@@ -35,21 +35,21 @@ index 45556ac..051e927 100644
 +	pinctrl-0 = <&pinctrl_gpie0_default
 +			&pinctrl_gpie2_default>;
  	gpio-line-names =
- 	/*A0-A8*/	"","","","","","","","",
- 	/*B0-B8*/	"","","","","","","","",
+ 	/*A0-A7*/	"","","","","","","","",
+ 	/*B0-B7*/	"","","","","","","","",
 diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
-index 2175070..f47d139 100644
+index 13d80bfbc3b6..e426452a28f7 100644
 --- a/drivers/gpio/gpio-aspeed.c
 +++ b/drivers/gpio/gpio-aspeed.c
-@@ -1157,6 +1157,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+@@ -1152,6 +1152,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+ {
  	const struct of_device_id *gpio_id;
  	struct aspeed_gpio *gpio;
- 	struct resource *res;
 +	struct pinctrl *pinctrl;
  	int rc, i, banks;
  
  	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
-@@ -1205,6 +1206,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
+@@ -1199,6 +1200,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev)
  		return -ENOMEM;
  
  	/*
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch
deleted file mode 100644
index dbb163d20..000000000
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 2f3587cf9e44f261fe74413ef6a54467686c910b Mon Sep 17 00:00:00 2001
-From: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
-Date: Tue, 20 Nov 2018 15:49:15 -0800
-Subject: [PATCH] Test code for LPC MBOX
-
-Blocked interrupt driven code for test.
-
-Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>
----
- drivers/misc/aspeed-lpc-mbox.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/misc/aspeed-lpc-mbox.c b/drivers/misc/aspeed-lpc-mbox.c
-index 0f0c711bafee..0933e0553953 100644
---- a/drivers/misc/aspeed-lpc-mbox.c
-+++ b/drivers/misc/aspeed-lpc-mbox.c
-@@ -19,6 +19,8 @@
- 
- #define DEVICE_NAME	"aspeed-mbox"
- 
-+#define MBX_USE_INTERRUPT 0
-+
- #define ASPEED_MBOX_NUM_REGS 16
- 
- #define ASPEED_MBOX_DATA_0 0x00
-@@ -79,12 +81,14 @@ static int aspeed_mbox_open(struct inode *inode, struct file *file)
- 	struct aspeed_mbox *mbox = file_mbox(file);
- 
- 	if (atomic_inc_return(&aspeed_mbox_open_count) == 1) {
-+#if MBX_USE_INTERRUPT
- 		/*
- 		 * Clear the interrupt status bit if it was left on and unmask
- 		 * interrupts.
- 		 * ASPEED_MBOX_CTRL_RECV bit is W1C, this also unmasks in 1 step
- 		 */
- 		aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL);
-+#endif
- 		return 0;
- 	}
- 
-@@ -106,6 +110,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf,
- 	if (count + *ppos > ASPEED_MBOX_NUM_REGS)
- 		return -EINVAL;
- 
-+#if MBX_USE_INTERRUPT
- 	if (file->f_flags & O_NONBLOCK) {
- 		if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) &
- 				ASPEED_MBOX_CTRL_RECV))
-@@ -115,6 +120,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf,
- 				ASPEED_MBOX_CTRL_RECV)) {
- 		return -ERESTARTSYS;
- 	}
-+#endif
- 
- 	mutex_lock(&mbox->mutex);
- 
-@@ -129,8 +135,10 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf,
- 		count--;
- 	}
- 
-+#if MBX_USE_INTERRUPT
- 	/* ASPEED_MBOX_CTRL_RECV bit is write to clear, this also unmasks in 1 step */
- 	aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL);
-+#endif
- 	ret = p - buf;
- 
- out_unlock:
-@@ -180,7 +188,9 @@ static unsigned int aspeed_mbox_poll(struct file *file, poll_table *wait)
- 
- 	poll_wait(file, &mbox->queue, wait);
- 
-+#if MBX_USE_INTERRUPT
- 	if (aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV)
-+#endif
- 		mask |= POLLIN;
- 
- 	return mask;
-@@ -206,6 +216,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg)
- {
- 	struct aspeed_mbox *mbox = arg;
- 
-+#if MBX_USE_INTERRUPT
- 	if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV))
- 		return IRQ_NONE;
- 
-@@ -216,6 +227,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg)
- 
- 	/* Mask it off, we'll clear it when we the data gets read */
- 	aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL);
-+#endif
- 
- 	wake_up(&mbox->queue);
- 	return IRQ_HANDLED;
-@@ -248,7 +260,14 @@ static int aspeed_mbox_config_irq(struct aspeed_mbox *mbox,
- 	aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_0);
- 	aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_1);
- 
--	aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL);
-+	aspeed_mbox_outb(mbox, aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) | ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL);
-+
-+	/*
-+	 * Because mailbox data register init value is random, need to give a
-+	 * init value to mailbox data register.
-+	 */
-+	aspeed_mbox_outb(mbox, 0x00, ASPEED_MBOX_DATA_0);
-+
- 	return 0;
- }
- 
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
index 03b4f4da4..14b7154bf 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch
@@ -1,4 +1,4 @@
-From ddfbe1364c6ecf77f06990e6550dfe5a3791e6bf Mon Sep 17 00:00:00 2001
+From 9a71adc7aecbfdf066ba54c763c2ecd8fb09d3cd 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
@@ -13,10 +13,10 @@ Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com>
  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 8aba46cdce46..6959a06d04e2 100644
+index 4815104459f1..df02bb1aaf36 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,7 @@
  	flash@0 {
  		status = "okay";
  		m25p,fast-read;
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch
index d3b850efe..c1207055d 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch
@@ -1,4 +1,4 @@
-From 2e834ae04eba975066f80102c6f4656da314ca1e Mon Sep 17 00:00:00 2001
+From 029cf5d5ff436ea14ab2d33da32238910be0a8b2 Mon Sep 17 00:00:00 2001
 From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
 Date: Fri, 24 May 2019 12:42:59 -0700
 Subject: [PATCH] Allow monitoring of power control input GPIOs
@@ -27,10 +27,10 @@ Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-index beb0729..05d1081 100644
+index fbc9a68bd88c..6f151e7c8d81 100644
 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
 +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
-@@ -250,7 +250,7 @@ FUNC_GROUP_DECL(SD2, F19, E21, F20, D20, D21, E20, G18, C21);
+@@ -272,7 +272,7 @@ FUNC_GROUP_DECL(SD2, F19, E21, F20, D20, D21, E20, G18, C21);
  
  #define B20 32
  SIG_EXPR_LIST_DECL_SINGLE(NCTS3, NCTS3, SIG_DESC_SET(SCU80, 16));
@@ -39,7 +39,7 @@ index beb0729..05d1081 100644
  SIG_EXPR_DECL(GPIE0IN, GPIE, GPIE_DESC);
  SIG_EXPR_LIST_DECL_DUAL(GPIE0IN, GPIE0, GPIE);
  MS_PIN_DECL(B20, GPIOE0, NCTS3, GPIE0IN);
-@@ -270,7 +270,7 @@ FUNC_GROUP_DECL(GPIE0, B20, C20);
+@@ -292,7 +292,7 @@ FUNC_GROUP_DECL(GPIE0, B20, C20);
  
  #define F18 34
  SIG_EXPR_LIST_DECL_SINGLE(NDSR3, NDSR3, SIG_DESC_SET(SCU80, 18));
@@ -48,7 +48,7 @@ index beb0729..05d1081 100644
  SIG_EXPR_DECL(GPIE2IN, GPIE, GPIE_DESC);
  SIG_EXPR_LIST_DECL_DUAL(GPIE2IN, GPIE2, GPIE);
  MS_PIN_DECL(F18, GPIOE2, NDSR3, GPIE2IN);
-@@ -1349,7 +1349,7 @@ FUNC_GROUP_DECL(ADC15, H4);
+@@ -1371,7 +1371,7 @@ FUNC_GROUP_DECL(ADC15, H4);
  
  #define R22 192
  SIG_EXPR_DECL(SIOS3, SIOS3, SIG_DESC_SET(SCUA4, 8));
@@ -57,7 +57,7 @@ index beb0729..05d1081 100644
  SIG_EXPR_LIST_DECL_DUAL(SIOS3, SIOS3, ACPI);
  SIG_EXPR_LIST_DECL_SINGLE(DASHR22, DASHR22, SIG_DESC_SET(SCU94, 10));
  MS_PIN_DECL(R22, GPIOY0, SIOS3, DASHR22);
-@@ -1357,7 +1357,7 @@ FUNC_GROUP_DECL(SIOS3, R22);
+@@ -1379,7 +1379,7 @@ FUNC_GROUP_DECL(SIOS3, R22);
  
  #define R21 193
  SIG_EXPR_DECL(SIOS5, SIOS5, SIG_DESC_SET(SCUA4, 9));
@@ -66,7 +66,7 @@ index beb0729..05d1081 100644
  SIG_EXPR_LIST_DECL_DUAL(SIOS5, SIOS5, ACPI);
  SIG_EXPR_LIST_DECL_SINGLE(DASHR21, DASHR21, SIG_DESC_SET(SCU94, 10));
  MS_PIN_DECL(R21, GPIOY1, SIOS5, DASHR21);
-@@ -1373,7 +1373,7 @@ FUNC_GROUP_DECL(SIOPWREQ, P22);
+@@ -1395,7 +1395,7 @@ FUNC_GROUP_DECL(SIOPWREQ, P22);
  
  #define P21 195
  SIG_EXPR_DECL(SIOONCTRL, SIOONCTRL, SIG_DESC_SET(SCUA4, 11));
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
index 155ba3ae4..9860a2815 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
+++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg
@@ -12,7 +12,6 @@ CONFIG_PECI_CHARDEV=y
 CONFIG_PECI_ASPEED=y
 CONFIG_SENSORS_PECI_CPUTEMP=y
 CONFIG_SENSORS_PECI_DIMMTEMP=y
-CONFIG_OF_CONFIGFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_BLK_DEV_RAM_SIZE=49152
 CONFIG_MAGIC_SYSRQ=y
@@ -21,10 +20,12 @@ CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_ASPEED_ESPI_SLAVE=y
 CONFIG_ASPEED_KCS_IPMI_BMC=y
 CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=n
 CONFIG_I2C_SLAVE_MQUEUE=y
 CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256
 CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32
+CONFIG_ASPEED_BT_IPMI_BMC=n
+CONFIG_ASPEED_LPC_CTRL=n
+CONFIG_ASPEED_LPC_MBOX=y
 CONFIG_ASPEED_LPC_SIO=y
 CONFIG_JTAG=y
 CONFIG_JTAG_ASPEED=y