diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-03-18 23:46:22 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-03-20 21:21:06 +0300 |
| commit | 225376f0a37ee9b6f20626e5f377d8833ea1727f (patch) | |
| tree | bc590b26d8bdd06b6459c4debaa3041207e5c2cc /meta-openbmc-mods/meta-wolfpass/recipes-kernel | |
| parent | e5c10e334eee83873c5bc09aac722e12c802c5ff (diff) | |
| download | openbmc-225376f0a37ee9b6f20626e5f377d8833ea1727f.tar.xz | |
Update to internal
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-wolfpass/recipes-kernel')
2 files changed, 30 insertions, 10 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 dc3f9846d..518b0067e 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 939070905b0d6d70b2e39d424e0797451efdedf8 Mon Sep 17 00:00:00 2001 +From fb77288a4cb922bea97003a6ece97c527df8a0f2 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. @@ -21,22 +21,23 @@ The below changes to the dts file are merged together: * uart4/serail3 * enable high speed uart clock * timer pwm +* cpu0/1fault LEDs 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 | 347 ++++++++++++++++++++++++++ - 1 file changed, 347 insertions(+) + arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 357 ++++++++++++++++++++++++++ + 1 file changed, 357 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..8a18645e6316 +index 000000000000..4d70d776e330 --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -0,0 +1,347 @@ +@@ -0,0 +1,357 @@ +/dts-v1/; + +#include "aspeed-g5.dtsi" @@ -100,16 +101,27 @@ index 000000000000..8a18645e6316 + compatible = "gpio-leds"; + + identify { ++ default-state = "off"; + gpios = <&gpio ASPEED_GPIO(S, 6) GPIO_ACTIVE_LOW>; + }; + + status_amber { ++ default-state = "off"; + gpios = <&gpio ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>; + }; + + status_green { ++ default-state = "keep"; + gpios = <&gpio ASPEED_GPIO(S, 4) GPIO_ACTIVE_LOW>; + }; ++ ++ cpu0fault { ++ gpios = <&gpio ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>; ++ }; ++ ++ cpu1fault { ++ gpios = <&gpio ASPEED_GPIO(F, 5) GPIO_ACTIVE_HIGH>; ++ }; + }; + + beeper { @@ -263,10 +275,12 @@ index 000000000000..8a18645e6316 +}; + +&i2c1 { ++ multi-master; + status = "okay"; +}; + +&i2c2 { ++ multi-master; + status = "okay"; +}; + @@ -297,17 +311,14 @@ index 000000000000..8a18645e6316 +}; + +&i2c6 { ++ multi-master; + status = "okay"; +}; + +&i2c7 { + multi-master; ++ #retries = <3>; + status = "okay"; -+ -+ smlink1-pmbus1@10 { -+ compatible = "slave-mqueue"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ }; +}; + +&gfx { diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg index 9549d4d7b..480d4cc18 100644 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg +++ b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg @@ -8,6 +8,7 @@ CONFIG_ASPEED_ADC=y CONFIG_SGPIO_ASPEED=y CONFIG_CRC8=y CONFIG_PECI=y +CONFIG_PECI_CHARDEV=y CONFIG_PECI_ASPEED=y CONFIG_SENSORS_PECI_CPUTEMP=y CONFIG_SENSORS_PECI_DIMMTEMP=y @@ -58,3 +59,11 @@ CONFIG_PWM=y CONFIG_PWM_FTTMR010=y CONFIG_INPUT_MISC=y CONFIG_INPUT_PWM_BEEPER=y +CONFIG_VFAT_FS=y +CONFIG_NLS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y + |