diff options
author | David S. Miller <davem@davemloft.net> | 2019-04-09 08:39:36 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-09 08:39:36 +0200 |
commit | 310655b07ae8ef0b8fdb641b610ded2052215664 (patch) | |
tree | d9b7a500ef21a087a337e1f1bb9218000cf1c03d /arch/arm/boot/dts/am335x-evm.dts | |
parent | ethtool: thunder_bgx: use ethtool.h constants for speed and duplex (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-310655b07ae8ef0b8fdb641b610ded2052215664.tar.xz linux-310655b07ae8ef0b8fdb641b610ded2052215664.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/boot/dts/am335x-evm.dts')
-rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index dce5be5df97b..edcff79879e7 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -57,6 +57,24 @@ enable-active-high; }; + /* TPS79501 */ + v1_8d_reg: fixedregulator-v1_8d { + compatible = "regulator-fixed"; + regulator-name = "v1_8d"; + vin-supply = <&vbat>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + /* TPS79501 */ + v3_3d_reg: fixedregulator-v3_3d { + compatible = "regulator-fixed"; + regulator-name = "v3_3d"; + vin-supply = <&vbat>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + matrix_keypad: matrix_keypad0 { compatible = "gpio-matrix-keypad"; debounce-delay-ms = <5>; @@ -499,10 +517,10 @@ status = "okay"; /* Regulators */ - AVDD-supply = <&vaux2_reg>; - IOVDD-supply = <&vaux2_reg>; - DRVDD-supply = <&vaux2_reg>; - DVDD-supply = <&vbat>; + AVDD-supply = <&v3_3d_reg>; + IOVDD-supply = <&v3_3d_reg>; + DRVDD-supply = <&v3_3d_reg>; + DVDD-supply = <&v1_8d_reg>; }; }; |