arm: dts: intel s2600wf dts fixups

Add fixups for Intel S2600WF dts.

Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>

1 files changed, 343 insertions, 19 deletions

diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
index d5b7d28cda88..3b8d0c75c74e 100644
--- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
@@ -3,14 +3,20 @@
 /dts-v1/;
 
 #include "aspeed-g5.dtsi"
+#include <dt-bindings/gpio/aspeed-gpio.h>
+#include <dt-bindings/i2c/i2c.h>
 
 / {
-	model = "S2600WF BMC";
+	model = "Intel S2600WF BMC";
 	compatible = "intel,s2600wf-bmc", "aspeed,ast2500";
 
+	aliases {
+		serial4 = &uart5;
+	};
+
 	chosen {
 		stdout-path = &uart5;
-		bootargs = "earlycon";
+		bootargs = "console=ttyS4,115200 earlycon";
 	};
 
 	memory@80000000 {
@@ -26,6 +32,32 @@
 			no-map;
 			reg = <0x9f000000 0x01000000>; /* 16M */
 		};
+
+		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;
+		};
+
+		ramoops@9eff0000{
+			compatible = "ramoops";
+			reg = <0x9eff0000 0x10000>;
+			record-size = <0x2000>;
+			console-size = <0x2000>;
+		};
+	};
+
+	vga-shared-memory {
+		compatible = "aspeed,ast2500-vga-sharedmem";
+		reg = <0x9ff00000 0x100000>;
 	};
 
 	iio-hwmon {
@@ -36,6 +68,29 @@
 			<&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
 	};
 
+	leds {
+		compatible = "gpio-leds";
+
+		identify {
+			default-state = "on";
+			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>;
+		};
+	};
+
+	beeper {
+		compatible = "pwm-beeper";
+		pwms = <&timer 5 1000000 0>;
+	};
 };
 
 &fmc {
@@ -44,35 +99,204 @@
 		status = "okay";
 		m25p,fast-read;
 		label = "bmc";
-#include "openbmc-flash-layout.dtsi"
+#include "openbmc-flash-layout-intel-64MB.dtsi"
 	};
 };
 
