| Message ID | 1362662276-20792-1-git-send-email-ian@slimlogic.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This patchset adds to the support for the Palmas iseries of PMIC chips. Some of the patches have previously been submitted individually. The DT bindings doc has been added first due to comments that it was missing. Patches based on linux-next-20130306 mfd: DT bindings for the palmas family MFD mfd: palmas: is_palmas_charger needed by multiple driv mfd: palmas add variant and OTP detection regulator: palmas correct dt parsing watchdog: add Palmas Watchdog support watchdog: Kconfig for Palmas watchdog gpio: palmas: add in GPIO support for palmas charger gpio: palmas: Enable DT support for palmas gpio leds: Add support for Palmas LEDs leds: Kconfig for Palmas LEDs clk: add a clock driver for palmas clk: Kconfig for Palmas clock driver .../devicetree/bindings/clock/palmas-clk.txt | 25 + .../devicetree/bindings/gpio/gpio-palmas.txt | 21 + .../devicetree/bindings/input/palmas-pwrbutton.txt | 22 + .../devicetree/bindings/leds/leds-palmas.txt | 35 ++ Documentation/devicetree/bindings/mfd/palmas.txt | 70 +++ .../devicetree/bindings/regulator/palmas-pmic.txt | 168 ++++++ .../devicetree/bindings/rtc/palmas-rtc.txt | 22 + .../devicetree/bindings/watchdog/palmas-wdt.txt | 22 + drivers/clk/Kconfig | 8 + drivers/clk/Makefile | 1 + drivers/clk/clk-palmas.c | 268 ++++++++++ drivers/gpio/gpio-palmas.c | 90 +++- drivers/leds/Kconfig | 9 + drivers/leds/Makefile | 1 + drivers/leds/leds-palmas.c | 560 ++++++++++++++++++++ drivers/mfd/palmas.c | 103 +++- drivers/regulator/palmas-regulator.c | 36 +- drivers/watchdog/Kconfig | 8 + drivers/watchdog/Makefile | 1 + drivers/watchdog/palmas_wdt.c | 170 ++++++ include/linux/mfd/palmas.h | 119 ++++- 21 files changed, 1703 insertions(+), 56 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/palmas-clk.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-palmas.txt create mode 100644 Documentation/devicetree/bindings/input/palmas-pwrbutton.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-palmas.txt create mode 100644 Documentation/devicetree/bindings/mfd/palmas.txt create mode 100644 Documentation/devicetree/bindings/regulator/palmas-pmic.txt create mode 100644 Documentation/devicetree/bindings/rtc/palmas-rtc.txt create mode 100644 Documentation/devicetree/bindings/watchdog/palmas-wdt.txt create mode 100644 drivers/clk/clk-palmas.c create mode 100644 drivers/leds/leds-palmas.c create mode 100644 drivers/watchdog/palmas_wdt.c
On Thu, Mar 7, 2013 at 2:23 PM, Ian Lartey <ian@slimlogic.co.uk> wrote: > This patchset adds to the support for the Palmas iseries of PMIC chips. > > Some of the patches have previously been submitted individually. > The DT bindings doc has been added first due to comments that it was > missing. Can the patches to the individual subsystems be applied individually (like can we apply the two GPIO patches to the GPIO tree) or are the deps such that the whole shebang needs to go in at once and you're just harvesting ACKs to take it all into MFD or similar? Yours, Linus Walleij
On 08/03/13 07:12, Linus Walleij wrote: > On Thu, Mar 7, 2013 at 2:23 PM, Ian Lartey <ian@slimlogic.co.uk> wrote: > >> This patchset adds to the support for the Palmas iseries of PMIC chips. >> >> Some of the patches have previously been submitted individually. >> The DT bindings doc has been added first due to comments that it was >> missing. > > Can the patches to the individual subsystems be applied individually > (like can we apply the two GPIO patches to the GPIO tree) or are > the deps such that the whole shebang needs to go in at once and you're > just harvesting ACKs to take it all into MFD or similar? There are a few dependencies: The GPIO and LEDS subsystem patches both depend on: [PATCH v8 02/12] mfd: palmas: is_palmas_charger needed by multiple drivers all the subsystems depend on: [PATCH v8 01/12] mfd: DT bindings for the palmas family MFD for their DT documentation. so taking the whole shooting match in one go seems the safest. > > Yours, > Linus Walleij Regards, Ian
On 03/07/2013 06:17 AM, Ian Lartey wrote: > From: Graeme Gregory <gg@slimlogic.co.uk> > > Add the various binding files for the palmas family of chips. There is a > top level MFD binding then a seperate binding for IP blocks on chips. Sorry for the slow review. Thanks for the binding docs. I understand the structure a bit better now. > diff --git a/Documentation/devicetree/bindings/clock/palmas-clk.txt b/Documentation/devicetree/bindings/clock/palmas-clk.txt > +* palmas and palmas-charger resource clock IP block devicetree bindings > + > +Required properties: > +- compatible : Should be from the list > + ti,twl6035-clk ... > +and also the generic series names > + ti,palmas-clk > + ti,palmas-charger-clk (Most of these comments apply to all the binding files). How do I know which one of those to pick; I guess you intend it to be based on whether the top-level chip is a charger or not? I don't see why the clock sub-module would care about that; isn't it just an (the same) IP block that has been slapped inside some top-level chip? In other words, do we really need two separate compatible values here, or should there just be a single generic "ti,palmas-clk"? > +Optional properties: > +- ti,clk32g-mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - on > +- ti,clkg32kgaudio-mode-sleep - see above If this is a clock provider (i.e. the HW has clock output signals), shouldn't it also have #clock-cells, and a description of the clock specifier format? If this is a clock consumer (i.e. the HW has clock input signals), shouldn't it also have clocks/clock-names properties to describe what the source of those clocks is? Did you omit the reg property from this document just because it's so standard you didn't think describing it was necessary? Certainly the final DT file must have a reg property if the use of sub-nodes is to be useful; the block could easily be instantiated at different addresses in different top-level chips, so the base register address for this block has to be defined in DT, I think. > +Examples: > + > +clk { > + compatible = "ti,twl6035-clk", "ti,palmas-clk"; > + ti,clk32kg-mode-sleep = <0>; > + ti,clk32kgaudio-mode-sleep = <0>; > +}; It might be nice to show the sub-block examples within a parent top-level Palmas node just to make it clear. But probably not a big deal. > diff --git a/Documentation/devicetree/bindings/gpio/gpio-palmas.txt b/Documentation/devicetree/bindings/gpio/gpio-palmas.txt This document needs to describe the #gpio-cells property, and the format of the GPIO specifier. Can the GPIOs be used for a purpose other than plain GPIO (i.e. dedicate signals such as IRQ output?). If so, don't you need to describe that pin setup here? Perhaps that'd be part of the top-level MFD node or a separate pinctrl node though. Can the GPIOs act as interrupt inputs i.e. generate interrupts on change/level? In which case, the interrupt-controller and #interrupt-cells properties must be present, and the format of the IRQ specifier documented. > diff --git a/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt b/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt > new file mode 100644 > index 0000000..00739e9 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt > @@ -0,0 +1,22 @@ > +* palmas and palmas-charger Button IP block devicetree bindings > + > +Required properties: > +- compatible : Should be from the list > + ti,twl6035-pwrbutton ... > + > +Examples: s/Examples/Example/. Same elsewhere. > +pwrbutton { > + compatible = "ti,twl6035-pwrbutton", "ti,palmas-pwrbutton"; > + interrupt-parent = <&palmas>; > + interrupts = <1 0>; > + interrupt-name = "pwron-irq"; Don't you need to describe the interrupt-related properties in the list of required properties above? This is especially true since this example implies that a particular interrupt-names (which incidentally should be plural in the example above) value is required. > diff --git a/Documentation/devicetree/bindings/leds/leds-palmas.txt b/Documentation/devicetree/bindings/leds/leds-palmas.txt > +-ti,chrg-led-mode - mode for led operation 0 - Charging indicator > + 1 - controlled as a general purpose LED > +-ti,chrg-led-vbat-low - low battery blinking 0 - blinking is enabled, > + 1 - blinking is disabled Which LED(s) do those two properties apply to? > diff --git a/Documentation/devicetree/bindings/mfd/palmas.txt b/Documentation/devicetree/bindings/mfd/palmas.txt > +- interrupt-controller : palmas has its own internal IRQs > +- #interrupt-cells : should be set to 2 for IRQ number and flags At least a mention of the valid IRQ flags (or pointer to another document which defines this) should be included. > +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. This doesn't really describe what value to put here. I assume it's the raw value to write into the register? Is there any need to expose a full pinctrl driver here, for dynamic pin muxing? Since this node is a bus which has child devices on it, you should include either a ranges property (if the children fit directly into the parent bus's address space), or more likely if the address space "starts over" at this point, you need #address-cells and #size-cells to describe the format of child nodes' reg properties. > diff --git a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt > +Optional properties: "regulators" below isn't a property, it's a node. > +- regulators : should contain the constrains and init information for the > + regulators. It should contain a subnode per regulator from the > + list. > + For palmas - smps12, smps123, smps3 depending on OTP, > + smps45, smps457, smps7 depending on varient, smps6, smps[8-10], > + ldo[1-9], ldoln, ldousb > + For palmas-charger - smps12, smps123, smps3 depending on OTP, > + smps[6-9], boost, ldo[1-14], ldoln, ldousb Rather than "For palmas" and "For palmas-charger", shouldn't that say "For ti,palmas-pmic" and "For ti,palmas-charger-pmic", since the internals of this node should be entirely self-contained and defined by this one binding, rather than being influenced by the top-level chip that contains this block.
diff --git a/Documentation/devicetree/bindings/clock/palmas-clk.txt b/Documentation/devicetree/bindings/clock/palmas-clk.txt new file mode 100644 index 0000000..a17bc62 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/palmas-clk.txt @@ -0,0 +1,25 @@ +* palmas and palmas-charger resource clock IP block devicetree bindings + +Required properties: +- compatible : Should be from the list + ti,twl6035-clk + ti,twl6036-clk + ti,twl6037-clk + ti,tps65913-clk + ti,tps65914-clk + ti,tps80036-clk +and also the generic series names + ti,palmas-clk + ti,palmas-charger-clk + +Optional properties: +- ti,clk32g-mode-sleep - mode to adopt in pmic sleep 0 - off, 1 - on +- ti,clkg32kgaudio-mode-sleep - see above + +Examples: + +clk { + compatible = "ti,twl6035-clk", "ti,palmas-clk"; + ti,clk32kg-mode-sleep = <0>; + ti,clk32kgaudio-mode-sleep = <0>; +}; diff --git a/Documentation/devicetree/bindings/gpio/gpio-palmas.txt b/Documentation/devicetree/bindings/gpio/gpio-palmas.txt new file mode 100644 index 0000000..0b1c629 --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/gpio-palmas.txt @@ -0,0 +1,21 @@ +* palmas and palmas charger GPIO IP block devicetree bindings + +Required properties: +- compatible : Should be from the list + ti,twl6035-gpio + ti,twl6036-gpio + ti,twl6037-gpio + ti,tps65913-gpio + ti,tps65914-gpio + ti,tps80036-gpio + +and also the generic series names + + ti,palmas-gpio + ti,palmas-charger-gpio + +Examples: + +gpio { + compatible = "ti,twl6035-gpio", "ti,palmas-gpio"; +}; diff --git a/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt b/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt new file mode 100644 index 0000000..00739e9 --- /dev/null +++ b/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt @@ -0,0 +1,22 @@ +* palmas and palmas-charger Button IP block devicetree bindings + +Required properties: +- compatible : Should be from the list + ti,twl6035-pwrbutton + ti,twl6036-pwrbutton + ti,twl6037-pwrbutton + ti,tps65913-pwrbutton + ti,tps65914-pwrbutton + ti,tps80036-pwrbutton +and also the generic series names + ti,palmas-pwrbutton + ti,palmas-charger-pwrbutton + +Examples: + +pwrbutton { + compatible = "ti,twl6035-pwrbutton", "ti,palmas-pwrbutton"; + interrupt-parent = <&palmas>; + interrupts = <1 0>; + interrupt-name = "pwron-irq"; +}; diff --git a/Documentation/devicetree/bindings/leds/leds-palmas.txt b/Documentation/devicetree/bindings/leds/leds-palmas.txt new file mode 100644 index 0000000..9a67858 --- /dev/null +++ b/Documentation/devicetree/bindings/leds/leds-palmas.txt @@ -0,0 +1,35 @@ +* palmas and palmas-charger LED IP block devicetree bindings + +Required properties: +- compatible : Should be from the list + ti,twl6035-leds + ti,twl6036-leds + ti,twl6037-leds + ti,tps65913-leds + ti,tps65914-leds + ti,tps80036-leds +and also the generic series names + ti,palmas-leds + ti,palmas-charger-leds + +Optional properties: +-ti,led1-current - sink current setting 0 - 0mA, 1 - 25mA, 2 - 5mA, + 3 - 0mA, 4 - 5mA, 5 - 5mA, 6 - 10.0mA, 7 - 0mA +-ti,led2-current - see above +-ti,led3-current - see above +-ti,led4-current - see above +-ti,chrg-led-mode - mode for led operation 0 - Charging indicator + 1 - controlled as a general purpose LED +-ti,chrg-led-vbat-low - low battery blinking 0 - blinking is enabled, + 1 - blinking is disabled + +Examples: +leds { + compatible = "ti,twl6035-leds", "ti,palmas-leds"; + ti,led1-current = <0>; + ti,led2-current = <0>; + ti,led3-current = <0>; + ti,led4-current = <0>; + ti,chrg-led-mode = <0>; + ti,chrg-led-vbat-low = <0>; +}; diff --git a/Documentation/devicetree/bindings/mfd/palmas.txt b/Documentation/devicetree/bindings/mfd/palmas.txt new file mode 100644 index 0000000..cb34e1f --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/palmas.txt @@ -0,0 +1,70 @@ +* palmas and palmas-charger device tree bindings + +The TI palmas family current members :- +twl6035 (palmas) +twl6036 (palmas-charger) +twl6037 (palmas) +tps65913 (palmas) +tps65914 (palmas) +tps80036 (palmas-charger) + +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 + ti,palmas-charger +- interrupt-controller : palmas has its own internal IRQs +- #interrupt-cells : should be set to 2 for IRQ number and flags + +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. + +palmas { + compatible = "ti,twl6035", "ti,palmas"; + interrupt-controller; + #interrupt-cells = <2>; + + ti,mux-pad1 = <0>; + ti,mux-pad2 = <0>; + + pmic { + compatible = "ti,twl6035-pmic", "ti,palmas-pmic"; + .... + } + + gpio { + compatible = "ti,twl6035-gpio", "ti,palmas-gpio"; + .... + }; + + wdt { + compatible = "ti,twl6035-wdt", "ti,palmas-wdt"; + .... + }; + + rtc { + compatible = "ti,twl6035-rtc", "ti,palmas-rtc"; + .... + }; + + pwrbutton { + compatible = "ti,twl6035-pwrbutton", "ti,palmas-pwrbutton"; + .... + }; + + leds { + compatible = "ti,twl6035-leds", "ti-palmas-leds"; + } + + clk { + compatible = "ti,twl6035-clk", "ti,palmas-clk"; + .... + }; +} diff --git a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt new file mode 100644 index 0000000..9654179 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt @@ -0,0 +1,168 @@ +* palmas and palmas-charger 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 + ti,tps80036-pmic +and also the generic series names + ti,palmas-pmic + ti,palmas-charger-pmic + +Optional properties: +- regulators : should contain the constrains and init information for the + regulators. It should contain a subnode per regulator from the + list. + For palmas - smps12, smps123, smps3 depending on OTP, + smps45, smps457, smps7 depending on varient, smps6, smps[8-10], + ldo[1-9], ldoln, ldousb + For palmas-charger - smps12, smps123, smps3 depending on OTP, + smps[6-9], boost, ldo[1-14], ldoln, ldousb + + optional chip specific regulator fields :- + ti,warm-reset - maintain voltage during warm reset + ti,roof-floor - control voltage selection by pin + 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 + +- ti,ldo6-vibrator : ldo6 is in vibrator mode + +Examples: + +pmic@0 { + compatible = "ti,twl6035-pmic", "ti,palmas-pmic"; + interrupt-parent = <&palmas>; + interrupts = <14 0>; + interrupt-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>; + }; + + smps3_reg: smps3 { + regulator-name = "smps3"; + regulator-min-microvolt = < 600000>; + regulator-max-microvolt = <1310000>; + }; + + smps45_reg: smps45 { + regulator-name = "smps45"; + regulator-min-microvolt = < 600000>; + regulator-max-microvolt = <1310000>; + }; + + smps6_reg: smps6 { + regulator-name = "smps6"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + smps7_reg: smps7 { + regulator-name = "smps7"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + smps8_reg: smps8 { + regulator-name = "smps8"; + regulator-min-microvolt = < 600000>; + regulator-max-microvolt = <1310000>; + }; + + smps9_reg: smps9 { + regulator-name = "smps9"; + regulator-min-microvolt = <2100000>; + regulator-max-microvolt = <2100000>; + }; + + smps10_reg: smps10 { + regulator-name = "smps10"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + + ldo1_reg: ldo1 { + regulator-name = "ldo1"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + + ldo2_reg: ldo2 { + regulator-name = "ldo2"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + }; + + ldo3_reg: ldo3 { + regulator-name = "ldo3"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + ldo4_reg: ldo4 { + regulator-name = "ldo4"; + regulator-min-microvolt = <2200000>; + regulator-max-microvolt = <2200000>; + }; + + ldo5_reg: ldo5 { + regulator-name = "ldo5"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + ldo6_reg: ldo6 { + regulator-name = "ldo6"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + }; + + ldo7_reg: ldo7 { + regulator-name = "ldo7"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + }; + + ldo8_reg: ldo8 { + regulator-name = "ldo8"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + }; + + ldo9_reg: ldo9 { + regulator-name = "ldo9"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + ldoln_reg: ldoln { + regulator-name = "ldoln"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + ldousb_reg: ldousb { + regulator-name = "ldousb"; + regulator-min-microvolt = <3250000>; + regulator-max-microvolt = <3250000>; + }; + }; +}; diff --git a/Documentation/devicetree/bindings/rtc/palmas-rtc.txt b/Documentation/devicetree/bindings/rtc/palmas-rtc.txt new file mode 100644 index 0000000..4e779c4 --- /dev/null +++ b/Documentation/devicetree/bindings/rtc/palmas-rtc.txt @@ -0,0 +1,22 @@ +* palmas and palmas-charger RTC IP block devicetree bindings + +Required properties: +- compatible : Should be from the list + ti,twl6035-rtc + ti,twl6036-rtc + ti,twl6037-rtc + ti,tps65913-rtc + ti,tps65914-rtc + ti,tps80036-rtc +and also the generic series names + ti,palmas-rtc + ti,palmas-charger-rtc + +Examples: + +rtc { + compatible = "ti,twl6035-rtc", "ti,palmas-rtc"; + interrupt-parent = <&palmas>; + interrupts = <8 0 9 0>; + interrupt-name = "alarm-irq", "timer-irq"; +}; diff --git a/Documentation/devicetree/bindings/watchdog/palmas-wdt.txt b/Documentation/devicetree/bindings/watchdog/palmas-wdt.txt new file mode 100644 index 0000000..1720f2e --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/palmas-wdt.txt @@ -0,0 +1,22 @@ +* palmas and palmas-charger Watchdog IP block devicetree bindings + +Required properties: +- compatible : Should be from the list + ti,twl6035-wdt + ti,twl6036-wdt + ti,twl6037-wdt + ti,tps65913-wdt + ti,tps65914-wdt + ti,tps80036-wdt +and also the generic series names + ti,palmas-wdt + ti,palmas-charger-wdt + +Examples: + +wdt { + compatible = "ti,twl6035-wdt", "ti,palmas-wdt"; + interrupt-parent = <&palmas>; + interrupts = <10 0>; + interrupt-name = "watchdog-irq"; +};