meta-hpe: Update Linux kernel to 5.10 from 5.7
Linux kernel and DTS updates
Signed-off-by: Mike Garrett <mike.garrett@hpe.com>
Change-Id: I365e1b6d1d060c131c9d7a1b0f76ef9256f0e73f
diff --git a/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts b/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts
index c11ccb0..92f933b 100644
--- a/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts
+++ b/meta-hpe/meta-dl360poc/recipes-kernel/linux/linux-obmc/gxp.dts
@@ -44,7 +44,7 @@
interrupt-parent = <&vic0>;
clock-frequency = <400000000>;
};
-
+
watchdog: watchdog@c0000090 {
compatible = "hpe,gxp-wdt";
reg = <0xc0000090 0x02>, <0xc0000096 0x01>;
@@ -82,7 +82,7 @@
reg = <0x80fc0230 0x100>;
reg-io-width = <1>;
};
-
+
vuart_a: vuart_a@80fd0200 {
compatible = "hpe,gxp-vuart";
reg = <0x80fd0200 0x100>;
@@ -94,7 +94,21 @@
serial-line = <3>;
vuart_cfg = <&vuart_a_cfg>;
};
-
+
+ usb0: ehci@cefe0000 {
+ compatible = "generic-ehci";
+ reg = <0xcefe0000 0x100>;
+ interrupts = <7>;
+ interrupt-parent = <&vic0>;
+ };
+
+ usb1: ohci@cefe0100 {
+ compatible = "generic-ohci";
+ reg = <0xcefe0100 0x110>;
+ interrupts = <6>;
+ interrupt-parent = <&vic0>;
+ };
+
spifi0: spifi@c0000200 {
compatible = "hpe,gxp-spifi";
reg = <0xc0000200 0x80>, <0xc000c000 0x100>, <0xf8000000 0x8000000>;
@@ -110,7 +124,11 @@
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
-
+
+ bmc@0 {
+ label = "bmc";
+ reg = <0x0 0x2000000>;
+ };
u-boot@0 {
label = "u-boot";
reg = <0x0 0x60000>;
@@ -132,7 +150,7 @@
reg = <0x1c80000 0x250000>;
};
section@1edf000{
- labele = "section";
+ label = "section";
reg = <0x1ed0000 0x130000>;
};
};
@@ -197,7 +215,7 @@
compatible = "syscon";
reg = <0xc00000f8 0x08>;
};
-
+
i2c0: i2c@c0002000 {
compatible = "hpe,gxp-i2c";
reg = <0xc0002000 0x70>;
@@ -227,8 +245,8 @@
#address-cells = <1>;
#size-cells = <0>;
- at24c02@50 {
- compatible = "at24,24c02";
+ 24c02@50 {
+ compatible = "atmel,24c02";
pagesize = <8>;
reg = <0x50>;
};
@@ -260,18 +278,6 @@
interrupts = <9>;
interrupt-parent = <&vic0>;
i2cg-handle = <&i2cg>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- emc1402@4c {
- compatible = "emc1402";
- reg = <0x4c>;
- };
-
- emc1404@1c {
- compatible = "emc1404";
- reg = <0x1c>;
- };
};
i2c6: i2c@c0002600 {
@@ -441,7 +447,7 @@
compatible = "hpe,gxp-kcs-bmc-cfg", "simple-mfd", "syscon";
reg = <0x80fc0430 0x100>;
};
-
+
kcs_reg: kcs_reg@080fd0400 {
compatible = "hpe,gxp-kcs-bmc";
reg = <0x80fd0400 0x8>;
@@ -460,9 +466,23 @@
height = <600>;
};
- xreg: xreg@d1000000 {
+ xreg: xreg@d1000300 {
compatible = "hpe,gxp-xreg", "simple-mfd", "syscon";
reg = <0xd1000300 0xFF>;
+ interrupts = <26>;
+ interrupt-parent = <&vic0>;
+ #gpio-cells = <2>;
+ gpio-line-names =
+ "", "", "", "", "", "", "POWER", "HEARTBEAT", "FAN1_INST", "FAN2_INST",
+ "FAN3_INST", "FAN4_INST", "FAN5_INST", "FAN6_INST", "FAN7_INST", "FAN8_INST", "FAN9_INST", "FAN10_INST", "FAN11_INST", "FAN12_INST",
+ "FAN13_INST", "FAN14_INST", "FAN15_INST", "FAN16_INST", "FAN1_FAIL", "FAN2_FAIL", "FAN3_FAIL", "FAN4_FAIL", "FAN5_FAIL", "FAN6_FAIL",
+ "FAN7_FAIL", "FAN8_FAIL", "FAN9_FAIL", "FAN10_FAIL", "FAN11_FAIL", "FAN12_FAIL", "FAN13_FAIL", "FAN14_FAIL", "FAN15_FAIL", "FAN16_FAIL",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "IDENTIFY", "HEALTH_RED", "HEALTH_AMBER", "POWER_BUTTON",
+ "", "SIO_POWER_GOOD", "NMI_BUTTON", "RESET_BUTTON", "SIO_S5", "SIO_ONCONTROL", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "";
};
fanctrl: fanctrl@c1000c00 {
@@ -475,154 +495,107 @@
fn2: fn2@80200000 {
compatible = "hpe,gxp-fn2", "simple-mfd", "syscon";
reg = <0x80200000 0x100000>;
+ xreg_handle = <&xreg>;
interrupts = <0>;
interrupt-parent = <&vic1>;
+ #gpio-cells = <2>;
+ gpio-line-names =
+ "POWER_OUT", "PS_PWROK", "PCIERST", "POST_COMPLETE", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "";
+ chif {
+ compatible = "hpe,gxp-chif";
+ interrupts = <12>;
+ };
};
csm: csm@80000000 {
compatible = "hpe,gxp-csm", "simple-mfd", "syscon";
- reg = <0x80000000 0x100000>;
+ reg = <0x80000000 0x400>;
};
- gpio: gpio {
+ gpio: gpio@0 {
compatible = "hpe,gxp-gpio";
#gpio-cells = <2>;
csm_handle = <&csm>;
- fn2_handle = <&fn2>;
- xreg_handle = <&xreg>;
vuhc0_handle = <&vuhc0>;
- interrupts = <26>;
- interrupt-parent = <&vic0>;
+ gpio-line-names =
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "RESET_OUT", "NMI_OUT", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "",
+ "", "", "", "", "", "", "", "", "", "";
};
leds: leds {
compatible = "gpio-leds";
power {
- gpios = <&gpio 306 0>;
+ gpios = <&xreg 6 0>;
default-state = "off";
};
heartbeat {
- gpios = <&gpio 307 0>;
+ gpios = <&xreg 7 0>;
default-state = "off";
};
identify {
- gpios = <&gpio 356 0>;
+ gpios = <&xreg 56 0>;
default-state = "off";
};
health_red {
- gpios = <&gpio 357 0>;
+ gpios = <&xreg 57 0>;
default-state = "off";
};
health_amber {
- gpios = <&gpio 358 0>;
+ gpios = <&xreg 58 0>;
default-state = "off";
};
};
- presence: presence {
+ xreg_kyes: xreg_keys {
compatible = "gpio-keys-polled";
poll-interval = <100>;
- autorepeat;
- fan1 {
- label = "fan1 presence";
+ IdButton {
+ label = "ID Button";
linux,code = <200>;
- gpios = <&gpio 308 0>;
- };
-
- fan2 {
- label = "fan2 presence";
- linux,code = <201>;
- gpios = <&gpio 309 0>;
- };
-
- fan3 {
- label = "fan3 presence";
- linux,code = <202>;
- gpios = <&gpio 310 0>;
- };
-
- fan4 {
- label = "fan4 presence";
- linux,code = <203>;
- gpios = <&gpio 311 0>;
- };
-
- fan5 {
- label = "fan5 presence";
- linux,code = <204>;
- gpios = <&gpio 312 0>;
- };
-
- fan6 {
- label = "fan6 presence";
- linux,code = <205>;
- gpios = <&gpio 313 0>;
- };
-
- fan7 {
- label = "fan7 presence";
- linux,code = <206>;
- gpios = <&gpio 314 0>;
- };
-
- fan8 {
- label = "fan8 presence";
- linux,code = <207>;
- gpios = <&gpio 315 0>;
- };
-
- fan9 {
- label = "fan9 presence";
- linux,code = <208>;
- gpios = <&gpio 316 0>;
- };
-
- fan10 {
- label = "fan10 presence";
- linux,code = <209>;
- gpios = <&gpio 317 0>;
- };
-
- fan11 {
- label = "fan11 presence";
- linux,code = <210>;
- gpios = <&gpio 318 0>;
- };
-
- fan12 {
- label = "fan12 presence";
- linux,code = <211>;
- gpios = <&gpio 319 0>;
- };
-
- fan13 {
- label = "fan13 presence";
- linux,code = <212>;
- gpios = <&gpio 320 0>;
- };
-
- fan14 {
- label = "fan14 presence";
- linux,code = <213>;
- gpios = <&gpio 321 0>;
- };
-
- fan15 {
- label = "fan15 presence";
- linux,code = <214>;
- gpios = <&gpio 322 0>;
- };
-
- fan16 {
- label = "fan16 presence";
- linux,code = <215>;
- gpios = <&gpio 323 0>;
+ gpios = <&xreg 60 1>;
};
};
@@ -641,6 +614,12 @@
linux,code = <201>;
gpios = <&gpio 251 1>;
};
+
+ PortOwner@2 {
+ label = "Port Owner";
+ linux,code = <202>;
+ gpios = <&gpio 252 1>;
+ };
};
vuhc0: vuhc@80400080 {
@@ -659,7 +638,7 @@
interrupts = <13>;
interrupt-parent = <&vic1>;
vdevnum = <0>;
- fepnum = <7>;
+ fepnum = <4>;
udcg-handle = <&udcg>;
};
@@ -669,7 +648,17 @@
interrupts = <13>;
interrupt-parent = <&vic1>;
vdevnum = <1>;
- fepnum = <7>;
+ fepnum = <4>;
+ udcg-handle = <&udcg>;
+ };
+
+ udc2: udc@80403000 {
+ compatible = "hpe, gxp-udc";
+ reg = <0x80403000 0x1000>;
+ interrupts = <13>;
+ interrupt-parent = <&vic1>;
+ vdevnum = <2>;
+ fepnum = <4>;
udcg-handle = <&udcg>;
};
@@ -682,6 +671,13 @@
compatible = "hpe,gxp-power";
psu_phandle = <&psu1>, <&psu2>;
};
+
+ peci: peci@80000400 {
+ compatible = "hpe,gxp-peci";
+ reg = <0x80000400 0x200>;
+ interrupts = <22>;
+ interrupt-parent = <&vic1>;
+ };
};
clocks {