-&spi1 {
+&espi {
 	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_spi1_default>;
+};
 
-	flash@0 {
-		status = "okay";
-		m25p,fast-read;
-		label = "pnor";
+&jtag {
+	status = "okay";
+};
+
+&peci0 {
+	status = "okay";
+	gpios = <&gpio ASPEED_GPIO(F, 6) 0>;
+};
+
+&syscon {
+	uart-clock-high-speed;
+	status = "okay";
+
+	misc_control {
+		compatible = "aspeed,bmc-misc";
+		uart_port_debug {
+			offset = <0x2c>;
+			bit-mask = <0x1>;
+			bit-shift = <10>;
+			read-only;
+		};
+		p2a-bridge {
+			offset = <0x180>;
+			bit-mask = <0x1>;
+			bit-shift = <1>;
+			read-only;
+		};
+		boot-2nd-flash {
+			offset = <0x70>;
+			bit-mask = <0x1>;
+			bit-shift = <17>;
+			read-only;
+		};
+		chip_id {
+			offset = <0x150>;
+			bit-mask = <0x0fffffff 0xffffffff>;
+			bit-shift = <0>;
+			read-only;
+			reg-width = <64>;
+			hash-data = "d44f9b804976fa23c2e25d62f16154d26520a7e24c5555095fd1b55c027804f1570dcd16189739c640cd7d9a6ce14944a2c4eaf1dc429eed6940e8a83498a474";
+		};
 	};
 };
 
-&uart5 {
+&adc {
 	status = "okay";
 };
 
-&mac0 {
+&gpio {
+	status = "okay";
+	/* Enable GPIOE0 and GPIOE2 pass-through by default */
+	pinctrl-names = "pass-through";
+	pinctrl-0 = <&pinctrl_gpie0_default
+			&pinctrl_gpie2_default>;
+	gpio-line-names =
+	/*A0-A7*/	"","","","","","","","",
+	/*B0-B7*/	"","","","","","","","",
+	/*C0-C7*/	"","","","","","","","",
+	/*D0-D7*/	"","","","","","","","",
+	/*E0-E7*/	"RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","",
+	/*F0-F7*/	"NMI_OUT","","","","CPU_ERR0","CPU_ERR1","","",
+	/*G0-G7*/	"CPU_ERR2","CPU_CATERR","PCH_BMC_THERMTRIP","LCP_ENTER_BUTTON","LCP_LEFT_BUTTON","FM_BMC_BOARD_SKU_ID5_N","","",
+	/*H0-H7*/	"","","","FM_NODE_ID_1","FM_NODE_ID_2","FM_NODE_ID_3","FM_NODE_ID_4","FM_240VA_STATUS",
+	/*I0-I7*/	"FM_SYS_FAN0_PRSNT_D_N","FM_SYS_FAN1_PRSNT_D_N","FM_SYS_FAN2_PRSNT_D_N","FM_SYS_FAN3_PRSNT_D_N","FM_SYS_FAN4_PRSNT_D_N","FM_SYS_FAN5_PRSNT_D_N","","",
+	/*J0-J7*/	"","","","","","","","",
+	/*K0-K7*/	"","","","","","","","",
+	/*L0-L7*/	"","","","","","","","",
+	/*M0-M7*/	"","","","","","","","",
+	/*N0-N7*/	"","","","","","","","",
+	/*O0-O7*/	"","","","","","","","",
+	/*P0-P7*/	"","","","","","","","",
+	/*Q0-Q7*/	"","","","","","","","PWR_DEBUG_N",
+	/*R0-R7*/	"","XDP_PRST_N","","","","","","CHASSIS_INTRUSION",
+	/*S0-S7*/	"REMOTE_DEBUG_ENABLE","SYSPWROK","RSMRST_N","","","","","",
+	/*T0-T7*/	"","","","","","","","",
+	/*U0-U7*/	"","","","","","","","",
+	/*V0-V7*/	"","","","","","","","",
+	/*W0-W7*/	"","","","","","","","",
+	/*X0-X7*/	"","","","","","","","",
+	/*Y0-Y7*/	"SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","",
+	/*Z0-Z7*/	"","SIO_POWER_GOOD","","","","","","",
+	/*AA0-AA7*/	"P3VBAT_BRIDGE_EN","","","","PREQ_N","TCK_MUX_SEL","SMI","POST_COMPLETE",
+	/*AB0-AB7*/	"","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","",
+	/*AC0-AC7*/	"","","","","","","","";
+};
+
+&sgpio {
 	status = "okay";
+	gpio-line-names =
+	/* SGPIO output lines */
+	/*OA0-OA7*/	"","","","","","","","",
+	/*OB0-OB7*/	"LED_CPU1_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU1_CH2_DIMM1_FAULT","LED_CPU1_CH2_DIMM2_FAULT","LED_CPU1_CH3_DIMM1_FAULT","LED_CPU1_CH3_DIMM2_FAULT","LED_CPU1_CH4_DIMM1_FAULT","LED_CPU1_CH4_DIMM2_FAULT",
+	/*OC0-OC7*/	"LED_CPU1_CH5_DIMM1_FAULT","LED_CPU1_CH5_DIMM2_FAULT","LED_CPU1_CH6_DIMM1_FAULT","LED_CPU1_CH6_DIMM2_FAULT","LED_FAN1_FAULT","LED_FAN2_FAULT","LED_FAN3_FAULT","LED_FAN4_FAULT",
+	/*OD0-OD7*/	"LED_FAN5_FAULT","LED_FAN6_FAULT","LED_FAN7_FAULT","LED_FAN8_FAULT","LED_CPU2_CH1_DIMM1_FAULT","LED_CPU1_CH1_DIMM2_FAULT","LED_CPU2_CH2_DIMM1_FAULT","LED_CPU2_CH2_DIMM2_FAULT",
+	/*OE0-OE7*/	"LED_CPU2_CH3_DIMM1_FAULT","LED_CPU2_CH3_DIMM2_FAULT","LED_CPU2_CH4_DIMM1_FAULT","LED_CPU2_CH4_DIMM2_FAULT","LED_CPU2_CH5_DIMM1_FAULT","LED_CPU2_CH5_DIMM2_FAULT","LED_CPU2_CH6_DIMM1_FAULT","LED_CPU2_CH6_DIMM2_FAULT",
+	/*OF0-OF7*/	"LED_CPU3_CH1_DIMM1_FAULT","LED_CPU3_CH1_DIMM2_FAULT","LED_CPU3_CH2_DIMM1_FAULT","LED_CPU3_CH2_DIMM2_FAULT","LED_CPU3_CH3_DIMM1_FAULT","LED_CPU3_CH3_DIMM2_FAULT","LED_CPU3_CH4_DIMM1_FAULT","LED_CPU3_CH4_DIMM2_FAULT",
+	/*OG0-OG7*/	"LED_CPU3_CH5_DIMM1_FAULT","LED_CPU3_CH5_DIMM2_FAULT","LED_CPU3_CH6_DIMM1_FAULT","LED_CPU3_CH6_DIMM2_FAULT","LED_CPU4_CH1_DIMM1_FAULT","LED_CPU4_CH1_DIMM2_FAULT","LED_CPU4_CH2_DIMM1_FAULT","LED_CPU4_CH2_DIMM2_FAULT",
+	/*OH0-OH7*/	"LED_CPU4_CH3_DIMM1_FAULT","LED_CPU4_CH3_DIMM2_FAULT","LED_CPU4_CH4_DIMM1_FAULT","LED_CPU4_CH4_DIMM2_FAULT","LED_CPU4_CH5_DIMM1_FAULT","LED_CPU4_CH5_DIMM2_FAULT","LED_CPU4_CH6_DIMM1_FAULT","LED_CPU4_CH6_DIMM2_FAULT",
+	/*OI0-OI7*/	"","","","","","","","",
+	/*OJ0-OJ7*/	"","","","","","","","",
+	/*DUMMY*/	"","","","","","","","",
+	/*DUMMY*/	"","","","","","","","",
 
+	/* SGPIO input lines */
+	/*IA0-IA7*/	"CPU1_PRESENCE","CPU1_THERMTRIP","CPU1_VRHOT","CPU1_FIVR_FAULT","CPU1_MEM_ABCD_VRHOT","CPU1_MEM_EFGH_VRHOT","","",
+	/*IB0-IB7*/	"CPU1_MISMATCH","CPU1_MEM_THERM_EVENT","CPU2_PRESENCE","CPU2_THERMTRIP","CPU2_VRHOT","CPU2_FIVR_FAULT","CPU2_MEM_ABCD_VRHOT","CPU2_MEM_EFGH_VRHOT",
+	/*IC0-IC7*/	"","","CPU2_MISMATCH","CPU2_MEM_THERM_EVENT","","","","",
+	/*ID0-ID7*/	"","","","","","","","",
+	/*IE0-IE7*/	"","","","","","","","",
+	/*IF0-IF7*/	"SGPIO_PLD_MINOR_REV_BIT0","SGPIO_PLD_MINOR_REV_BIT1","SGPIO_PLD_MINOR_REV_BIT2","SGPIO_PLD_MINOR_REV_BIT3","SGPIO_PLD_MAJOR_REV_BIT0","SGPIO_PLD_MAJOR_REV_BIT1","SGPIO_PLD_MAJOR_REV_BIT2","SGPIO_PLD_MAJOR_REV_BIT3",
+	/*IG0-IG7*/	"MAIN_PLD_MINOR_REV_BIT0","MAIN_PLD_MINOR_REV_BIT1","MAIN_PLD_MINOR_REV_BIT2","MAIN_PLD_MINOR_REV_BIT3","MAIN_PLD_MAJOR_REV_BIT0","MAIN_PLD_MAJOR_REV_BIT1","MAIN_PLD_MAJOR_REV_BIT2","MAIN_PLD_MAJOR_REV_BIT3",
+	/*IH0-IH7*/	"","","","","","","","",
+	/*II0-II7*/	"","","","","","","","",
+	/*IJ0-IJ7*/	"","","","","","","","";
+};
+
+&kcs3 {
+	kcs_addr = <0xCA2>;
+	status = "okay";
+};
+
+&kcs4 {
+	kcs_addr = <0xCA4>;
+	status = "okay";
+};
+
+&sio_regs {
+	status = "okay";
+	sio_status {
+		offset = <0x8C>;
+		bit-mask = <0x1F>;
+		bit-shift = <4>;
+	};
+};
+
+&lpc_sio {
+	status = "okay";
+};
+
+&lpc_snoop {
+	snoop-ports = <0x80>;
+	status = "okay";
+};
+
+&mbox {
+	status = "okay";
+};
+
+&uart_routing {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_rmii1_default>;
-	clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>,
-		 <&syscon ASPEED_CLK_MAC1RCLK>;
-	clock-names = "MACCLK", "RCLK";
-	use-ncsi;
+	pinctrl-0 = <&pinctrl_txd1_default
+			&pinctrl_rxd1_default
+			&pinctrl_nrts1_default
+			&pinctrl_ndtr1_default
+			&pinctrl_ndsr1_default
+			&pinctrl_ncts1_default
+			&pinctrl_ndcd1_default
+			&pinctrl_nri1_default>;
+};
+
+&uart2 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_txd2_default
+			&pinctrl_rxd2_default
+			&pinctrl_nrts2_default
+			&pinctrl_ndtr2_default
+			&pinctrl_ndsr2_default
+			&pinctrl_ncts2_default
+			&pinctrl_ndcd2_default
+			&pinctrl_nri2_default>;
+};
+
+&uart3 {
+	status = "okay";
+};
+
+&uart4 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <>;
+};
+
+&uart5 {
+	status = "okay";
 };
 
 &mac1 {
@@ -82,44 +306,87 @@
 	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
 };
 
+&mac0 {
+	status = "okay";
+	use-ncsi;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_rmii1_default>;
+};
+
+&i2c0 {
+	multi-master;
+	general-call;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
+	status = "okay";
+};
+
 &i2c1 {
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c2 {
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c3 {
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c4 {
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c5 {
+	bus-frequency = <1000000>;
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c6 {
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c7 {
+	multi-master;
+	#retries = <3>;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &i2c13 {
+	multi-master;
+	aspeed,dma-buf-size = <4095>;
+	aspeed,hw-timeout-ms = <300>;
 	status = "okay";
 };
 
 &gfx {
 	status = "okay";
+	memory-region = <&gfx_memory>;
 };
 
-&pinctrl {
-	aspeed,external-nodes = <&gfx &lhc>;
+&vuart {
+	status = "okay";
 };
 
 &pwm_tacho {
@@ -129,4 +396,61 @@
 			 &pinctrl_pwm2_default &pinctrl_pwm3_default
 			 &pinctrl_pwm4_default &pinctrl_pwm5_default
 			 &pinctrl_pwm6_default &pinctrl_pwm7_default>;
+
+	fan@0 {
+		reg = <0x00>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>;
+	};
+	fan@1 {
+		reg = <0x01>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>;
+	};
+	fan@2 {
+		reg = <0x02>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>;
+	};
+	fan@3 {
+		reg = <0x03>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>;
+	};
+	fan@4 {
+		reg = <0x04>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x08 0x09>;
+	};
+	fan@5 {
+		reg = <0x05>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x0A 0x0B>;
+	};
+	fan@6 {
+		reg = <0x06>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x0C 0x0D>;
+	};
+	fan@7 {
+		reg = <0x07>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x0E 0x0F>;
+	};
+
+};
+
+&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 = <6>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_timer6_default>;
+	#pwm-cells = <3>;
+	status = "okay";
+};
+
+&video {
+	status = "okay";
+	memory-region = <&video_engine_memory>;
+};
+
+&vhub {
+	status = "okay";
 };