Unverified Commit 725523dd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-5.19-devicetree' of... 

Merge tag 'aspeed-5.19-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/late

ASPEED device tree updates for 5.19

 - New machine:

    * Nuvia's DC-SCM BMC

 - Enable AST2600 GFX, the BMC-driven graphics device

 - Add a bunch of devices for the AST2600 EVB

 - Updates to the AST2600 Bletchley machine

 - Backwards compatible changes to support the new spi-mem based SPI NOR
   driver

* tag 'aspeed-5.19-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: ast2600-evb: Enable GFX device
  ARM: dts: aspeed: Add GFX node to AST2600
  ARM: dts: aspeed: ast2600-evb: Enable virtual hub
  ARM: dts: aspeed: ast2600-evb: Enable video engine
  ARM: dts: aspeed: everest, rainier: Add power-ffs-sync-history GPIO
  ARM: dts: aspeed: Add Nuvia DC-SCM BMC
  ARM: dts: aspeed: bletchley: add sample averaging for ADM1278
  ARM: dts: aspeed: bletchley: add eeprom node on each sled
  ARM: dts: aspeed: bletchley: add pca9536 node on each sled
  ARM: dts: aspeed: bletchley: update gpio0 line names
  ARM: dts: aspeed: bletchley: Enable mdio0 bus
  ARM: dts: aspeed: bletchley: switch spi2 driver to aspeed-smc
  ARM: dts: aspeed: bletchley: enable ehci0 device node
  ARM: dts: aspeed: Add USB2.0 device controller node
  ARM: dts: aspeed-g4: Set spi-max-frequency for all flashes
  ARM: dts: aspeed: Enable Dual SPI RX transfers
  ARM: dts: aspeed: Adjust "reg" property of FMC/SPI controllers
  ARM: dts: aspeed: ast2600-evb: Enable RX delay for MAC0/MAC1

Link: https://lore.kernel.org/r/CACPK8XfUmFxU8Y6C+aZ2+=dT7=fCfs2=2_aYqyRjoXCoeQaUWQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8a1e75c5 8dc7aa0a

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1586,6 +1586,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-lenovo-hr630.dtb \

	aspeed-bmc-lenovo-hr855xg2.dtb \

	aspeed-bmc-microsoft-olympus.dtb \

	aspeed-bmc-nuvia-dc-scm.dtb \

	aspeed-bmc-opp-lanyang.dtb \

	aspeed-bmc-opp-mihawk.dtb \

	aspeed-bmc-opp-mowgli.dtb \

arch/arm/boot/dts/aspeed-ast2600-evb.dts

+37 −2
Original line number Diff line number Diff line
@@ -23,6 +23,26 @@ 
		reg = <0x80000000 0x80000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		video_engine_memory: video {

			size = <0x04000000>;

			alignment = <0x01000000>;

			compatible = "shared-dma-pool";

			reusable;

		};



		gfx_memory: framebuffer {

			size = <0x01000000>;

			alignment = <0x01000000>;

			compatible = "shared-dma-pool";

			reusable;

		};

	};



	vcc_sdhci0: regulator-vcc-sdhci0 {

		compatible = "regulator-fixed";

		regulator-name = "SDHCI0 Vcc";
@@ -103,7 +123,7 @@ 
&mac0 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-rxid";

	phy-handle = <&ethphy0>;



	pinctrl-names = "default";
@@ -114,7 +134,7 @@ 
&mac1 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-rxid";

	phy-handle = <&ethphy1>;



	pinctrl-names = "default";
@@ -300,3 +320,18 @@ 
	vqmmc-supply = <&vccq_sdhci1>;

	clk-phase-sd-hs = <7>, <200>;

};



&vhub {

	status = "okay";

	pinctrl-names = "default";

};



&video {

	status = "okay";

	memory-region = <&video_engine_memory>;

};



&gfx {

	status = "okay";

	memory-region = <&gfx_memory>;

};

arch/arm/boot/dts/aspeed-bmc-facebook-bletchley.dts

+147 −35
Original line number Diff line number Diff line
@@ -51,26 +51,6 @@ 
		};

	};



	spi2_gpio: spi2-gpio {

		compatible = "spi-gpio";

		#address-cells = <1>;

		#size-cells = <0>;



		gpio-sck = <&gpio0 ASPEED_GPIO(X, 3) GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpio0 ASPEED_GPIO(X, 4) GPIO_ACTIVE_HIGH>;

		gpio-miso = <&gpio0 ASPEED_GPIO(X, 5) GPIO_ACTIVE_HIGH>;

		num-chipselects = <1>;

		cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;



		flash@0 {

			reg = <0>;

			compatible = "jedec,spi-nor";

			m25p,fast-read;

			label = "pnor";

			spi-max-frequency = <100000000>;

		};

	};



	switchphy: ethernet-phy@0 {

		// Fixed link

	};
@@ -242,6 +222,19 @@ 
	};

};



&spi2 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi2_default>;



	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "pnor";

		spi-max-frequency = <50000000>;

	};

};



&i2c0 {

	status = "okay";

	ina230@45 {
@@ -260,6 +253,17 @@ 
		reg = <0x4f>;

	};



	sled1_ioexp41: pca9536@41 {

		compatible = "nxp,pca9536";

		reg = <0x41>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

		"SLED1_SWD_MUX", "SLED1_XRES_SWD_N",

		"SLED1_CLKREQ_N", "SLED1_PCIE_PWR_EN";

	};



	sled1_ioexp: pca9539@76 {

		compatible = "nxp,pca9539";

		reg = <0x76>;
@@ -310,6 +314,11 @@ 
			op-sink-microwatt = <10000000>;

		};

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

	};

};



&i2c1 {
@@ -330,6 +339,17 @@ 
		reg = <0x4f>;

	};



	sled2_ioexp41: pca9536@41 {

		compatible = "nxp,pca9536";

		reg = <0x41>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

		"SLED2_SWD_MUX", "SLED2_XRES_SWD_N",

		"SLED2_CLKREQ_N", "SLED2_PCIE_PWR_EN";

	};



	sled2_ioexp: pca9539@76 {

		compatible = "nxp,pca9539";

		reg = <0x76>;
@@ -380,6 +400,11 @@ 
			op-sink-microwatt = <10000000>;

		};

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

	};

};



&i2c2 {
@@ -400,6 +425,17 @@ 
		reg = <0x4f>;

	};



	sled3_ioexp41: pca9536@41 {

		compatible = "nxp,pca9536";

		reg = <0x41>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

		"SLED3_SWD_MUX", "SLED3_XRES_SWD_N",

		"SLED3_CLKREQ_N", "SLED3_PCIE_PWR_EN";

	};



	sled3_ioexp: pca9539@76 {

		compatible = "nxp,pca9539";

		reg = <0x76>;
@@ -450,6 +486,11 @@ 
			op-sink-microwatt = <10000000>;

		};

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

	};

};



&i2c3 {
@@ -470,6 +511,17 @@ 
		reg = <0x4f>;

	};



	sled4_ioexp41: pca9536@41 {

		compatible = "nxp,pca9536";

		reg = <0x41>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

		"SLED4_SWD_MUX", "SLED4_XRES_SWD_N",

		"SLED4_CLKREQ_N", "SLED4_PCIE_PWR_EN";

	};



	sled4_ioexp: pca9539@76 {

		compatible = "nxp,pca9539";

		reg = <0x76>;
@@ -520,6 +572,11 @@ 
			op-sink-microwatt = <10000000>;

		};

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

	};

};



&i2c4 {
@@ -540,6 +597,17 @@ 
		reg = <0x4f>;

	};



	sled5_ioexp41: pca9536@41 {

		compatible = "nxp,pca9536";

		reg = <0x41>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

		"SLED5_SWD_MUX", "SLED5_XRES_SWD_N",

		"SLED5_CLKREQ_N", "SLED5_PCIE_PWR_EN";

	};



	sled5_ioexp: pca9539@76 {

		compatible = "nxp,pca9539";

		reg = <0x76>;
@@ -590,6 +658,11 @@ 
			op-sink-microwatt = <10000000>;

		};

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

	};

};



&i2c5 {
@@ -610,6 +683,17 @@ 
		reg = <0x4f>;

	};



	sled6_ioexp41: pca9536@41 {

		compatible = "nxp,pca9536";

		reg = <0x41>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

		"SLED6_SWD_MUX", "SLED6_XRES_SWD_N",

		"SLED6_CLKREQ_N", "SLED6_PCIE_PWR_EN";

	};



	sled6_ioexp: pca9539@76 {

		compatible = "nxp,pca9539";

		reg = <0x76>;
@@ -660,6 +744,11 @@ 
			op-sink-microwatt = <10000000>;

		};

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

	};

};



