diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 03:34:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 03:34:56 -0500 |
commit | f9efbce6334844c7f8b9b9459f6d7a6fbc2928e0 (patch) | |
tree | 4490a75f7058885561ab498b68fa68e32cf5b969 /arch/arm/boot/dts/twl4030.dtsi | |
parent | 53575aa99dc1584484b99c8173042d8370f6ed88 (diff) | |
parent | 07eb663b7ec7fdb9c325e22e83f5975c724b6249 (diff) |
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC DT updates from Olof Johansson:
"Most of this branch consists of updates, additions and general churn
of the device tree source files in the kernel (arch/arm/boot/dts).
Besides that, there are a few things to point out:
- Lots of platform conversion on OMAP2+, with removal of old board
files for various platforms.
- Final conversion of a bunch of ux500 (ST-Ericsson) platforms as
well
- Some updates to pinctrl and other subsystems. Most of these are
for DT-enablement of the various platforms and acks have been
collected"
* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits)
ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
ARM: dts: bcm281xx: Add card detect GPIO
ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
ARM: bcm281xx: Add device node for the GPIO controller
ARM: mvebu: Add Netgear ReadyNAS 104 board
ARM: tegra: fix Tegra114 IOMMU register address
ARM: kirkwood: add support for OpenBlocks A7 platform
ARM: dts: omap4-panda: add DPI pinmuxing
ARM: dts: AM33xx: Add RNG node
ARM: dts: AM33XX: Add hwspinlock node
ARM: dts: OMAP5: Add hwspinlock node
ARM: dts: OMAP4: Add hwspinlock node
ARM: dts: use 'status' property for PCIe nodes
ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
ARM: mvebu: Add the core-divider clock to Armada 370/XP
...
Diffstat (limited to 'arch/arm/boot/dts/twl4030.dtsi')
-rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index 5aba238d1f1e..fb1b2ec8eaa9 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi | |||
@@ -23,6 +23,22 @@ | |||
23 | compatible = "ti,twl4030-wdt"; | 23 | compatible = "ti,twl4030-wdt"; |
24 | }; | 24 | }; |
25 | 25 | ||
26 | vaux1: regulator-vaux1 { | ||
27 | compatible = "ti,twl4030-vaux1"; | ||
28 | }; | ||
29 | |||
30 | vaux2: regulator-vaux2 { | ||
31 | compatible = "ti,twl4030-vaux2"; | ||
32 | }; | ||
33 | |||
34 | vaux3: regulator-vaux3 { | ||
35 | compatible = "ti,twl4030-vaux3"; | ||
36 | }; | ||
37 | |||
38 | vaux4: regulator-vaux4 { | ||
39 | compatible = "ti,twl4030-vaux4"; | ||
40 | }; | ||
41 | |||
26 | vcc: regulator-vdd1 { | 42 | vcc: regulator-vdd1 { |
27 | compatible = "ti,twl4030-vdd1"; | 43 | compatible = "ti,twl4030-vdd1"; |
28 | regulator-min-microvolt = <600000>; | 44 | regulator-min-microvolt = <600000>; |
@@ -35,10 +51,20 @@ | |||
35 | regulator-max-microvolt = <1800000>; | 51 | regulator-max-microvolt = <1800000>; |
36 | }; | 52 | }; |
37 | 53 | ||
38 | vpll2: regulator-vpll2 { | 54 | vio: regulator-vio { |
39 | compatible = "ti,twl4030-vpll2"; | 55 | compatible = "ti,twl4030-vio"; |
40 | regulator-min-microvolt = <1800000>; | 56 | }; |
41 | regulator-max-microvolt = <1800000>; | 57 | |
58 | vintana1: regulator-vintana1 { | ||
59 | compatible = "ti,twl4030-vintana1"; | ||
60 | }; | ||
61 | |||
62 | vintana2: regulator-vintana2 { | ||
63 | compatible = "ti,twl4030-vintana2"; | ||
64 | }; | ||
65 | |||
66 | vintdig: regulator-vintdig { | ||
67 | compatible = "ti,twl4030-vintdig"; | ||
42 | }; | 68 | }; |
43 | 69 | ||
44 | vmmc1: regulator-vmmc1 { | 70 | vmmc1: regulator-vmmc1 { |
@@ -65,6 +91,16 @@ | |||
65 | compatible = "ti,twl4030-vusb3v1"; | 91 | compatible = "ti,twl4030-vusb3v1"; |
66 | }; | 92 | }; |
67 | 93 | ||
94 | vpll1: regulator-vpll1 { | ||
95 | compatible = "ti,twl4030-vpll1"; | ||
96 | }; | ||
97 | |||
98 | vpll2: regulator-vpll2 { | ||
99 | compatible = "ti,twl4030-vpll2"; | ||
100 | regulator-min-microvolt = <1800000>; | ||
101 | regulator-max-microvolt = <1800000>; | ||
102 | }; | ||
103 | |||
68 | vsim: regulator-vsim { | 104 | vsim: regulator-vsim { |
69 | compatible = "ti,twl4030-vsim"; | 105 | compatible = "ti,twl4030-vsim"; |
70 | regulator-min-microvolt = <1800000>; | 106 | regulator-min-microvolt = <1800000>; |
@@ -98,4 +134,9 @@ | |||
98 | compatible = "ti,twl4030-pwmled"; | 134 | compatible = "ti,twl4030-pwmled"; |
99 | #pwm-cells = <2>; | 135 | #pwm-cells = <2>; |
100 | }; | 136 | }; |
137 | |||
138 | twl_pwrbutton: pwrbutton { | ||
139 | compatible = "ti,twl4030-pwrbutton"; | ||
140 | interrupts = <8>; | ||
141 | }; | ||
101 | }; | 142 | }; |