Commit 131dc51d authored by Olof Johansson's avatar Olof Johansson

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

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

ASPEED device tree updates for 5.14

 - IBM Rainier and Everest LED descriptions. These systems have a large
   number of LEDs attached via expanders.

 - Ampere Mt Jade updates, as OpenBMC bringup continues for this
   machine.

 - Updated 64MB flash layout for systems using OpenBMC on NOR root file
   systems.

 - Support for HS200 MMC on AST2600 EVB. This is only supported from A2,
   so a new device tree is added to support A0 and A1.

 - Update all command lines for early serial output.

* tag 'aspeed-5.14-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: everest: Add pcie cable card indicator leds
  ARM: dts: aspeed: everest: Add vrm and other indicator leds
  ARM: dts: aspeed: everest: Add dimm indicator leds
  ARM: dts: aspeed: everest: Add pcie slot indicator leds
  ARM: dts: aspeed: everest: Add nvme and fan indicator leds
  ARM: dts: aspeed: everest: Add system level indicator leds
  ARM: dts: aspeed-g5: Add SCU phandle to GFX node
  ARM: dts: aspeed: Everest: Add directly controlled LEDs
  ARM: dts: aspeed: Rainier 4U: Remove fan updates
  ARM: dts: aspeed: Everest: Fix cable card PCA chips
  ARM: dts: aspeed: Grow u-boot partition 64MiB OpenBMC flash layout
  ARM: dts: aspeed: mtjade: switch to 64MB flash layout
  ARM: dts: aspeed: mtjade: Add PSU support
  ARM: dts: aspeed: mtjade: Enable OCP card support via NC-SI
  ARM: dts: aspeed: Set earlycon boot argument
  ARM: dts: aspeed-g6: Add pinctrl settings
  ARM: dts: aspeed: ast2600evb: Add dts file for A1 and A0
  ARM: dts: aspeed: ast2600evb: Add phase correction for emmc controller.
  ARM: dts: aspeed: ast2600evb: Add sdhci node and gpio regulator for A2 evb.

