summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch')
-rw-r--r--meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-Create-intel-purley-dts.patch61
1 files changed, 37 insertions, 24 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 {