diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-05-03 06:23:47 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-31 20:04:46 -0400 |
commit | bc36748153eea3813018fae3e361a941213e9ada (patch) | |
tree | 74458d04c633f3be7198a3cb42ed36ed7889c837 /arch/arm | |
parent | 890d84fac09b7e3986317c9f6d53a7924ac10161 (diff) |
ARM: ux500: Provide regulator support for SMSC911x via Device Tree
This patch adds a fixed regulator for use by the SMSC911x Ethernet
chip driver into the db8500 Device Tree. It also references other
regulators required by the same device.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/snowball.dts | 13 | ||||
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 81ff557177a7..d6c05ea9e518 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts | |||
@@ -20,6 +20,16 @@ | |||
20 | reg = <0x00000000 0x20000000>; | 20 | reg = <0x00000000 0x20000000>; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | en_3v3_reg: en_3v3 { | ||
24 | compatible = "regulator-fixed"; | ||
25 | regulator-name = "en-3v3-fixed-supply"; | ||
26 | regulator-min-microvolt = <3300000>; | ||
27 | regulator-max-microvolt = <3300000>; | ||
28 | gpios = <&gpio0 26 0x4>; // 26 | ||
29 | startup-delay-us = <5000>; | ||
30 | enable-active-high; | ||
31 | }; | ||
32 | |||
23 | gpio_keys { | 33 | gpio_keys { |
24 | compatible = "gpio-keys"; | 34 | compatible = "gpio-keys"; |
25 | #address-cells = <1>; | 35 | #address-cells = <1>; |
@@ -79,6 +89,9 @@ | |||
79 | reg = <0 0x10000>; | 89 | reg = <0 0x10000>; |
80 | interrupts = <12 0x1>; | 90 | interrupts = <12 0x1>; |
81 | interrupt-parent = <&gpio4>; | 91 | interrupt-parent = <&gpio4>; |
92 | vdd33a-supply = <&en_3v3_reg>; | ||
93 | vddvario-supply = <&db8500_vape_reg>; | ||
94 | |||
82 | 95 | ||
83 | reg-shift = <1>; | 96 | reg-shift = <1>; |
84 | reg-io-width = <2>; | 97 | reg-io-width = <2>; |
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 7e84f453e8a6..2d4f661d1cf6 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -75,6 +75,7 @@ CONFIG_AB5500_CORE=y | |||
75 | CONFIG_AB8500_CORE=y | 75 | CONFIG_AB8500_CORE=y |
76 | CONFIG_REGULATOR=y | 76 | CONFIG_REGULATOR=y |
77 | CONFIG_REGULATOR_AB8500=y | 77 | CONFIG_REGULATOR_AB8500=y |
78 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
78 | # CONFIG_HID_SUPPORT is not set | 79 | # CONFIG_HID_SUPPORT is not set |
79 | CONFIG_USB_GADGET=y | 80 | CONFIG_USB_GADGET=y |
80 | CONFIG_AB8500_USB=y | 81 | CONFIG_AB8500_USB=y |