meta-vesnin: Use VESNIN DTS from kernel repo
Switches to using the upstreamed version of VESNIN DTS.
Change-Id: Ib853442ca607cb622ebe5379d62e93d0107d836e
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
diff --git a/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-YADRO-VESNIN-BMC.patch b/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-YADRO-VESNIN-BMC.patch
deleted file mode 100644
index 03a1022..0000000
--- a/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-YADRO-VESNIN-BMC.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 99c53c63a485a7cf929e0bae9e1db2e6a288153b Mon Sep 17 00:00:00 2001
-From: Alexander Filippov <a.filippov@yadro.com>
-Date: Tue, 19 Feb 2019 15:02:06 +0300
-Subject: [PATCH] ARM: dts: aspeed: Add YADRO VESNIN BMC
-
-VESNIN is an OpenPower machine with an Aspeed 2400 BMC SoC manufactured
-by YADRO.
-
-Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
----
- arch/arm/boot/dts/Makefile | 1 +
- arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 234 ++++++++++++++++++++
- 2 files changed, 235 insertions(+)
- create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 834cce80d1b8..811e9312cf22 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -1259,6 +1259,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
- aspeed-bmc-microsoft-olympus.dtb \
- aspeed-bmc-opp-lanyang.dtb \
- aspeed-bmc-opp-palmetto.dtb \
-+ aspeed-bmc-opp-vesnin.dtb \
- aspeed-bmc-opp-romulus.dtb \
- aspeed-bmc-opp-swift.dtb \
- aspeed-bmc-opp-witherspoon.dtb \
-diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
-new file mode 100644
-index 000000000000..20f07f5bb4f4
---- /dev/null
-+++ b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
-@@ -0,0 +1,234 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// Copyright 2019 YADRO
-+/dts-v1/;
-+
-+#include "aspeed-g4.dtsi"
-+#include <dt-bindings/gpio/aspeed-gpio.h>
-+
-+/ {
-+ model = "Vesnin BMC";
-+ compatible = "yadro,vesnin-bmc", "aspeed,ast2400";
-+
-+ chosen {
-+ stdout-path = &uart5;
-+ bootargs = "console=ttyS4,115200 earlyprintk";
-+ };
-+
-+ memory {
-+ reg = <0x40000000 0x20000000>;
-+ };
-+
-+ reserved-memory {
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+ ranges;
-+
-+ vga_memory: framebuffer@5f000000 {
-+ no-map;
-+ reg = <0x5f000000 0x01000000>; /* 16MB */
-+ };
-+ flash_memory: region@5c000000 {
-+ no-map;
-+ reg = <0x5c000000 0x02000000>; /* 32M */
-+ };
-+ };
-+
-+ leds {
-+ compatible = "gpio-leds";
-+
-+ heartbeat {
-+ gpios = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_LOW>;
-+ };
-+ power_red {
-+ gpios = <&gpio ASPEED_GPIO(N, 1) GPIO_ACTIVE_LOW>;
-+ };
-+
-+ id_blue {
-+ gpios = <&gpio ASPEED_GPIO(O, 0) GPIO_ACTIVE_LOW>;
-+ };
-+
-+ alarm_red {
-+ gpios = <&gpio ASPEED_GPIO(N, 6) GPIO_ACTIVE_LOW>;
-+ };
-+
-+ alarm_yel {
-+ gpios = <&gpio ASPEED_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
-+ };
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+
-+ button_checkstop {
-+ label = "checkstop";
-+ linux,code = <74>;
-+ gpios = <&gpio ASPEED_GPIO(P, 5) GPIO_ACTIVE_LOW>;
-+ };
-+
-+ button_identify {
-+ label = "identify";
-+ linux,code = <152>;
-+ gpios = <&gpio ASPEED_GPIO(O, 7) GPIO_ACTIVE_LOW>;
-+ };
-+ };
-+};
-+
-+&fmc {
-+ status = "okay";
-+ flash@0 {
-+ status = "okay";
-+ m25p,fast-read;
-+ label = "bmc";
-+#include "openbmc-flash-layout.dtsi"
-+ };
-+};
-+
-+&spi {
-+ status = "okay";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_spi1debug_default>;
-+
-+ flash@0 {
-+ status = "okay";
-+ label = "pnor";
-+ m25p,fast-read;
-+ };
-+};
-+
-+&mac0 {
-+ status = "okay";
-+
-+ use-ncsi;
-+ no-hw-checksum;
-+
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_rmii1_default>;
-+};
-+
-+
-+&uart5 {
-+ status = "okay";
-+};
-+
-+&lpc_ctrl {
-+ status = "okay";
-+ memory-region = <&flash_memory>;
-+ flash = <&spi>;
-+};
-+
-+&ibt {
-+ status = "okay";
-+};
-+
-+&lpc_host {
-+ sio_regs: regs {
-+ compatible = "aspeed,bmc-misc";
-+ };
-+};
-+
-+&mbox {
-+ status = "okay";
-+};
-+
-+&uart3 {
-+ status = "okay";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_txd2_default &pinctrl_rxd2_default>;
-+};
-+
-+&i2c0 {
-+ status = "okay";
-+
-+ eeprom@50 {
-+ compatible = "atmel,24c256";
-+ reg = <0x50>;
-+ pagesize = <64>;
-+ };
-+};
-+
-+&i2c1 {
-+ status = "okay";
-+
-+ tmp75@49 {
-+ compatible = "ti,tmp75";
-+ reg = <0x49>;
-+ };
-+};
-+
-+&i2c2 {
-+ status = "okay";
-+};
-+
-+&i2c3 {
-+ status = "okay";
-+};
-+
-+&i2c4 {
-+ status = "okay";
-+
-+ occ-hwmon@50 {
-+ compatible = "ibm,p8-occ-hwmon";
-+ reg = <0x50>;
-+ };
-+};
-+
-+&i2c5 {
-+ status = "okay";
-+
-+ occ-hwmon@51 {
-+ compatible = "ibm,p8-occ-hwmon";
-+ reg = <0x51>;
-+ };
-+};
-+
-+&i2c6 {
-+ status = "okay";
-+
-+ w83795g@2f {
-+ compatible = "nuvoton,w83795g";
-+ reg = <0x2f>;
-+ };
-+};
-+
-+&i2c7 {
-+ status = "okay";
-+
-+ occ-hwmon@56 {
-+ compatible = "ibm,p8-occ-hwmon";
-+ reg = <0x56>;
-+ };
-+};
-+
-+&i2c9 {
-+ status = "okay";
-+};
-+
-+&i2c10 {
-+ status = "okay";
-+};
-+
-+&i2c11 {
-+ status = "okay";
-+
-+ occ-hwmon@57 {
-+ compatible = "ibm,p8-occ-hwmon";
-+ reg = <0x57>;
-+ };
-+};
-+
-+&i2c12 {
-+ status = "okay";
-+
-+ rtc@68 {
-+ compatible = "maxim,ds3231";
-+ reg = <0x68>;
-+ };
-+};
-+
-+&i2c13 {
-+ status = "okay";
-+};
-+
-+&vuart {
-+ status = "okay";
-+};
---
-2.20.1
-
diff --git a/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-vesnin-dts-add-mbox-and-lpc_host.patch b/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-vesnin-dts-add-mbox-and-lpc_host.patch
new file mode 100644
index 0000000..ba03640
--- /dev/null
+++ b/meta-vesnin/recipes-kernel/linux/linux-aspeed/0001-vesnin-dts-add-mbox-and-lpc_host.patch
@@ -0,0 +1,38 @@
+From 229cd43c240a8395ac6ed684a5eee7a0586f9724 Mon Sep 17 00:00:00 2001
+From: Alexander Filippov <a.filippov@yadro.com>
+Date: Tue, 4 Jun 2019 14:12:00 +0300
+Subject: [PATCH] vesnin: dts: add mbox and lpc_host
+
+These nodes were removed from our DTS by the ask of Andrew Jeffery as
+its are not upstreamed yet. But its are still required to start the
+host.
+
+Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
+---
+ arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
+index 0b9e29c3212e..20f07f5bb4f4 100644
+--- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
++++ b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
+@@ -120,6 +120,16 @@
+ status = "okay";
+ };
+
++&lpc_host {
++ sio_regs: regs {
++ compatible = "aspeed,bmc-misc";
++ };
++};
++
++&mbox {
++ status = "okay";
++};
++
+ &uart3 {
+ status = "okay";
+ pinctrl-names = "default";
+--
+2.20.1
+
diff --git a/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend
index d0fc46a..5a89253 100644
--- a/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append_vesnin = "\
file://vesnin.cfg \
- file://0001-ARM-dts-aspeed-Add-YADRO-VESNIN-BMC.patch \
+ file://0001-vesnin-dts-add-mbox-and-lpc_host.patch \
file://0002-vesnin-remap-aspeed-uart.patch \
"