ASPEED device tree updates for 5.1
- New machine: Inspur ON5263M5, an Intel Xeon OCP compute node - Misc device tree updates from the OpenBMC project - #iterrupt-cells fix for GPIO controller -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAlxRJCwACgkQa3ZZB4FH cJ7RwQ//b+Gd0Y/BqmaLj6SaSid100qvISm5se4FiGy23hvZ3F6cjcjO7AF75IdA X/q5n57MBEvADPlhr4ykhnf8ToRUK88BD20AWeiKDW08D34gsrmgkgHjq8tTyTad 6OKzr2GQgUeNOfQfCZLatbRRmJ+fOVUpJsm3DgeTkpYPk5SlcZj/kT0hdT9meSSj Ej5Fb/2H+DBVMGCroHw6R7B3LDSeC5ob0zvxqLkBed4j2J7GH5YAM36Dknn2KeUU Cy3ctMLoxEnuWYV1AzDCnpltm2t/BZO4bpN0mcdqe4wm342aTXsFATgbq2hE7bIE m90obfOLFlcqtkbGPm6kRveb8Kk3rOQnBmllPvDou64vtn7mkJj+2MSKlzdoQ31I p1We30NVWIaJud+howWN1R7mVnlaK8AkKLUD9GLu+QmjMdDJR4qv2Q1q+bh7a/nV +56EG3P5XUh2kV/zahvKNFWlKnrZGIWuImzhfaNbxRYrnsMWn1i/MCYykQnRJDN+ kNKDz3RuTaz3DFLL+aLnv4R4sOicRTPenZaJRH4t8Z0UH4mVIkkhwbW9BV0WjiMj u9gMoHfVB4c86CZwxrKKN1STPw4ZLya2QSKP8dO9j65XucusxXlwERRH7LaDsU/O qVLjElJHjEHWijgSLWfDbEqzXdM3JH7jhePpdjnDp2YTR3+VC3k= =udij -----END PGP SIGNATURE----- Merge tag 'aspeed-5.1-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt ASPEED device tree updates for 5.1 - New machine: Inspur ON5263M5, an Intel Xeon OCP compute node - Misc device tree updates from the OpenBMC project - #interrupt-cells fix for GPIO controller * tag 'aspeed-5.1-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: ARM: dts: aspeed: quanta-q71l: enable uart1 ARM: dts: aspeed: quanta-q71l: enable lpc_ctrl node ARM: dts: aspeed: tiogapass: Add uarts for SoL ARM: dts: aspeed: tiogapass: Add LPC devices ARM: dts: aspeed: Add Inspur on5263m5 BMC ARM: dts: aspeed: tiogapass: Add sensors ARM: dts: aspeed: tiogapass: Enable KCS ARM: dts: aspeed: Add KCS support for LPC BMC ARM: dts: aspeed: Add #interrupt-cells property to gpio controllers ARM: dts: aspeed-palmetto: Add i2c OCC hwmon node ARM: dts: aspeed: stardragon4800: Add power supply Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
9ba24e9ca7
@ -173,6 +173,16 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dps650ab@58 {
|
||||
compatible = "delta,dps650ab";
|
||||
reg = <0x58>;
|
||||
};
|
||||
|
||||
dps650ab@59 {
|
||||
compatible = "delta,dps650ab";
|
||||
reg = <0x59>;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c9 {
|
||||
|
||||
@ -21,6 +21,17 @@
|
||||
memory@80000000 {
|
||||
reg = <0x80000000 0x20000000>;
|
||||
};
|
||||
|
||||
iio-hwmon {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
|
||||
<&adc 4>, <&adc 5>, <&adc 6>;
|
||||
};
|
||||
|
||||
iio-hwmon-battery {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&adc 7>;
|
||||
};
|
||||
};
|
||||
|
||||
&fmc {
|
||||
@ -43,6 +54,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
&lpc_snoop {
|
||||
status = "okay";
|
||||
snoop-ports = <0x80>;
|
||||
};
|
||||
|
||||
&lpc_ctrl {
|
||||
// Enable lpc clock
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart1 {
|
||||
// Host Console
|
||||
status = "okay";
|
||||
@ -51,11 +72,33 @@
|
||||
&pinctrl_rxd1_default>;
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
// SoL Host Console
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart3 {
|
||||
// SoL BMC Console
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart5 {
|
||||
// BMC Console
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&kcs2 {
|
||||
// BMC KCS channel 2
|
||||
status = "okay";
|
||||
kcs_addr = <0xca8>;
|
||||
};
|
||||
|
||||
&kcs3 {
|
||||
// BMC KCS channel 3
|
||||
status = "okay";
|
||||
kcs_addr = <0xca2>;
|
||||
};
|
||||
|
||||
&mac0 {
|
||||
status = "okay";
|
||||
|
||||
@ -64,6 +107,10 @@
|
||||
use-ncsi;
|
||||
};
|
||||
|
||||
&adc {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
status = "okay";
|
||||
//Airmax Conn B, CPU0 PIROM, CPU1 PIROM
|
||||
@ -122,6 +169,10 @@
|
||||
|
||||
&i2c8 {
|
||||
status = "okay";
|
||||
tmp421@1f {
|
||||
compatible = "ti,tmp421";
|
||||
reg = <0x1f>;
|
||||
};
|
||||
//Mezz Sensor SMBus
|
||||
};
|
||||
|
||||
@ -140,7 +191,7 @@
|
||||
};
|
||||
|
||||
fan@1 {
|
||||
reg = <0x00>;
|
||||
aspeed,fan-tach-ch = /bits/ 8 <0x01>;
|
||||
reg = <0x01>;
|
||||
aspeed,fan-tach-ch = /bits/ 8 <0x02>;
|
||||
};
|
||||
};
|
||||
|
||||
145
arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
Normal file
145
arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
Normal file
@ -0,0 +1,145 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2018 Inspur Corporation
|
||||
/dts-v1/;
|
||||
|
||||
#include "aspeed-g5.dtsi"
|
||||
#include <dt-bindings/gpio/aspeed-gpio.h>
|
||||
|
||||
/ {
|
||||
model = "ON5263M5 BMC";
|
||||
compatible = "inspur,on5263m5-bmc", "aspeed,ast2500";
|
||||
|
||||
chosen {
|
||||
stdout-path = &uart5;
|
||||
bootargs = "earlyprintk";
|
||||
};
|
||||
|
||||
memory {
|
||||
reg = <0x80000000 0x20000000>;
|
||||
};
|
||||
|
||||
reserved-memory {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
vga_memory: framebuffer@9f000000 {
|
||||
no-map;
|
||||
reg = <0x9f000000 0x01000000>;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
bmc_alive {
|
||||
label = "bmc_alive";
|
||||
gpios = <&gpio ASPEED_GPIO(I, 1) GPIO_ACTIVE_LOW>;
|
||||
linux,default-trigger = "timer";
|
||||
};
|
||||
};
|
||||
|
||||
iio-hwmon {
|
||||
compatible = "iio-hwmon";
|
||||
io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
|
||||
<&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
&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";
|
||||
m25p,fast-read;
|
||||
label = "pnor";
|
||||
};
|
||||
};
|
||||
|
||||
&uart5 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mac0 {
|
||||
status = "okay";
|
||||
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_rmii1_default>;
|
||||
use-ncsi;
|
||||
};
|
||||
|
||||
&mac1 {
|
||||
status = "okay";
|
||||
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
|
||||
};
|
||||
|
||||
&i2c6 {
|
||||
status = "okay";
|
||||
|
||||
tmp421@4e {
|
||||
compatible = "ti,tmp421";
|
||||
reg = <0x4e>;
|
||||
};
|
||||
|
||||
tmp112@48 {
|
||||
compatible = "ti,tmp112";
|
||||
reg = <0x48>;
|
||||
};
|
||||
|
||||
eeprom@54 {
|
||||
compatible = "atmel,24c64";
|
||||
reg = <0x54>;
|
||||
pagesize = <32>;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c7 {
|
||||
status = "okay";
|
||||
|
||||
adm1278@11 {
|
||||
compatible = "adi,adm1278";
|
||||
reg = <0x11>;
|
||||
};
|
||||
};
|
||||
|
||||
&gfx {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
aspeed,external-nodes = <&gfx &lhc>;
|
||||
};
|
||||
|
||||
&pwm_tacho {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_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>;
|
||||
};
|
||||
};
|
||||
|
||||
&adc {
|
||||
status = "okay";
|
||||
};
|
||||
@ -169,6 +169,11 @@
|
||||
|
||||
&i2c3 {
|
||||
status = "okay";
|
||||
|
||||
occ-hwmon@50 {
|
||||
compatible = "ibm,p8-occ-hwmon";
|
||||
reg = <0x50>;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c4 {
|
||||
|
||||
@ -116,6 +116,10 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&lpc_ctrl {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&lpc_snoop {
|
||||
status = "okay";
|
||||
snoop-ports = <0x80>;
|
||||
@ -134,6 +138,10 @@
|
||||
pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
|
||||
};
|
||||
|
||||
&uart1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart5 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -197,6 +197,7 @@
|
||||
gpio-ranges = <&pinctrl 0 0 220>;
|
||||
clocks = <&syscon ASPEED_CLK_APB>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
|
||||
timer: timer@1e782000 {
|
||||
|
||||
@ -250,6 +250,7 @@
|
||||
gpio-ranges = <&pinctrl 0 0 220>;
|
||||
clocks = <&syscon ASPEED_CLK_APB>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
|
||||
timer: timer@1e782000 {
|
||||
@ -330,8 +331,32 @@
|
||||
ranges = <0x0 0x1e789000 0x1000>;
|
||||
|
||||
lpc_bmc: lpc-bmc@0 {
|
||||
compatible = "aspeed,ast2500-lpc-bmc";
|
||||
compatible = "aspeed,ast2500-lpc-bmc", "simple-mfd", "syscon";
|
||||
reg = <0x0 0x80>;
|
||||
reg-io-width = <4>;
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges = <0x0 0x0 0x80>;
|
||||
|
||||
kcs1: kcs1@0 {
|
||||
compatible = "aspeed,ast2500-kcs-bmc";
|
||||
interrupts = <8>;
|
||||
kcs_chan = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
kcs2: kcs2@0 {
|
||||
compatible = "aspeed,ast2500-kcs-bmc";
|
||||
interrupts = <8>;
|
||||
kcs_chan = <2>;
|
||||
status = "disabled";
|
||||
};
|
||||
kcs3: kcs3@0 {
|
||||
compatible = "aspeed,ast2500-kcs-bmc";
|
||||
interrupts = <8>;
|
||||
kcs_chan = <3>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
||||
lpc_host: lpc-host@80 {
|
||||
@ -343,6 +368,13 @@
|
||||
#size-cells = <1>;
|
||||
ranges = <0x0 0x80 0x1e0>;
|
||||
|
||||
kcs4: kcs4@0 {
|
||||
compatible = "aspeed,ast2500-kcs-bmc";
|
||||
interrupts = <8>;
|
||||
kcs_chan = <4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
lpc_ctrl: lpc-ctrl@0 {
|
||||
compatible = "aspeed,ast2500-lpc-ctrl";
|
||||
reg = <0x0 0x80>;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user