mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

ASPEED device tree updates for 4.20

Browse source 
- Two new ast2500-based machines:
 
    * Facebook TiogaPass (x86 server)
    * HXT StarDragon 4800 Reference Evaluation Platform 2 (arm64 server)
 
  - Updates for the Quanta q71l system
 
  - i2c device tree cleanups
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAlujXJQACgkQa3ZZB4FH
 cJ5+vw/8DwzSLUYF6mmCs9IjulB9K7mnXjZ8Wvo3aYS1eSiNRay7kWz//LH9f3tK
 psQHUGgVNPdfw+44UBz2Afecwe7brJXzvICsouFOE8PRpmDJMk95UjqRHrZi+ndG
 bshSLIe8rDwpkN+ZIposINB/8gVcREnGPx1Nf6Gti8tmJdwVVad6iCKnz3/dCT+h
 cMEUqTf3NoKLc7AkA+n7JwUOXiO+4CLwL6zJRq4mb4F469gz6tuJ8BuDsTTpy8v5
 k3NN+2RTYGfU4H35tfnoeiPe7HE+ajI2/W9Y0wQZ3MggGwZdv2rJgrV7LU/jYulw
 3s1yzr8wj6eRQfZvuk/+ssj46SkVdWdItOnceNxrGkJB7gBXYP6bv8M25N59SYD6
 9teUDlI0QW8zoSfguiWCp0UOtXPR2E+MPdataN4nONIjaGGKYknwjyzIcVT9cVW/
 +YcJcaeB4pWNMt8cQX8GBBXMG3evjcSjuULc1UvTZC2ESIUmbZmHXDbRddY8dsQb
 8ssoDzEJLkFGWZm8TSghZgo5omE+oaelVkemnhhB7rP9c862cNQv3yzb0yVJEofl
 KEgcXe0QecLCgyBkWKebRqAwQRN1jse1a2lZPWZ4QlfhR0ATsudHSL6T/QDDGMjB
 2ULSjZoEixqN0y3ULvCjtbTt2KaDvHqgJ8Q0XJAqohtJPjmImtk=
 =Kq5Q
 -----END PGP SIGNATURE-----

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

ASPEED device tree updates for 4.20

 - Two new ast2500-based machines:

   * Facebook TiogaPass (x86 server)
   * HXT StarDragon 4800 Reference Evaluation Platform 2 (arm64 server)

 - Updates for the Quanta q71l system

 - i2c device tree cleanups

* tag 'aspeed-4.20-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: Adding Facebook TiogaPass BMC
  ARM: dts: aspeed: Add HXT StarDragon 4800 REP2 BMC
  ARM: dts: aspeed: quanta-q71l: Enable adc & ibt nodes
  ARM: dts: aspeed: quanta-q71l: Add four PSUs
  ARM: dts: aspeed: quanta-q71l: add aliases for i2c
  ARM: dts: aspeed: Fix I2C bus warnings

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-09-23 06:32:33 -07:00
commit da4cf9cdec
6 changed files with 404 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/Makefile
View file

@ -1200,6 +1200,8 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-ast2500-evb.dtb \
aspeed-bmc-arm-centriq2400-rep.dtb \
aspeed-bmc-arm-stardragon4800-rep2.dtb \
aspeed-bmc-facebook-tiogapass.dtb \
aspeed-bmc-intel-s2600wf.dtb \
aspeed-bmc-opp-lanyang.dtb \
aspeed-bmc-opp-palmetto.dtb \

207
arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts Normal file
View file

@ -0,0 +1,207 @@
// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
#include "aspeed-g5.dtsi"
#include <dt-bindings/gpio/aspeed-gpio.h>
/ {
model = "HXT StarDragon 4800 REP2 AST2520";
compatible = "hxt,stardragon4800-rep2-bmc", "aspeed,ast2500";
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
};
memory@80000000 {
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";
system_fault1 {
label = "System_fault1";
gpios = <&gpio ASPEED_GPIO(I, 3) GPIO_ACTIVE_LOW>;
};
system_fault2 {
label = "System_fault2";
gpios = <&gpio ASPEED_GPIO(I, 2) 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>;
};
&mac1 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii2_default>;
use-ncsi;
};
&i2c0 {
status = "okay";
};
&i2c1 {
status = "okay";
tmp421@1e {
compatible = "ti,tmp421";
reg = <0x1e>;
};
tmp421@2a {
compatible = "ti,tmp421";
reg = <0x2a>;
};
tmp421@1c {
compatible = "ti,tmp421";
reg = <0x1c>;
};
};
&i2c2 {
status = "okay";
};
&i2c3 {
status = "okay";
};
&i2c4 {
status = "okay";
};
&i2c5 {
status = "okay";
};
&i2c6 {
status = "okay";
tmp421@1f {
compatible = "ti,tmp421";
reg = <0x1f>;
};
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>;
eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;
};
dps650ab@58 {
compatible = "dps650ab";
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-low;
line-name = "BIOS_SPI_MUX_S";
};
pin_gpio_d1 {
gpio-hog;
gpios = <ASPEED_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
output-high;
line-name = "PHY2_RESET_N";
};
};

