summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2019-04-19 12:10:53 +0000
committerRaptor Engineering Development Team <support@raptorengineering.com>2019-04-23 20:12:32 +0000
commitd7fceb7a4f0770e577078f1d2cb48380a06b61f8 (patch)
tree344fdd7b11dbf0369153ef9843d7ef2da0701405 /arch
parent6fd02e9300bb4749750874b7c1735fd0ffc07ba9 (diff)
downloadtalos-obmc-linux-d7fceb7a4f0770e577078f1d2cb48380a06b61f8.tar.gz
talos-obmc-linux-d7fceb7a4f0770e577078f1d2cb48380a06b61f8.zip
Update Talos dts for latest kernel
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/aspeed-bmc-opp-talos.dts75
1 files changed, 68 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-talos.dts b/arch/arm/boot/dts/aspeed-bmc-opp-talos.dts
index cd78c38e2be1..d9ab6c5fd55b 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-talos.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-talos.dts
@@ -12,7 +12,7 @@
bootargs = "console=ttyS4,115200 earlyprintk";
};
- memory {
+ memory@80000000 {
reg = <0x80000000 0x20000000>;
};
@@ -21,15 +21,34 @@
#size-cells = <1>;
ranges;
- vga_memory: framebuffer@bf000000 {
+ vga_memory: framebuffer@9f000000 {
no-map;
- reg = <0xbf000000 0x01000000>; /* 16M */
+ reg = <0x9f000000 0x01000000>; /* 16M */
};
flash_memory: region@98000000 {
no-map;
reg = <0x98000000 0x04000000>; /* 64M */
};
+
+ coldfire_memory: codefire_memory@9ef00000 {
+ reg = <0x9ef00000 0x00100000>;
+ no-map;
+ };
+
+ gfx_memory: framebuffer {
+ size = <0x01000000>;
+ alignment = <0x01000000>;
+ compatible = "shared-dma-pool";
+ reusable;
+ };
+
+ video_engine_memory: jpegbuffer {
+ size = <0x02000000>; /* 32M */
+ alignment = <0x01000000>;
+ compatible = "shared-dma-pool";
+ reusable;
+ };
};
leds {
@@ -57,9 +76,14 @@
};
fsi: gpio-fsi {
- compatible = "fsi-master-gpio", "fsi-master";
+ compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
#address-cells = <2>;
#size-cells = <0>;
+ no-gpio-delays;
+
+ memory-region = <&coldfire_memory>;
+ aspeed,sram = <&sram>;
+ aspeed,cvic = <&cvic>;
clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;
@@ -76,10 +100,20 @@
gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(J, 2)>;
};
+
+ id-button {
+ label = "id-button";
+ gpios = <&gpio ASPEED_GPIO(Q, 7) GPIO_ACTIVE_LOW>;
+ linux,code = <ASPEED_GPIO(Q, 7)>;
+ };
+ };
+
+ iio-hwmon-battery {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 12>;
};
-};
-#include "ibm-power9-cfam.dtsi"
+};
&pwm_tacho {
status = "okay";
@@ -99,6 +133,7 @@
status = "okay";
m25p,fast-read;
label = "bmc";
+ spi-max-frequency = <50000000>;
#include "openbmc-flash-layout.dtsi"
};
};
@@ -110,8 +145,9 @@
flash@0 {
status = "okay";
- label = "pnor";
m25p,fast-read;
+ label = "pnor";
+ spi-max-frequency = <100000000>;
};
};
@@ -121,6 +157,11 @@
flash = <&spi1>;
};
+&lpc_snoop {
+ status = "okay";
+ snoop-ports = <0x81 0x82>;
+};
+
&mbox {
status = "okay";
};
@@ -429,3 +470,23 @@
&ibt {
status = "okay";
};
+
+&vhub {
+ status = "okay";
+};
+
+&adc {
+ status = "okay";
+};
+
+&gfx {
+ status = "okay";
+ memory-region = <&gfx_memory>;
+};
+
+&video {
+ status = "okay";
+ memory-region = <&video_engine_memory>;
+};
+
+#include "ibm-power9-dual.dtsi"
OpenPOWER on IntegriCloud