diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-28 10:10:01 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-28 10:10:03 +0300 |
| commit | 73bf2131d057cdbebf5e79901f8017015ecbd3e6 (patch) | |
| tree | 6a18c09f3843bf545e07da555ecbdebbfe0976f8 /arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | |
| parent | 7fbdc6afd02b284441515beda0cde670fbae58a3 (diff) | |
| parent | 2c887638a5fa1ac5e2491ae911f50d554b604985 (diff) | |
| download | linux-73bf2131d057cdbebf5e79901f8017015ecbd3e6.tar.xz | |
Merge tag 'aspeed-5.9-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt
ASPEED device tree updates for 5.9
There is one new machine; AMD's EthanolX reference platform with an
AST2600 BMC.
Misc updates for Rainier, Tacoma, Wedge and Mihawk machines.
* tag 'aspeed-5.9-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (26 commits)
ARM: dts: Aspeed: tacoma: Enable EHCI controller
ARM: dts: aspeed: rainier: Enable EHCI controller
ARM: dts: aspeed: rainier: Switch OCCs to P10
ARM: dts: aspeed: rainier: Add FSI I2C masters
ARM: dts: aspeed: rainier: Add CFAM SPI controllers
ARM: dts: aspeed: rainier: Add I2C buses for NVMe use
ARM: dts: aspeed: Initial device tree for AMD EthanolX
ARM: dts: rainier: Describe GPIO mux on I2C3
ARM: dts: aspeed: wedge40: Enable pwm_tacho device
ARM: dts: aspeed: wedge40: Enable ADC device
ARM: dts: aspeed: wedge40: Disable unused i2c controllers
ARM: dts: aspeed: cmm: Fixup I2C tree
ARM: dts: aspeed: tacoma: Add CFAM reset GPIO
ARM: dts: aspeed: rainier: Add CFAM reset GPIO
ARM: dts: aspeed: tacoma: Fix gpio-key definitions
ARM: dts: rainier: Configure ball Y23 as GPIOP7 for MCLR_VPP
ARM: dts: aspeed: rainier: Add second cfam on the hub
ARM: dts: aspeed: rainier: Add line-name checkstop
ARM: dts: aspeed: tacoma: Remove checkstop gpio-key
ARM: dts: aspeed: tacoma: Enable XDMA engine
...
Link: https://lore.kernel.org/r/CACPK8Xf_Np7LtcDFhywi6Uk1EgUpb0pVVa+Lr9YEwBRjbjOKCQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts index 54e508530dce..8ac23ff6b09e 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts @@ -27,6 +27,11 @@ memory@40000000 { reg = <0x40000000 0x20000000>; }; + + ast-adc-hwmon { + compatible = "iio-hwmon"; + io-channels = <&adc 5>, <&adc 6>, <&adc 7>, <&adc 8>, <&adc 9>; + }; }; &wdt1 { @@ -115,26 +120,47 @@ status = "okay"; }; -&i2c9 { +&i2c11 { status = "okay"; }; -&i2c10 { +&i2c12 { status = "okay"; }; -&i2c11 { +&vhub { status = "okay"; }; -&i2c12 { +&adc { status = "okay"; }; -&i2c13 { +&pwm_tacho { status = "okay"; -}; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_default + &pinctrl_pwm1_default + &pinctrl_pwm6_default + &pinctrl_pwm7_default>; + + fan@0 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>; + }; -&vhub { - status = "okay"; + fan@1 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>; + }; + + fan@6 { + reg = <0x06>; + aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>; + }; + + fan@7 { + reg = <0x07>; + aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>; + }; }; |