146
arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts Normal file
View file

@ -0,0 +1,146 @@
// SPDX-License-Identifier: GPL-2.0+
// Copyright (c) 2018 Facebook Inc.
// Author: Vijay Khemka <vijaykhemka@fb.com>
/dts-v1/;
#include "aspeed-g5.dtsi"
#include <dt-bindings/gpio/aspeed-gpio.h>
/ {
model = "Facebook TiogaPass BMC";
compatible = "facebook,tiogapass-bmc", "aspeed,ast2500";
aliases {
serial0 = &uart1;
serial4 = &uart5;
};
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
};
memory@80000000 {
reg = <0x80000000 0x20000000>;
};
};
&fmc {
status = "okay";
flash@0 {
status = "okay";
m25p,fast-read;
#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";
};
};
&uart1 {
// Host Console
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_txd1_default
&pinctrl_rxd1_default>;
};
&uart5 {
// BMC Console
status = "okay";
};
&mac0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii1_default>;
use-ncsi;
};
&i2c0 {
status = "okay";
//Airmax Conn B, CPU0 PIROM, CPU1 PIROM
};
&i2c1 {
status = "okay";
//X24 Riser
};
&i2c2 {
status = "okay";
// Mezz Management SMBus
};
&i2c3 {
status = "okay";
// SMBus to Board ID EEPROM
};
&i2c4 {
status = "okay";
// BMC Debug Header
};
&i2c5 {
status = "okay";
// CPU Voltage regulators
};
&i2c6 {
status = "okay";
tpm@20 {
compatible = "infineon,slb9645tt";
reg = <0x20>;
};
tmp421@4e {
compatible = "ti,tmp421";
reg = <0x4e>;
};
tmp421@4f {
compatible = "ti,tmp421";
reg = <0x4f>;
};
eeprom@54 {
compatible = "atmel,24c64";
reg = <0x54>;
pagesize = <32>;
};
};
&i2c7 {
status = "okay";
//HSC, AirMax Conn A
};
&i2c8 {
status = "okay";
//Mezz Sensor SMBus
};
&i2c9 {
status = "okay";
//USB Debug Connector
};
&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>;
};
fan@1 {
reg = <0x00>;
aspeed,fan-tach-ch = /bits/ 8 <0x01>;
};
};

47
arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
View file

@ -7,6 +7,25 @@ / {
model = "Quanta Q71L BMC";
compatible = "quanta,q71l-bmc", "aspeed,ast2400";
aliases {
i2c14 = &i2c_pcie2;
i2c15 = &i2c_pcie3;
i2c16 = &i2c_pcie6;
i2c17 = &i2c_pcie7;
i2c18 = &i2c_pcie1;
i2c19 = &i2c_pcie4;
i2c20 = &i2c_pcie5;
i2c21 = &i2c_pcie8;
i2c22 = &i2c_pcie9;
i2c23 = &i2c_pcie10;
i2c24 = &i2c_ssd1;
i2c25 = &i2c_ssd2;
i2c26 = &i2c_psu4;
i2c27 = &i2c_psu1;
i2c28 = &i2c_psu3;
i2c29 = &i2c_psu2;
};
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
@ -93,6 +112,10 @@ &pinctrl {
&pinctrl_ddcclk_default &pinctrl_ddcdat_default>;
};
&ibt {
status = "okay";
};
&lpc_snoop {
status = "okay";
snoop-ports = <0x80>;
@ -299,24 +322,44 @@ i2c_psu4: i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
psu@59 {
compatible = "pmbus";
reg = <0x59>;
};
};
i2c_psu1: i2c@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
psu@58 {
compatible = "pmbus";
reg = <0x58>;
};
};
i2c_psu3: i2c@2 {
#address-cells = <1>;
#size-cells = <0>;
reg = <2>;
psu@58 {
compatible = "pmbus";
reg = <0x58>;
};
};
i2c_psu2: i2c@3 {
#address-cells = <1>;
#size-cells = <0>;
reg = <3>;
psu@59 {
compatible = "pmbus";
reg = <0x59>;
};
};
};
@ -345,6 +388,10 @@ &wdt2 {
status = "okay";
};
&adc {
status = "okay";
};
&pwm_tacho {
status = "okay";

2
arch/arm/boot/dts/aspeed-g4.dtsi
View file

@ -350,7 +350,7 @@ uart4: serial@1e78f000 {
status = "disabled";
};
i2c: i2c@1e78a000 {
i2c: bus@1e78a000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;

2
arch/arm/boot/dts/aspeed-g5.dtsi
View file

@ -410,7 +410,7 @@ uart4: serial@1e78f000 {
status = "disabled";
};
i2c: i2c@1e78a000 {
i2c: bus@1e78a000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;