&i2c6 {
@@ -732,6 +821,8 @@ 
		compatible = "adi,adm1278";

		reg = <0x11>;

		shunt-resistor-micro-ohms = <300>;

		adi,volt-curr-sample-average = <128>;

		adi,power-sample-average = <128>;

	};



	tmp421@4c {
@@ -771,43 +862,55 @@ 
&gpio0 {

	gpio-line-names =

	/*A0-A7*/	"","","","","","","","",

	/*B0-B7*/	"","","SEL_SPI2_MUX","SPI2_MUX1",

			"SPI2_MUX2","SPI2_MUX3","","",

	/*B0-B7*/	"FUSB302_SLED1_INT_N","FUSB302_SLED2_INT_N",

			"SEL_SPI2_MUX","SPI2_MUX1",

			"SPI2_MUX2","SPI2_MUX3",

			"","FUSB302_SLED3_INT_N",

	/*C0-C7*/	"","","","","","","","",

	/*D0-D7*/	"","","","","","","","",

	/*E0-E7*/	"","","","","","","","",

	/*F0-F7*/	"","","","","","","","",

	/*G0-G7*/	"BSM_FRU_WP","SWITCH_FRU_MUX","","",

	/*F0-F7*/	"BMC_SLED1_STCK","BMC_SLED2_STCK",

			"BMC_SLED3_STCK","BMC_SLED4_STCK",

			"BMC_SLED5_STCK","BMC_SLED6_STCK",

			"","",

	/*G0-G7*/	"BSM_FRU_WP","SWITCH_FRU_MUX","","FM_SOL_UART_CH_SEL",

			"PWRGD_P1V05_VDDCORE","PWRGD_P1V5_VDD","","",

	/*H0-H7*/	"presence-riser1","presence-riser2",

			"presence-sled1","presence-sled2",

			"presence-sled3","presence-sled4",

			"presence-sled5","presence-sled6",

	/*I0-I7*/	"REV_ID0","","REV_ID1","REV_ID2",

			"","BSM_FLASH_WP_STATUS","BMC_TPM_PRES","",

	/*I0-I7*/	"REV_ID0","",

			"REV_ID1","REV_ID2",

			"","BSM_FLASH_WP_STATUS",

			"BMC_TPM_PRES_N","FUSB302_SLED6_INT_N",

	/*J0-J7*/	"","","","","","","","",

	/*K0-K7*/	"","","","","","","","",

	/*L0-L7*/	"","","","","","BMC_RTC_INT","","",

	/*M0-M7*/	"ALERT_SLED1","ALERT_SLED2",

			"ALERT_SLED3","ALERT_SLED4",

			"ALERT_SLED5","ALERT_SLED6",

			"P12V_AUX_ALERT1","",

	/*N0-N7*/	"","","","","","","","",

	/*M0-M7*/	"ALERT_SLED1_N","ALERT_SLED2_N",

			"ALERT_SLED3_N","ALERT_SLED4_N",

			"ALERT_SLED5_N","ALERT_SLED6_N",

			"","",

	/*N0-N7*/	"LED_POSTCODE_0","LED_POSTCODE_1",

			"LED_POSTCODE_2","LED_POSTCODE_3",

			"LED_POSTCODE_4","LED_POSTCODE_5",

			"LED_POSTCODE_5","LED_POSTCODE_7",

	/*O0-O7*/	"","","","",

			"","BOARD_ID0","BOARD_ID1","BOARD_ID2",

	/*P0-P7*/	"","","","","","","","BMC_HEARTBEAT",

	/*Q0-Q7*/	"","","","","","","","",

	/*R0-R7*/	"","","","","","","","",

	/*S0-S7*/	"","","","BAT_DETECT",

			"BMC_BT_WP0","BMC_BT_WP1","","",

			"BMC_BT_WP0_N","BMC_BT_WP1_N","","FUSB302_SLED4_INT_N",

	/*T0-T7*/	"","","","","","","","",

	/*U0-U7*/	"","","","","","","","",

	/*V0-V7*/	"PWRGD_CNS_PSU","RST_BMC_MVL","","PSU_PRSNT",

	/*V0-V7*/	"PWRGD_CNS_PSU","RST_BMC_MVL_N",

			"P12V_AUX_ALERT1_N","PSU_PRSNT",

			"USB2_SEL0_A","USB2_SEL1_A",

			"USB2_SEL0_B","USB2_SEL1_B",

	/*W0-W7*/	"RST_FRONT_IOEXP","","","","","","","",

	/*W0-W7*/	"RST_FRONT_IOEXP_N","","","","","","","",

	/*X0-X7*/	"","","","","","","","",

	/*Y0-Y7*/	"BMC_SELF_HW_RST","BSM_PRSNT","BSM_FLASH_LATCH","",

	/*Y0-Y7*/	"BMC_SELF_HW_RST","BSM_PRSNT_N",

			"BSM_FLASH_LATCH_N","FUSB302_SLED5_INT_N",

			"","","","",

	/*Z0-Z7*/	"","","","","","","","";

};
@@ -834,7 +937,16 @@ 
		&pinctrl_adc14_default &pinctrl_adc15_default>;

};



&mdio0 {

	status = "okay";

	/* TODO: Add Marvell 88E6191X */

};



&mdio3 {

	status = "okay";

	/* TODO: Add Marvell 88X3310 */

};



&ehci0 {

	status = "okay";

};

arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ 
	/*P0-P7*/	"","","","","led-pcieslot-power","","","",

	/*Q0-Q7*/	"","","regulator-standby-faulted","","","","","",

	/*R0-R7*/	"bmc-tpm-reset","power-chassis-control","power-chassis-good","","","I2C_FLASH_MICRO_N","","",

	/*S0-S7*/	"","","","","","","","",

	/*S0-S7*/	"","","","","power-ffs-sync-history","","","",

	/*T0-T7*/	"","","","","","","","",

	/*U0-U7*/	"","","","","","","","",

	/*V0-V7*/	"","BMC_3RESTART_ATTEMPT_P","","","","","","",

arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ 
	/*Q0-Q7*/	"cfam-reset","","regulator-standby-faulted","","","","","",

	/*R0-R7*/	"bmc-tpm-reset","power-chassis-control","power-chassis-good","","","","","",

	/*S0-S7*/	"presence-ps0","presence-ps1","presence-ps2","presence-ps3",

				"","","","",

	"power-ffs-sync-history","","","",

	/*T0-T7*/	"","","","","","","","",

	/*U0-U7*/	"","","","","","","","",

	/*V0-V7*/	"","","","","","","","",