summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-11-08 10:32:19 -0800
committerOlof Johansson <olof@lixom.net>2019-11-08 10:32:21 -0800
commit743f4e5bc01f4f5b1d041c8dac5f471c010d8d8c (patch)
tree7ff116ecba747017d7acc204d18bec7d572f5624 /arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
parent44124df44db01b6ded323317f8d07b8541517c54 (diff)
parent3eca037f2dfce07a31da0a837ac35d6d846614b0 (diff)
downloadlinux-743f4e5bc01f4f5b1d041c8dac5f471c010d8d8c.tar.gz
Merge tag 'aspeed-5.5-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt
ASPEED device tree updates for 5.5 - Lots of work on the AST2600 boards as bringup continues. There's the eval board, and two IBM boards called Tacoma and Rainier - A new flash layout for OpenBMC systems with larger flashes - Better support for the MAC clocking when talking to a NCSI device, making Linux less reliant on u-boot having done the correct thing - LED fixes for vesin and fp5280g2 - SGPIO support - Facebook network BMC cleanup with the common hardware moved to a shared dtsi * tag 'aspeed-5.5-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (48 commits) ARM: dts: aspeed-g6: Add timer description ARM: dts: aspeed: ast2600evb: Enable i2c buses ARM: dts: aspeed-g5: Add SGPIO description ARM: dts: aspeed: yamp: Use common dtsi ARM: dts: aspeed: minipack: Use common dtsi ARM: dts: aspeed: cmm: Use common dtsi ARM: dts: aspeed: Common dtsi for Facebook AST2500 Network BMCs ARM: dts: aspeed: rainier: gpio-keys for PSU presence ARM: dts: aspeed: rainier: Fix i2c eeprom size ARM: dts: tacoma: Hog LPC pinmux ARM: dts: aspeed: rainier: Enable VUART1 ARM: dts: aspeed: rainier: Add i2c eeproms ARM: dts: aspeed: tacoma: Use 64MB for firmware memory ARM: dts: aspeed: tacoma: Add host FSI description ARM: dts: ast2600evb: Enable UART workaround ARM: dts: aspeed: tacoma: Add UART1 and workaround ARM: dts: aspeed-g6: Add remaining UARTs ARM: dts: aspeed-g6: Fix i2c clock source ARM: dts: aspeed: Add RCLK to MAC clocks for RMII interfaces ARM: dts: aspeed: tacoma: Enable FMC and SPI devices ... Link: https://lore.kernel.org/r/CACPK8Xe8XiJ+oEp3_AXO5Mox-mXWVrOJKQLJMKJxg1WdYCTzMw@mail.gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts')
-rw-r--r--arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
index 682f729ea25e..5d7cbd9164d4 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
@@ -126,6 +126,9 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii1_default>;
+ clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>,
+ <&syscon ASPEED_CLK_MAC1RCLK>;
+ clock-names = "MACCLK", "RCLK";
use-ncsi;
};