-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree updates from Grant Likely: "This branch contains the following changes: - Removal of CONFIG_OF_DEVICE, it is always enabled by CONFIG_OF - Remove #ifdef from linux/of_platform.h to increase compiler syntax coverage - Bug fix for address decoding on Bimini and js2x powerpc platforms. - miscellaneous binding changes One note on the above. The binding changes going in from all kinds of different trees has gotten rather out of hand. I picked up some during this cycle, but even going though my tree isn't a great fit. Ian Campbell has prototyped splitting the bindings and .dtb files into a separate repository. The plan is to migrate to using that sometime in the next few kernel releases which should get rid of a lot of the churn on binding docs and .dts files" * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: of: Fix address decoding on Bimini and js2x machines of: remove CONFIG_OF_DEVICE usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE of: remove of_platform_driver ibmebus: convert of_platform_driver to platform_driver driver core: move to_platform_driver to platform_device.h mfd: DT bindings for the palmas family MFD ARM: dts: omap3-devkit8000: fix NAND memory binding of/base: fix typos of: remove #ifdef from linux/of_platform.h
- Loading branch information
Showing
16 changed files
with
176 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
* palmas device tree bindings | ||
|
||
The TI palmas family current members :- | ||
twl6035 (palmas) | ||
twl6037 (palmas) | ||
tps65913 (palmas) | ||
tps65914 (palmas) | ||
|
||
Required properties: | ||
- compatible : Should be from the list | ||
ti,twl6035 | ||
ti,twl6036 | ||
ti,twl6037 | ||
ti,tps65913 | ||
ti,tps65914 | ||
ti,tps80036 | ||
and also the generic series names | ||
ti,palmas | ||
- interrupt-controller : palmas has its own internal IRQs | ||
- #interrupt-cells : should be set to 2 for IRQ number and flags | ||
The first cell is the IRQ number. | ||
The second cell is the flags, encoded as the trigger masks from | ||
Documentation/devicetree/bindings/interrupts.txt | ||
- interrupt-parent : The parent interrupt controller. | ||
|
||
Optional properties: | ||
ti,mux-padX : set the pad register X (1-2) to the correct muxing for the | ||
hardware, if not set will use muxing in OTP. | ||
|
||
Example: | ||
|
||
palmas { | ||
compatible = "ti,twl6035", "ti,palmas"; | ||
reg = <0x48> | ||
interrupt-parent = <&intc>; | ||
interrupt-controller; | ||
#interrupt-cells = <2>; | ||
|
||
ti,mux-pad1 = <0>; | ||
ti,mux-pad2 = <0>; | ||
|
||
#address-cells = <1>; | ||
#size-cells = <0>; | ||
|
||
pmic { | ||
compatible = "ti,twl6035-pmic", "ti,palmas-pmic"; | ||
.... | ||
}; | ||
} |
72 changes: 72 additions & 0 deletions
72
Documentation/devicetree/bindings/regulator/palmas-pmic.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
* palmas regulator IP block devicetree bindings | ||
|
||
Required properties: | ||
- compatible : Should be from the list | ||
ti,twl6035-pmic | ||
ti,twl6036-pmic | ||
ti,twl6037-pmic | ||
ti,tps65913-pmic | ||
ti,tps65914-pmic | ||
and also the generic series names | ||
ti,palmas-pmic | ||
- interrupt-parent : The parent interrupt controller which is palmas. | ||
- interrupts : The interrupt number and the type which can be looked up here: | ||
arch/arm/boot/dts/include/dt-bindings/interrupt-controller/irq.h | ||
- interrupts-name: The names of the individual interrupts. | ||
|
||
Optional properties: | ||
- ti,ldo6-vibrator : ldo6 is in vibrator mode | ||
|
||
Optional nodes: | ||
- regulators : Must contain a sub-node per regulator from the list below. | ||
Each sub-node should contain the constraints and initialization | ||
information for that regulator. See regulator.txt for a | ||
description of standard properties for these sub-nodes. | ||
Additional custom properties are listed below. | ||
|
||
For ti,palmas-pmic - smps12, smps123, smps3 depending on OTP, | ||
smps45, smps457, smps7 depending on variant, smps6, smps[8-10], | ||
ldo[1-9], ldoln, ldousb. | ||
|
||
Optional sub-node properties: | ||
ti,warm-reset - maintain voltage during warm reset(boolean) | ||
ti,roof-floor - control voltage selection by pin(boolean) | ||
ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto, | ||
2 - eco, 3 - forced pwm | ||
ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us | ||
ti,smps-range - OTP has the wrong range set for the hardware so override | ||
0 - low range, 1 - high range. | ||
|
||
Example: | ||
|
||
#include <dt-bindings/interrupt-controller/irq.h> | ||
|
||
pmic { | ||
compatible = "ti,twl6035-pmic", "ti,palmas-pmic"; | ||
interrupt-parent = <&palmas>; | ||
interrupts = <14 IRQ_TYPE_NONE>; | ||
interrupts-name = "short-irq"; | ||
|
||
ti,ldo6-vibrator; | ||
|
||
regulators { | ||
smps12_reg : smps12 { | ||
regulator-name = "smps12"; | ||
regulator-min-microvolt = < 600000>; | ||
regulator-max-microvolt = <1500000>; | ||
regulator-always-on; | ||
regulator-boot-on; | ||
ti,warm-reset; | ||
ti,roof-floor; | ||
ti,mode-sleep = <0>; | ||
ti,tstep = <0>; | ||
ti,smps-range = <1>; | ||
}; | ||
|
||
ldo1_reg: ldo1 { | ||
regulator-name = "ldo1"; | ||
regulator-min-microvolt = <2800000>; | ||
regulator-max-microvolt = <2800000>; | ||
}; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.