Commit Graph

871018 Commits

Author SHA1 Message Date
Brandon Wyman
ffcdc5df08 ARM: dts: aspeed: rainier: Fix fan fault and presence
The PCA9552 used for fan fault and presence information is at address
61h, not 60h.

Fixes: 2efc118ce3 ("ARM: dts: aspeed: rainier: Add i2c devices")
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Reviewed-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-01-08 12:51:03 +10:30
Joel Stanley
195cf4dbed ARM: dts: aspeed: rainier: Remove duplicate i2c busses
This is a revert of "ARM: dts: aspeed: rainier: Add i2c devices", which
was already applied to the tree.

Fixes: 9c44db7096 ("ARM: dts: aspeed: rainier: Add i2c devices")
Reviewed-by: Jim Wright <wrightj@linux.vnet.ibm.com>
Tested-by: Jim Wright <wrightj@linux.vnet.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-01-08 12:45:39 +10:30
Joel Stanley
87c5947ffe ARM: dts: aspeed: tacoma: Remove duplicate flash nodes
This is a revert of "ARM: dts: aspeed: tacoma: Enable FMC and SPI
devices" which was already applied as part of "ARM: dts: aspeed: Add
Tacoma machine".

Fixes: 8737481e38 ("ARM: dts: aspeed: tacoma: Enable FMC and SPI devices")
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-01-08 12:45:39 +10:30
Joel Stanley
265ae459b3 ARM: dts: aspeed: tacoma: Remove duplicate i2c busses
This is a revert of "ARM: dts: aspeed: tacoma: Enable I2C busses", which
was already applied as part of "ARM: dts: aspeed: Add Tacoma machine".

Fixes: 606bcdde67 ("ARM: dts: aspeed: tacoma: Enable I2C busses")
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-01-08 12:45:38 +10:30
Joel Stanley
e30dcbbcb0 ARM: dts: aspeed: tacoma: Fix fsi master node
This was broken when applying "ARM: dts: aspeed: tacoma: Add
host FSI description".

Fixes: a981c93300 ("ARM: dts: aspeed: tacoma: Add host FSI description")
Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-01-08 12:45:38 +10:30
Joel Stanley
413200017b ARM: dts: aspeed-g6: Fix FSI master location
The FIS nodes were placed incorrectly in the device tree.

Fixes: 0fe4e30478 ("ARM: dts: aspeed-g6: Describe FSI masters")
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2020-01-08 12:45:38 +10:30
Joel Stanley
3eca037f2d ARM: dts: aspeed-g6: Add timer description
The AST2600 has 8 32-bit timers on the APB bus.

Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-07 21:23:56 +10:30
Joel Stanley
ea4bb33a9d ARM: dts: aspeed: ast2600evb: Enable i2c buses
With the exception of i2c10 and i2c11 which conflict with the pins
for the third and forth MDIO controllers.

i2c0 has an ADT7490 fan controller/thermal monitor device connected. The
devicetree describes an adt74490 on i2c0, however bus that it appears on
depends on jumper settings, so it may not be present on all EVBs. It is
included to assist testing of I2C.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-07 21:23:38 +10:30
Hongwei Zhang
7671be39c4 ARM: dts: aspeed-g5: Add SGPIO description
Add SGPIO node to the ASPEED AST2500 device tree.

Signed-off-by: Hongwei Zhang <hongweiz@ami.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 22:07:38 +10:30
Tao Ren
8c014e90bd ARM: dts: aspeed: yamp: Use common dtsi
Simplify the Yamp device tree by using the common dtsi.

In addition this enables the following the second firmware flash and the
eMMC device in slot #1.

Signed-off-by: Tao Ren <taoren@fb.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:47 +10:30
Tao Ren
2bd4c3d3f4 ARM: dts: aspeed: minipack: Use common dtsi
Simplify the Minipack device tree by using the common dtsi.

In addition this enables the enabling the second firmware flash, and
updates it's size from 32MB to 64MB. It also enables the eMMC device in
slot #1.

Signed-off-by: Tao Ren <taoren@fb.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Tao Ren
7e4dd1ed48 ARM: dts: aspeed: cmm: Use common dtsi
Simplify the CMM device tree by using the common dtsi.

In addition this enables the second firmware flash and the emmc device
in slot #0.

Signed-off-by: Tao Ren <taoren@fb.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Tao Ren
2b7ca63ccd ARM: dts: aspeed: Common dtsi for Facebook AST2500 Network BMCs
This common descirption is included by all Facebook AST2500 Network BMC
platforms to minimize duplicated device entries across Facebook Network
BMC device trees.

Signed-off-by: Tao Ren <taoren@fb.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Brandon Wyman
1dd785ba30 ARM: dts: aspeed: rainier: gpio-keys for PSU presence
Add in a gpio-keys section to the Rainier device tree source, add in the
power supply presence GPIOs.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Reviewed-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Jinu Thomas
7f4a0ad5f0 ARM: dts: aspeed: rainier: Fix i2c eeprom size
Fix the size of the Proc VRM card's eeprom used for vpd storage. The
size is changed from 64Kbit to 128Kbit.

Signed-off-by: Jinu Joy Thomas <jinu.joy.thomas@in.ibm.com>
Reviewed-by: Santosh Puranik <santosh.puranik.ibm@gmail.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Andrew Jeffery
253d39f5a6 ARM: dts: tacoma: Hog LPC pinmux
Requesting pinmux configuration is done at driver probe time. The LPC IP
is composed of many sub-devices, each with their own driver, and no
driver exists for the entire IP block. Avoid having each sub-device
request the LPC pinmux by just hogging it in the pinctrl node.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Brad Bishop
8fc6327f0f ARM: dts: aspeed: rainier: Enable VUART1
Like most OpenPower machines the VUART is expected to be at /dev/ttyS5
for communication with the host over LPC.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Jinu Thomas
a3bff4fec5 ARM: dts: aspeed: rainier: Add i2c eeproms
Added eeproms for the below VPD devices
- BMC
- TPM
- System Planar
- DCM 0 VRM
- DCM 1 VRM
- Base Op panel
- Lcd Op panel
- DASD (All)
- PCIe Cards (All)

Signed-off-by: Jinu Joy Thomas <jinu.joy.thomas@in.ibm.com>
Reviewed-by: Santosh Puranik <santosh.puranik.ibm@gmail.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Joel Stanley
575640201e ARM: dts: aspeed: tacoma: Use 64MB for firmware memory
OpenBMC requires a window the same size as the image being loaded.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Joel Stanley
a981c93300 ARM: dts: aspeed: tacoma: Add host FSI description
This adds the description of the Power9 CPUs that are attached to the
BMC.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:46 +10:30
Joel Stanley
a750904577 ARM: dts: ast2600evb: Enable UART workaround
The UART has an issue on A0 that can be worked around by using the
Synopsis driver.

Tested-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:45 +10:30
Joel Stanley
77ef1b3991 ARM: dts: aspeed: tacoma: Add UART1 and workaround
The UARTs on the AST2600 A0 have a known issue that can be worked around
by using the Synopsys driver.

Tested-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:45 +10:30
Joel Stanley
c0d3e181d7 ARM: dts: aspeed-g6: Add remaining UARTs
The AST2600 has five UARTs. Add UART 1 to 4.

Tested-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:45 +10:30
Joel Stanley
8bba55f743 ARM: dts: aspeed-g6: Fix i2c clock source
The upstream clock for the I2C buses is APB2.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:45 +10:30
Andrew Jeffery
37ece7e341 ARM: dts: aspeed: Add RCLK to MAC clocks for RMII interfaces
We need to ungate RCLK on AST2500- and AST2600-based platforms for RMII
to function. RMII interfaces are commonly used for NCSI.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:45 +10:30
Joel Stanley
9d40f423d7 Merge branch 'aspeed-clk-for-v5.5'
This contains the dt-bindings headers for the ethernet clocks.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 20:54:12 +10:30
Joel Stanley
8737481e38 ARM: dts: aspeed: tacoma: Enable FMC and SPI devices
Tacoma has two SPI flash devices attached to the FMC, and one on the SPI
controller.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Brad Bishop
9c44db7096 ARM: dts: aspeed: rainier: Add i2c devices
Add fan controllers, regulators, temperature sensors, power supplies
and regulators.

Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Joel Stanley
0fe4e30478 ARM: dts: aspeed-g6: Describe FSI masters
The ast2600 has two FSI masters on the APB.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Cédric Le Goater
876c5d891c ARM: dts: aspeed: Add "spi-max-frequency" property
Keep the FMC controller chips at a safe 50 MHz rate and use 100 MHz
for the PNOR on the machines using a AST2500 SoC.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Andrew Jeffery
b46aaf8a66 ARM: dts: aspeed: Migrate away from aspeed, g[45].* compatibles
Use the SoC-specific compatible strings instead.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Alexander Filippov
10afc900f4 ARM: dts: vesnin: Add power_green led
Adds a new power_green led to show the host state.

Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Eddie James
6dbc7d9795 ARM: dts: aspeed: tacoma: Add gpio-key definitions
Add gpio-keys for various signals on Tacoma.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:21 +10:30
Andrew Jeffery
ad5d102784 ARM: dts: ast2600-evb: Add pinmux properties for enabled MACs
All 2600-evb MACs use RGMII/MDIO.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Andrew Jeffery
d29f8a6e42 ARM: dts: aspeed-g6: Add pinctrl properties to MDIO nodes
This way enabling the MDIO controllers automatically requests the right
pinmux configuration.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Andrew Jeffery
9f5a341eb9 ARM: dts: aspeed-g6: Fix EMMC function in pinctrl dtsi
The binding was updated to better reflect the intended use of the
hardware and the existing function/groups for SD3 were dropped.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Joel Stanley
a45d88725d ARM: dts: aspeed: ast2600evb: Use custom flash layout
The AST2600 u-boot and kernel images have outgrown the OpenBMC layout.
While BMC machines use 128MB SPI NOR chips, we only have 64MB on the EVB
so use a layout that has a smaller region for the ro and rw filesystems.

Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Cédric Le Goater
6700acf666 ARM: dts: ast2600-evb: Enable FMC and SPI devices
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Joel Stanley
8db6997f2b ARM: dts: aspeed: tacoma: Enable FMC and SPI devices
Tacoma has two SPI flash devices attached to the FMC, and one on the SPI
controller.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Cédric Le Goater
f97fa21f48 ARM: dts: aspeed: rainier: Enable FMC and SPI devices
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Brad Bishop
2efc118ce3 ARM: dts: aspeed: rainier: Add i2c devices
Add fan controllers, regulators, temperature sensors, power supplies
and regulators.

Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Brad Bishop
99e3cfa266 ARM: dts: aspeed: rainier: Add mac devices
Rainier contains two NCSI network devices.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Brad Bishop
961216c135 ARM: dts: aspeed: Add Rainier system
Rainier is a new IBM server with POWER host processors and an AST2600
BMC.

Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Brad Bishop
4caa4e302c ARM: dts: Add 128MiB OpenBMC flash layout
This is an alternate layout used by OpenBMC systems that require more
space on the BMC's flash. In addition to more space for the rootfs, it
supports a larger u-boot and Linux kernel FIT image.

The division of space is as follows:

 u-boot + env: 1MB
 kernel/FIT: 9MB
 rwfs: 86MB
 rofs: 32MB

Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Chicago Duan
d52ce2beca ARM: dts: aspeed: fp5280g2: Add LED configuration
Change BMC init-ok from GPIO to LED, which needs to blink when BMC
initialization is complete.

Use TAB to align some lines.

Signed-off-by: Chicago Duan <duanzhijia01@inspur.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Eddie James
606bcdde67 ARM: dts: aspeed: tacoma: Enable I2C busses
Enable all the I2C busses on Tacoma and add the I2C slave devices that
exist on the busses.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:20 +10:30
Joel Stanley
b58135ad1e ARM: dts: aspeed: Add Tacoma machine
This is an AST2600 based BMC card for a Power9 system.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:19 +10:30
Cédric Le Goater
51d5d1bf73 ARM: dts: aspeed-g6: Add FMC and SPI devices
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:19 +10:30
Brad Bishop
12ce8bd361 ARM: dts: aspeed-g6: Add lpc devices
Everything is the same as G5, except the devices have their own
interrupt now.

Acked-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:19 +10:30
Joel Stanley
2aed40eeb4 ARM: dts: aspeed-g6: Add VUART descriptions
The AST2600 has two VUART devices.

Reviewed-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
2019-11-01 15:33:19 +10:30