Commit 5b5c7ffe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'aspeed-4.17-devicetree' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/dt

Pull "ASPEED device tree updates for 4.17" from Joel Stanley:

Updates to OpenPower BMC systems:

 A number of updates to use recently merged drivers, including moving to
 upstreamed IPMI BT nodes, a temp sensor for Romulus, and adding
 simple-reset for UARTs.

 This includes more of Palmetto's device tree, so that it's ever so
 close to booting the host with an upstream kernel.

New machines:

 Add Qualcomm Centriq ARM64 server reference platform, which will run
 OpenBMC on an AST2500.

* tag 'aspeed-4.17-devicetree' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: Add Qualcomm Centriq 2400 REP BMC
  ARM: dts: aspeed: romulus: Add w83773g temp sensor
  ARM: dts: aspeed: romulus: hog GPIOS7
  ARM: dts: romulus: Remove MAX31785 device
  ARM: dts: palmetto: Request mux as per strapping configuration
  ARM: dts: palmetto: Enable rear UART
  ARM: dts: aspeed: Add LPC reset controller node
  ARM: dts: aspeed: Add Palmetto GPIO hogs
  ARM: dts: palmetto: Add LEDs and GPIO keys
  ARM: dts: aspeed: Add LPC clock phandles
  ARM: dts: aspeed-g5: Update LPC node
  ARM: dts: aspeed: Enable IPMI BT node on OpenPower machines
  ARM: dts: aspeed: Add IPMI BT node
parents 206c12fc 3719a1b1

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1143,6 +1143,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

dtb-$(CONFIG_ARCH_ASPEED) += \

	aspeed-ast2500-evb.dtb \

	aspeed-bmc-arm-centriq2400-rep.dtb \

	aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

	aspeed-bmc-opp-witherspoon.dtb \

arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts

0 → 100644
+225 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/dts-v1/;



#include "aspeed-g5.dtsi"

#include <dt-bindings/gpio/aspeed-gpio.h>



/ {

	model = "Qualcomm Centriq 2400  REP AST2520";

	compatible = "qualcomm,centriq2400-rep-bmc", "aspeed,ast2500";



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

		reg = <0x80000000 0x40000000>;

	};



	iio-hwmon {

		compatible = "iio-hwmon";

		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,

                        <&adc 4>, <&adc 5>, <&adc 6>, <&adc 8>;

	};



	iio-hwmon-battery {

		compatible = "iio-hwmon";

		io-channels = <&adc 7>;

	};



	leds {

		compatible = "gpio-leds";



		uid_led {

			label = "UID_LED";

			gpios = <&gpio ASPEED_GPIO(Q, 5) GPIO_ACTIVE_LOW>;

		};



		ras_error_led {

			label = "RAS_ERROR_LED";

			gpios = <&gpio ASPEED_GPIO(F, 6) GPIO_ACTIVE_LOW>;

		};



		system_fault {

			label = "System_fault";

			gpios = <&gpio ASPEED_GPIO(A, 1) GPIO_ACTIVE_LOW>;

		};

	};

};



&fmc {

	status = "okay";

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bmc";

#include "openbmc-flash-layout.dtsi"

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1_default>;

	flash@0 {

		status = "okay";

	};

};



&spi2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi2ck_default

			&pinctrl_spi2miso_default

			&pinctrl_spi2mosi_default

			&pinctrl_spi2cs0_default>;

};



&uart3 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd3_default &pinctrl_rxd3_default>;

	current-speed = <115200>;

};



&uart5 {

	status = "okay";

};



&mac0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";



	tmp421@1e {

		compatible = "ti,tmp421";

		reg = <0x1e>;

	};

	tmp421@2a {

		compatible = "ti,tmp421";

		reg = <0x2a>;

	};

	tmp421@4e {

		compatible = "ti,tmp421";

		reg = <0x4e>;

	};

	tmp421@1c {

		compatible = "ti,tmp421";

		reg = <0x1c>;

	};

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	status = "okay";



	tmp421@1d {

		compatible = "ti,tmp421";

		reg = <0x1d>;

	};

	tmp421@1f {

		compatible = "ti,tmp421";

		reg = <0x1f>;

	};

	tmp421@4d {

		compatible = "ti,tmp421";

		reg = <0x4d>;

	};

	tmp421@4f {

		compatible = "ti,tmp421";

		reg = <0x4f>;

	};

	nvt210@4c {

		compatible = "nvt210";

		reg = <0x4c>;

	};

	eeprom@50 {

		compatible = "atmel,24c128";

		reg = <0x50>;

		pagesize = <128>;

	};

};



&i2c7 {

	status = "okay";

};



&i2c8 {

	status = "okay";



	pca9641@70 {

		compatible = "nxp,pca9641";

		reg = <0x70>;

		i2c-arb {

			#address-cells = <1>;

			#size-cells = <0>;

			tmp421@1d {

				compatible = "tmp421";

				reg = <0x1d>;

			};

			adm1278@12 {

				compatible = "adi,adm1278";

				reg = <0x12>;

				Rsense = <500>;

			};

			eeprom@50 {

				compatible = "atmel,24c02";

				reg = <0x50>;

			};

			ds1100@58 {

				compatible = "ds1100";

				reg = <0x58>;

			};

		};

	};

};



&i2c9 {

	status = "okay";

};



&vuart {

	status = "okay";

};



&gfx {

	status = "okay";

};



&pinctrl {

	aspeed,external-nodes = <&gfx &lhc>;

};



&gpio {

	pin_gpio_c7 {

		gpio-hog;

		gpios = <ASPEED_GPIO(C, 7) GPIO_ACTIVE_HIGH>;

		output;

		line-name = "BIOS_SPI_MUX_S";

	};

};

arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts

+206 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/dts-v1/;



#include "aspeed-g4.dtsi"

#include <dt-bindings/gpio/aspeed-gpio.h>



/ {

	model = "Palmetto BMC";
@@ -26,6 +27,32 @@ 
			reg = <0x5f000000 0x01000000>; /* 16M */

		};

	};



	leds {

		compatible = "gpio-leds";



		heartbeat {

			gpios = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_LOW>;

		};



		power {

			gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;

		};



		identify {

			gpios = <&gpio ASPEED_GPIO(A, 2) GPIO_ACTIVE_LOW>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";



		checkstop {

			label = "checkstop";

			gpios = <&gpio ASPEED_GPIO(P, 5) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(P, 5)>;

		};

	};

};



&fmc {
@@ -40,6 +67,9 @@ 


&spi {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1debug_default>;



	flash@0 {

		status = "okay";

		m25p,fast-read;
@@ -47,6 +77,29 @@ 
	};

};



&pinctrl {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_flbusy_default &pinctrl_flwp_default



			&pinctrl_vgahs_default &pinctrl_vgavs_default

			&pinctrl_ddcclk_default &pinctrl_ddcdat_default>;

};



&uart1 {

	/* Rear RS-232 connector */

	status = "okay";



	pinctrl-names = "default";

	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>;

};



&uart5 {

	status = "okay";

};
@@ -111,3 +164,156 @@ 
&vuart {

	status = "okay";

};



&ibt {

	status = "okay";

};



&gpio {

	pin_func_mode0 {

		gpio-hog;

		gpios = <ASPEED_GPIO(C, 4) GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "func_mode0";

	};



	pin_func_mode1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(C, 5)  GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "func_mode1";

	};



	pin_func_mode2 {

		gpio-hog;

		gpios = <ASPEED_GPIO(C, 6) GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "func_mode2";

	};



	pin_gpio_a0 {

		gpio-hog;

		gpios = <ASPEED_GPIO(A, 0) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "BMC_FAN_RESERVED_N";

	};



	pin_gpio_a1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(A, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "APSS_WDT_N";

	};



	pin_gpio_b1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(B, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "APSS_BOOT_MODE";

	};



	pin_gpio_b2 {

		gpio-hog;

		gpios = <ASPEED_GPIO(B, 2) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "APSS_RESET_N";

	};



	pin_gpio_b7 {

		gpio-hog;

		gpios = <ASPEED_GPIO(B, 7) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "SPIVID_STBY_RESET_N";

	};



	pin_gpio_d1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(D, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_POWER_UP";

	};



	pin_gpio_f1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(F, 1) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "BMC_BATTERY_TEST";

	};



	pin_gpio_f4 {

		gpio-hog;

		gpios = <ASPEED_GPIO(F, 4) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "AST_HW_FAULT_N";

	};



	pin_gpio_f5 {

		gpio-hog;

		gpios = <ASPEED_GPIO(F, 5) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "AST_SYS_FAULT_N";

	};



	pin_gpio_f7 {

		gpio-hog;

		gpios = <ASPEED_GPIO(F, 7) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_FULL_SPEED_N";

	};



	pin_gpio_g3 {

		gpio-hog;

		gpios = <ASPEED_GPIO(G, 3) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_FAN_ERROR_N";

	};



	pin_gpio_g4 {

		gpio-hog;

		gpios = <ASPEED_GPIO(G, 4) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "BMC_WDT_RST1_P";

	};



	pin_gpio_g5 {

		gpio-hog;

		gpios = <ASPEED_GPIO(G, 5) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "BMC_WDT_RST2_P";

	};



	pin_gpio_h0 {

		gpio-hog;

		gpios = <ASPEED_GPIO(H, 0) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "PE_SLOT_TEST_EN_N";

	};



	pin_gpio_h1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(H, 1) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "BMC_RTCRST_N";

	};



	pin_gpio_h2 {

		gpio-hog;

		gpios = <ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "SYS_PWROK_BMC";

	};



	pin_gpio_h6 {

		gpio-hog;

		gpios = <ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "SCM1_FSI0_DATA_EN";

	};



	pin_gpio_h7 {

		gpio-hog;

		gpios = <ASPEED_GPIO(H, 7) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_TPM_INT_N";

	};

};

arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts

+13 −3
Original line number Diff line number Diff line
@@ -184,9 +184,9 @@ 
&i2c12 {

	status = "okay";



	max31785@52 {

		compatible = "maxim,max31785";

		reg = <0x52>;

	w83773g@4c {

		compatible = "nuvoton,w83773g";

		reg = <0x4c>;

	};

};
@@ -203,6 +203,12 @@ 
		output-low;

		line-name = "nic_func_mode1";

	};

	seq_cont {

		gpio-hog;

		gpios = <ASPEED_GPIO(S, 7) GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "seq_cont";

	};

};



&vuart {
@@ -257,3 +263,7 @@ 
		aspeed,fan-tach-ch = /bits/ 8 <0x0e>;

	};

};



&ibt {

	status = "okay";

};

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts

+4 −0
Original line number Diff line number Diff line
@@ -546,3 +546,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_wdtrst1_default>;

};



&ibt {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE