From 820013481a115100d5f8f22dc01aac8cc0363a23 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Tue, 7 Jan 2020 10:40:08 -0800 Subject: Update to internal 2020-01-07 Signed-off-by: Jason M. Bills --- .../0022-Add-AST2500-eSPI-driver.patch | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0022-Add-AST2500-eSPI-driver.patch') diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0022-Add-AST2500-eSPI-driver.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0022-Add-AST2500-eSPI-driver.patch index a82fefba0..490104cda 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0022-Add-AST2500-eSPI-driver.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0022-Add-AST2500-eSPI-driver.patch @@ -1,4 +1,4 @@ -From 6e55e28db5eed85b7717aa4fc92c064f11429f6d Mon Sep 17 00:00:00 2001 +From 1d0c60f1aa8b7b25d8d0d6f6f6443d307d543600 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Sat, 24 Feb 2018 11:12:32 +0800 Subject: [PATCH] Add AST2500 eSPI driver @@ -23,21 +23,21 @@ Signed-off-by: Jae Hyun Yoo Signed-off-by: James Feist Signed-off-by: Vernon Mauery --- - .../devicetree/bindings/misc/aspeed,espi-slave.txt | 19 + + .../devicetree/bindings/misc/aspeed,espi-slave.txt | 20 + Documentation/misc-devices/espi-slave.rst | 118 ++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 4 + arch/arm/boot/dts/aspeed-g6.dtsi | 12 + drivers/misc/Kconfig | 8 + drivers/misc/Makefile | 1 + - drivers/misc/aspeed-espi-slave.c | 420 +++++++++++++++++++++ - 6 files changed, 570 insertions(+) + drivers/misc/aspeed-espi-slave.c | 421 +++++++++++++++++++++ + 7 files changed, 584 insertions(+) create mode 100644 Documentation/devicetree/bindings/misc/aspeed,espi-slave.txt create mode 100644 Documentation/misc-devices/espi-slave.rst create mode 100644 drivers/misc/aspeed-espi-slave.c diff --git a/Documentation/devicetree/bindings/misc/aspeed,espi-slave.txt b/Documentation/devicetree/bindings/misc/aspeed,espi-slave.txt new file mode 100644 -index 000000000000..8660e2ffbb89 +index 000000000000..f72d9ae32f3e --- /dev/null +++ b/Documentation/devicetree/bindings/misc/aspeed,espi-slave.txt @@ -0,0 +1,20 @@ @@ -186,10 +186,10 @@ index 000000000000..887a69a7130a +- Interface Base Specification (for Client and Server Platforms) +`_ diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi -index 88f75736fe48..26671cc4dbd5 100644 +index c15be82c3a9d..bd2037e52a94 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi -@@ -317,6 +317,7 @@ +@@ -316,6 +316,7 @@ clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; #interrupt-cells = <2>; @@ -197,7 +197,7 @@ index 88f75736fe48..26671cc4dbd5 100644 }; sgpio: sgpio@1e780200 { -@@ -413,6 +414,9 @@ +@@ -412,6 +413,9 @@ reg = <0x1e6ee000 0x100>; interrupts = <23>; status = "disabled"; @@ -208,7 +208,7 @@ index 88f75736fe48..26671cc4dbd5 100644 lpc: lpc@1e789000 { diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi -index 567f268a3032..48de17a24c74 100644 +index 459070693aba..e4c1ab3d274e 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -3,6 +3,7 @@ @@ -219,7 +219,7 @@ index 567f268a3032..48de17a24c74 100644 / { model = "Aspeed BMC"; -@@ -512,6 +513,17 @@ +@@ -651,6 +652,17 @@ status = "disabled"; }; @@ -238,10 +238,10 @@ index 567f268a3032..48de17a24c74 100644 compatible = "simple-bus"; #address-cells = <1>; diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index d681b7201f8c..50814caba1d3 100644 +index 06a2b753cc7c..0f9b5a356c93 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig -@@ -455,6 +455,14 @@ config VEXPRESS_SYSCFG +@@ -433,6 +433,14 @@ config VEXPRESS_SYSCFG bus. System Configuration interface is one of the possible means of generating transactions on this bus. @@ -257,10 +257,10 @@ index d681b7201f8c..50814caba1d3 100644 depends on PCI select CRC32 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index fdd404120ed8..f168e6713440 100644 +index b9e6d4c3e906..53864687e8fd 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile -@@ -53,6 +53,7 @@ obj-$(CONFIG_GENWQE) += genwqe/ +@@ -51,6 +51,7 @@ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o obj-$(CONFIG_CXL_BASE) += cxl/ @@ -270,7 +270,7 @@ index fdd404120ed8..f168e6713440 100644 obj-y += cardreader/ diff --git a/drivers/misc/aspeed-espi-slave.c b/drivers/misc/aspeed-espi-slave.c new file mode 100644 -index 000000000000..b0fc01692d3a +index 000000000000..d70332d1fef3 --- /dev/null +++ b/drivers/misc/aspeed-espi-slave.c @@ -0,0 +1,421 @@ -- cgit v1.2.3