Link: https://lore.kernel.org/r/CACPK8XduV9F=piu1qh56g+YNOZOBYTW7b2Y=XVYafpYDwWmDYA@mail.gmail.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e6f600e7 dd87684c
......@@ -1416,6 +1416,7 @@ dtb-$(CONFIG_ARCH_MSTARV7) += \
mstar-mercury5-ssc8336n-midrived08.dtb
dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-ast2500-evb.dtb \
aspeed-ast2600-evb-a1.dtb \
aspeed-ast2600-evb.dtb \
aspeed-bmc-amd-ethanolx.dtb \
aspeed-bmc-ampere-mtjade.dtb \
......
......@@ -13,7 +13,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
bootargs = "console=tty0 console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
// SPDX-License-Identifier: GPL-2.0-or-later
// Copyright 2021 IBM Corp.
#include "aspeed-ast2600-evb.dts"
/ {
model = "AST2600 A1 EVB";
/delete-node/regulator-vcc-sdhci0;
/delete-node/regulator-vcc-sdhci1;
/delete-node/regulator-vccq-sdhci0;
/delete-node/regulator-vccq-sdhci1;
};
/delete-node/ &sdc;
......@@ -4,6 +4,7 @@
/dts-v1/;
#include "aspeed-g6.dtsi"
#include <dt-bindings/gpio/aspeed-gpio.h>
/ {
model = "AST2600 EVB";
......@@ -21,6 +22,46 @@ memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x80000000>;
};
vcc_sdhci0: regulator-vcc-sdhci0 {
compatible = "regulator-fixed";
regulator-name = "SDHCI0 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpios = <&gpio0 ASPEED_GPIO(V, 0) GPIO_ACTIVE_HIGH>;
enable-active-high;
};
vccq_sdhci0: regulator-vccq-sdhci0 {
compatible = "regulator-gpio";
regulator-name = "SDHCI0 VccQ";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
gpios = <&gpio0 ASPEED_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
gpios-states = <1>;
states = <3300000 1>,
<1800000 0>;
};
vcc_sdhci1: regulator-vcc-sdhci1 {
compatible = "regulator-fixed";
regulator-name = "SDHCI1 Vcc";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpios = <&gpio0 ASPEED_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
enable-active-high;
};
vccq_sdhci1: regulator-vccq-sdhci1 {
compatible = "regulator-gpio";
regulator-name = "SDHCI1 VccQ";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
gpios = <&gpio0 ASPEED_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
gpios-states = <1>;
states = <3300000 1>,
<1800000 0>;
};
};
&mdio0 {
......@@ -107,7 +148,8 @@ &emmc_controller {
&emmc {
non-removable;
bus-width = <4>;
max-frequency = <52000000>;
max-frequency = <100000000>;
clk-phase-mmc-hs200 = <9>, <225>;
};
&rtc {
......@@ -121,37 +163,7 @@ flash@0 {
m25p,fast-read;
label = "bmc";
spi-max-frequency = <50000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
u-boot@0 {
reg = <0x0 0xe0000>; // 896KB
label = "u-boot";
};
u-boot-env@e0000 {
reg = <0xe0000 0x20000>; // 128KB
label = "u-boot-env";
};
kernel@100000 {
reg = <0x100000 0x900000>; // 9MB
label = "kernel";
};
rofs@a00000 {
reg = <0xa00000 0x2000000>; // 32MB
label = "rofs";
};
rwfs@6000000 {
reg = <0x2a00000 0x1600000>; // 22MB
label = "rwfs";
};
};
#include "openbmc-flash-layout-64.dtsi"
};
};
......@@ -245,3 +257,46 @@ &ehci1 {
&uhci {
status = "okay";
};
&sdc {
status = "okay";
};
/*
* The signal voltage of sdhci0 and sdhci1 on AST2600-A2 EVB is able to be
* toggled by GPIO pins.
* In the reference design, GPIOV0 of AST2600-A2 EVB is connected to the
* power load switch that provides 3.3v to sdhci0 vdd, GPIOV1 is connected to
* a 1.8v and a 3.3v power load switch that provides signal voltage to
* sdhci0 bus.
* If GPIOV0 is active high, sdhci0 is enabled, otherwise, sdhci0 is disabled.
* If GPIOV1 is active high, 3.3v power load switch is enabled, sdhci0 signal
* voltage is 3.3v, otherwise, 1.8v power load switch will be enabled,
* sdhci0 signal voltage becomes 1.8v.
* AST2600-A2 EVB also supports toggling signal voltage for sdhci1.
* The design is the same as sdhci0, it uses GPIOV2 as power-gpio and GPIOV3
* as power-switch-gpio.
*/
&sdhci0 {
status = "okay";
bus-width = <4>;
max-frequency = <100000000>;
sdhci-drive-type = /bits/ 8 <3>;
sdhci-caps-mask = <0x7 0x0>;
sdhci,wp-inverted;
vmmc-supply = <&vcc_sdhci0>;
vqmmc-supply = <&vccq_sdhci0>;
clk-phase-sd-hs = <7>, <200>;
};
&sdhci1 {
status = "okay";
bus-width = <4>;
max-frequency = <100000000>;
sdhci-drive-type = /bits/ 8 <3>;
sdhci-caps-mask = <0x7 0x0>;
sdhci,wp-inverted;
vmmc-supply = <&vcc_sdhci1>;
vqmmc-supply = <&vccq_sdhci1>;
clk-phase-sd-hs = <7>, <200>;
};
......@@ -34,7 +34,7 @@ aliases {
};
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
leds {
compatible = "gpio-leds";
......
......@@ -9,7 +9,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......@@ -110,6 +110,30 @@ id_button {
linux,code = <ASPEED_GPIO(Q, 5)>;
};
psu1_vin_good {
label = "PSU1_VIN_GOOD";
gpios = <&gpio ASPEED_GPIO(H, 4) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(H, 4)>;
};
psu2_vin_good {
label = "PSU2_VIN_GOOD";
gpios = <&gpio ASPEED_GPIO(H, 5) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(H, 5)>;
};
psu1_present {
label = "PSU1_PRESENT";
gpios = <&gpio ASPEED_GPIO(I, 0) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(I, 0)>;
};
psu2_present {
label = "PSU2_PRESENT";
gpios = <&gpio ASPEED_GPIO(I, 1) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(I, 1)>;
};
};
gpioA0mux: mux-controller {
......@@ -280,7 +304,7 @@ flash@0 {
m25p,fast-read;
label = "bmc";
/* spi-max-frequency = <50000000>; */
#include "openbmc-flash-layout.dtsi"
#include "openbmc-flash-layout-64.dtsi"
};
};
......@@ -332,6 +356,16 @@ &uart5 {
status = "okay";
};
&mac0 {
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;
};
&mac1 {
status = "okay";
pinctrl-names = "default";
......@@ -426,6 +460,19 @@ &i2c9 {
status = "okay";
};
&i2c10 {
status = "okay";
adm1278@10 {
compatible = "adi,adm1278";
reg = <0x10>;
};
adm1278@11 {
compatible = "adi,adm1278";
reg = <0x11>;
};
};
&gfx {
status = "okay";
memory-region = <&gfx_memory>;
......@@ -529,8 +576,9 @@ &gpio {
"S1_DDR_SAVE","","",
/*G0-G7*/ "S0_FW_BOOT_OK","SHD_REQ_L","","S0_OVERTEMP_L","","",
"","",
/*H0-H7*/ "","","","","","","","",
/*I0-I7*/ "","","S1_BMC_SPECIAL_BOOT","","","","","",
/*H0-H7*/ "","","","","PSU1_VIN_GOOD","PSU2_VIN_GOOD","","",
/*I0-I7*/ "PSU1_PRESENT","PSU2_PRESENT","S1_BMC_SPECIAL_BOOT",
"","","","","",
/*J0-J7*/ "S0_HIGHTEMP_L","S0_FAULT_L","S0_SCP_AUTH_FAIL_L","",
"","","","",
/*K0-K7*/ "","","","","","","","",
......@@ -540,7 +588,8 @@ &gpio {
/*O0-O7*/ "","","","","","","","",
/*P0-P7*/ "","","","","","","","",
/*Q0-Q7*/ "","","","","","UID_BUTTON","","",
/*R0-R7*/ "","","BMC_EXT_HIGHTEMP_L","","","RESET_BUTTON","","",
/*R0-R7*/ "","","BMC_EXT_HIGHTEMP_L","OCP_AUX_PWREN",
"OCP_MAIN_PWREN","RESET_BUTTON","","",
/*S0-S7*/ "","","","","","","","",
/*T0-T7*/ "","","","","","","","",
/*U0-U7*/ "","","","","","","","",
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -15,7 +15,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
bootargs = "console=tty0 console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -55,7 +55,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -280,7 +280,7 @@ aliases {
chosen {
stdout-path = &uart1;
bootargs = "console=ttyS1,9600n8 root=/dev/ram rw earlyprintk";
bootargs = "console=ttyS1,9600n8 root=/dev/ram rw earlycon";
};
ast-adc-hwmon {
......
......@@ -37,7 +37,7 @@ aliases {
};
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -19,33 +19,3 @@ power-supply@6b {
reg = <0x6b>;
};
};
&fan0 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan1 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan2 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan3 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan4 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan5 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -11,7 +11,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "earlyprintk";
bootargs = "earlycon";
};
memory {
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "earlyprintk";
bootargs = "earlycon";
};
memory@80000000 {
......
......@@ -27,7 +27,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
bootargs = "console=tty0 console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -27,7 +27,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
bootargs = "console=tty0 console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -11,7 +11,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@40000000 {
......
......@@ -11,7 +11,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -57,7 +57,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -11,7 +11,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@40000000 {
......
......@@ -9,7 +9,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -13,7 +13,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200n8";
bootargs = "console=ttyS4,115200n8 earlycon";
};
memory@80000000 {
......
......@@ -11,7 +11,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@40000000 {
......
......@@ -10,7 +10,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -17,7 +17,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -14,7 +14,7 @@ aliases {
};
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@80000000 {
......
......@@ -28,7 +28,7 @@ aliases {
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=ttyS4,115200 earlycon";
};
memory@40000000 {
......
......@@ -11,7 +11,7 @@ / {
chosen {
stdout-path = &uart5;
bootargs = "earlyprintk";
bootargs = "earlycon";
};
memory@80000000 {
......
......@@ -264,6 +264,7 @@ gfx: display@1e6e6000 {
reg-io-width = <4>;
clocks = <&syscon ASPEED_CLK_GATE_D1CLK>;
resets = <&syscon ASPEED_RESET_CRT1>;
syscon = <&syscon>;
status = "disabled";
interrupts = <0x19>;
};
......
......@@ -862,11 +862,21 @@ pinctrl_sgpm1_default: sgpm1_default {
groups = "SGPM1";
};
pinctrl_sgpm2_default: sgpm2_default {
function = "SGPM2";
groups = "SGPM2";
};
pinctrl_sgps1_default: sgps1_default {
function = "SGPS1";
groups = "SGPS1";
};
pinctrl_sgps2_default: sgps2_default {
function = "SGPS2";
groups = "SGPS2";
};
pinctrl_sioonctrl_default: sioonctrl_default {
function = "SIOONCTRL";
groups = "SIOONCTRL";
......
......@@ -9,27 +9,27 @@ partitions {
#size-cells = <1>;
u-boot@0 {
reg = <0x0 0x60000>; // 384KB
reg = <0x0 0xe0000>; // 896KB
label = "u-boot";
};
u-boot-env@60000 {
reg = <0x60000 0x20000>; // 128KB
u-boot-env@e0000 {
reg = <0xe0000 0x20000>; // 128KB
label = "u-boot-env";
};
kernel@80000 {
reg = <0x80000 0x500000>; // 5MB
kernel@100000 {
reg = <0x100000 0x900000>; // 9MB
label = "kernel";
};
rofs@580000 {
reg = <0x580000 0x2a80000>; // 42.5MB
rofs@a00000 {
reg = <0xa00000 0x2000000>; // 32MB
label = "rofs";
};
rwfs@3000000 {
reg = <0x3000000 0x1000000>; // 16MB
rwfs@6000000 {
reg = <0x2a00000 0x1600000>; // 22MB
label = "rwfs";
};
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment