Add support for TI TPS65219 PMIC.
Subsystems (6)
v2 cover Add support for TI TPS65219 PMIC.
Not implemented
- DVS
1-Regulators:
Full implementation and test
Visual check: cat /sys/kernel/debug/regulator/regulator_summary Full validation requires userspace-consumer and virtual-regulator LDO1 is not used and output can be probbed on TP84.
2-Reset WARM/COLD
test procedure: launch reboot on the console and check visually
warm vs. cold can be configured on the kernel command-line at boot time. Default is cold, but adding reboot=w
to kernel command allow testing warm reboot.
Alternative:# echo warm > /sys/kernel/reboot/mode
3-SW Shutdown
test procedure: launch halt on the console and check visually
Note: enters in competition with other source during probe
Board Test Points can be used to check voltage after system shutdown. baseport is not handling wakeup.
A power OFF/ON cycle is needed to recover.
4-Interrupt Pin (nINT):
Interrupt occurring on PMIC TPS65219 is propagated to SOC through EXTINTn pin connected to gic500 interrupt controller
Interrupt lines for TPS65219 shows-up on console:
cat /proc/interrupts
Validation:
Create a Residual Voltage interrupt and handling and interrupt source is cleared. tps65219 0-0030: Registered residual voltage for LDO1533: 1 0 tps65219_irq 35 Edge LDO1_RV
Mapped to power button (use TP90 to GND to emulate a physical button)
5-PB Startup and Shutdown:
New implementation to support both rising and falling edge.
TPS65219 has different interrupts compared to other TPS6521* chips. TPS65219 defines two interrupts for the powerbutton one for push and one for release.
Interrupt support: cat proc/interrupts
`557: 0 0 tps65219_irq 47 Edge tps65219-pwrbutton.1.auto` `558: 0 0 tps65219_irq 48 Edge tps65219-pwrbutton.1.auto`
TPS65219 has a multipurpose pin called EN/PB/VSENSE that can be either:
- EN in which case it functions as an enable pin.
- VSENSE which compares the voltages and triggers an automatic on/off request.
- PB in which case it can be configured to trigger an interrupt to the SoC. ti,power-button reflects the last one of those options
where the board has a button wired to the pin and triggers
an interrupt on pressing it.
6-Changes vs v1:
6.1- Regulators:
- Further to Mark Brown review:
Use standard regmap helpers for set_voltage, enable and disable. tps65219_set_mode, return -EINVAL in default statement for clarity. Reshaped irq handler to report events through the notification API:regulator_notifier_call_chain().
Use standard regulator events (consumer.h).
6.2- Device tree
- Further to Nishanth Menon review:
add tag DONOTMERGE
Board support is pending waiting for TI commitment.
This device tree is needed for driver test purpose but should not go upstream.
6.3- Bindings
- Further to Rob Herring review:
Squash interrupt commit into regulator dt-binding.
Squash pwrbutton commit into regulator dt-binding.
Remove interrupt-controller/cells properties because no consumer for those interrupts.
- Further to Mark Brown review:
Remove constraints on regulator-name.
- Pending for decision from Lee Jones further to Mark Brown review The entire binding document should probably be in MFD if it's going to have properties for other functions added to it.
6.4- Misc
- Further to Mark Brown review:
Use C++ (//) formatting for file header block including SPDX License in mfd, regulator and pwrbutton.
Jerome Neanne (7):
DONOTMERGE: arm64: dts: ti: Add TI TPS65219 PMIC support for AM642 SK
board.
DONOTMERGE: arm64: dts: ti: Add pinmux and irq mapping for TPS65219
external interrupts
regulator: dt-bindings: Add TI TPS65219 PMIC bindings
mfd: drivers: Add TI TPS65219 PMIC support
mfd: drivers: Add interrupts support to TI TPS65219 PMIC
regulator: drivers: Add TI TPS65219 PMIC regulators support
arm64: defconfig: Add tps65219 as modules
Markus Schneider-Pargmann (4):
DONOTMERGE: arm64: dts: ti: k3-am642-sk: Enable tps65219 power-button
MAINTAINERS: OMAP2+ support, add tps65218-pwrbutton
mfd: tps65219: Add power-button support
Input: Add tps65219 interrupt driven powerbutton
.../bindings/regulator/ti,tps65219.yaml | 164 +++++++ MAINTAINERS | 4 + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 115 +++++ arch/arm64/configs/defconfig | 3 + drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/tps65219-pwrbutton.c | 150 ++++++ drivers/mfd/Kconfig | 15 + drivers/mfd/Makefile | 1 + drivers/mfd/tps65219.c | 437 ++++++++++++++++++ drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/tps65219-regulator.c | 416 +++++++++++++++++ include/linux/mfd/tps65219.h | 364 +++++++++++++++ 14 files changed, 1690 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65219.yaml create mode 100644 drivers/input/misc/tps65219-pwrbutton.c create mode 100644 drivers/mfd/tps65219.c create mode 100644 drivers/regulator/tps65219-regulator.c create mode 100644 include/linux/mfd/tps65219.h
Signature · 1 line
2.17.1
PATCH v2 1/11 DONOTMERGE: arm64: dts: ti: Add TI TPS65219 PMIC support for AM642 SK board.
Add support fot the TI Power Management IC TPS65219 on the AM642 SKEVM board.
Needed for driver testing but official board support pending. TI commitment is required before board upstream kick-off.
--- arch/arm64/boot/dts/ti/k3-am642-sk.dts | 104 +++++++++++++++++++++++++ 1 file changed, 104 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +104 -0
@@ -150,6 +150,20 @@ vin-supply = <&com8_ls_en>; gpio = <&main_gpio0 48 GPIO_ACTIVE_HIGH>; }; + + vsel_sd_nddr: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; + pinctrl-0 = <&vsel_sd_nddr_pins_default>; + regulator-name = "tps65219-LDO1-SEL-SD"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + vin-supply = <&ldo1_reg>; + gpios = <&main_gpio0 45 GPIO_ACTIVE_HIGH>; + states = <1800000 0x0>, + <3300000 0x1>; + }; }; &main_pmx0 {
@@ -172,6 +186,13 @@ >; }; + main_i2c0_pins_default: main-i2c0-pins-default { + pinctrl-single,pins = < + AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18) I2C0_SCL */ + AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18) I2C0_SDA */ + >; + }; + main_i2c1_pins_default: main-i2c1-pins-default { pinctrl-single,pins = < AM64X_IOPAD(0x0268, PIN_INPUT_PULLUP, 0) /* (C18) I2C1_SCL */
@@ -258,6 +279,12 @@ AM64X_IOPAD(0x00bc, PIN_INPUT, 7) /* (U8) GPIO0_46 */ >; }; + + vsel_sd_nddr_pins_default: vsel-sd-nddr-pins-default { + pinctrl-single,pins = < + AM64X_IOPAD(0x00b8, PIN_INPUT, 7) /* (Y7) PRG1_PRU0_GPO0.GPIO0_45 */ + >; + }; }; &mcu_uart0 {
@@ -301,6 +328,83 @@ status = "disabled"; }; +&main_i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&main_i2c0_pins_default>; + clock-frequency = <400000>; + status = "okay"; + + tps65219: pmic@30 { + compatible = "ti,tps65219"; + reg = <0x30>; + system-power-controller; + + buck1-supply = <&vcc_3v3_sys>; + buck2-supply = <&vcc_3v3_sys>; + buck3-supply = <&vcc_3v3_sys>; + ldo1-supply = <&vcc_3v3_sys>; + ldo2-supply = <&buck2_reg>; + ldo3-supply = <&vcc_3v3_sys>; + ldo4-supply = <&vcc_3v3_sys>; + + regulators { + buck1_reg: buck1 { + regulator-name = "VDD_CORE"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1000000>; + regulator-boot-on; + regulator-always-on; + }; + + buck2_reg: buck2 { + regulator-name = "VCC1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + buck3_reg: buck3 { + regulator-name = "VDD_LPDDR4"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo1_reg: ldo1 { + regulator-name = "VDDSHV_SD_IO_PMIC"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3300000>; + regulator-allow-bypass; + }; + + ldo2_reg: ldo2 { + regulator-name = "VDDAR_CORE"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <850000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo3_reg: ldo3 { + regulator-name = "VDDA_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo4_reg: ldo4 { + regulator-name = "VDD_PHY_2V5"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-boot-on; + regulator-always-on; + }; + }; + }; +}; &main_i2c1 { pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>;
Signature · 1 line
2.17.1
PATCH v2 2/11 DONOTMERGE: arm64: dts: ti: Add pinmux and irq mapping for TPS65219 external interrupts
In reply to Jerome NeanneInterrupt occurring on PMIC TPS65219 is propagated to SOC through EXTINTn pin connected to gic500 interrupt controller
Needed for driver testing but official board support pending. TI commitment is required before board upstream kick-off.
--- arch/arm64/boot/dts/ti/k3-am642-sk.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +12 -0
@@ -285,6 +285,12 @@ AM64X_IOPAD(0x00b8, PIN_INPUT, 7) /* (Y7) PRG1_PRU0_GPO0.GPIO0_45 */ >; }; + + pmic_irq_pins_default: pmic-irq-pins-default { + pinctrl-single,pins = < + AM64X_IOPAD(0x0278, PIN_INPUT, 0) /* (C19) EXTINTn */ + >; + }; }; &mcu_uart0 {
@@ -338,6 +344,12 @@ compatible = "ti,tps65219"; reg = <0x30>; system-power-controller; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_irq_pins_default>; + interrupt-parent = <&gic500>; + interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; buck1-supply = <&vcc_3v3_sys>; buck2-supply = <&vcc_3v3_sys>;
Signature · 1 line
2.17.1
PATCH v2 3/11 DONOTMERGE: arm64: dts: ti: k3-am642-sk: Enable tps65219 power-button
In reply to Jerome NeanneFrom: Markus Schneider-Pargmann <[email protected]>
This board uses the pin as a power-button, enable it.
Needed for driver testing but official board support pending. TI commitment is required before board upstream kick-off.
--- arch/arm64/boot/dts/ti/k3-am642-sk.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +1 -2
@@ -348,8 +348,7 @@ pinctrl-0 = <&pmic_irq_pins_default>; interrupt-parent = <&gic500>; interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; - interrupt-controller; - #interrupt-cells = <1>; + power-button; buck1-supply = <&vcc_3v3_sys>; buck2-supply = <&vcc_3v3_sys>;
Signature · 1 line
2.17.1
PATCH v2 4/11 MAINTAINERS: OMAP2+ support, add tps65218-pwrbutton
In reply to Jerome NeanneFrom: Markus Schneider-Pargmann <[email protected]>
The entry for the pwrbutton driver seems to be missing. Add it to the list for OMAP2+ SUPPORT.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -14704,6 +14704,7 @@ F: arch/arm/mach-omap2/ F: arch/arm/plat-omap/ F: drivers/bus/ti-sysc.c F: drivers/i2c/busses/i2c-omap.c +F: drivers/input/misc/tps65218-pwrbutton.c F: drivers/irqchip/irq-omap-intc.c F: drivers/mfd/*omap*.c F: drivers/mfd/menelaus.c
Signature · 1 line
2.17.1
Re: [PATCH v2 04/11] MAINTAINERS: OMAP2+ support, add tps65218-pwrbutton
Hi,
Quoted 4 lines · Jerome Neanne
From: Markus Schneider-Pargmann <[email protected]>
The entry for the pwrbutton driver seems to be missing. Add it to the list for OMAP2+ SUPPORT.
sorry, my mistake, I thought it was missing in this listing. Looking at the history of the driver all the patches were applied in the INPUT tree. So we can just drop this patch IMHO.
Best,
Markus
Quoted 22 lines
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Jerome Neanne <[email protected]>--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)MAINTAINERS +1
-0@@ -14704,6 +14704,7 @@ F: arch/arm/mach-omap2/ F: arch/arm/plat-omap/ F: drivers/bus/ti-sysc.c F: drivers/i2c/busses/i2c-omap.c +F: drivers/input/misc/tps65218-pwrbutton.c F: drivers/irqchip/irq-omap-intc.c F: drivers/mfd/*omap*.c F: drivers/mfd/menelaus.cSignature · 1 line
2.17.1
PATCH v2 5/11 regulator: dt-bindings: Add TI TPS65219 PMIC bindings
In reply to Jerome NeanneAdd TPS65219 PMIC bindings using json-schema.
Describe required properties and regname-supply. regname-supply is required when bypass mode is used for a regulator. Describes regulator topology.
Interrupts support.
Add a power-button property to configure the EN/PB/VSENSE pin as a powerbutton:
TPS65219 has a multipurpose pin called EN/PB/VSENSE that can be either:
- EN in which case it functions as an enable pin.
- VSENSE which compares the voltages and triggers an automatic on/off request.
- PB in which case it can be configured to trigger an interrupt to the SoC.
ti,power-button reflects the last one of those options
where the board has a button wired to the pin and triggers an interrupt on pressing it.
--- .../bindings/regulator/ti,tps65219.yaml | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65219.yaml
Documentation/devicetree/bindings/regulator/ti,tps65219.yaml new file +164 -0
@@ -0,0 +1,164 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/ti,tps65219.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI tps65219 Power Management Integrated Circuit regulators + +maintainers: + - Jerome Neanne <[email protected]> + +description: | + Regulator nodes should be named to buck<number> and ldo<number>. + +properties: + compatible: + enum: + - ti,tps65219 + + reg: + maxItems: 1 + + system-power-controller: + type: boolean + description: Optional property that indicates that this device is + controlling system power. + + interrupts: + description: Short-circuit, over-current, under-voltage for regulators, PB interrupts. + maxItems: 1 + + interrupt-controller: true + + '#interrupt-cells': + description: Specifies the PIN numbers and Flags, as defined in + include/dt-bindings/interrupt-controller/irq.h + const: 1 + + power-button: + type: boolean + description: Optional property that sets the EN/PB/VSENSE pin to be a + power-button. + +patternProperties: + "^buck[1-3]-supply$": + description: Input supply phandle of one regulator. + + "^ldo[1-4]-supply$": + description: Input supply phandle of one regulator. + + regulators: + type: object + description: | + list of regulators provided by this controller + + patternProperties: + "^ldo[1-4]$": + type: object + $ref: regulator.yaml# + description: + Properties for single LDO regulator. + + unevaluatedProperties: false + + "^buck[1-3]$": + type: object + $ref: regulator.yaml# + description: + Properties for single BUCK regulator. + + unevaluatedProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - interrupts + - regulators + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + + tps65219: pmic@30 { + compatible = "ti,tps65219"; + reg = <0x30>; + buck1-supply = <&vcc_3v3_sys>; + buck2-supply = <&vcc_3v3_sys>; + buck3-supply = <&vcc_3v3_sys>; + ldo1-supply = <&vcc_3v3_sys>; + ldo2-supply = <&buck2_reg>; + ldo3-supply = <&vcc_3v3_sys>; + ldo4-supply = <&vcc_3v3_sys>; + + pinctrl-0 = <&pmic_irq_pins_default>; + + interrupt-parent = <&gic500>; + interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + + regulators { + buck1_reg: buck1 { + regulator-name = "VDD_CORE"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <750000>; + regulator-boot-on; + regulator-always-on; + }; + + buck2_reg: buck2 { + regulator-name = "VCC1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + buck3_reg: buck3 { + regulator-name = "VDD_LPDDR4"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo1_reg: ldo1 { + regulator-name = "VDDSHV_SD_IO_PMIC"; + regulator-min-microvolt = <33000000>; + regulator-max-microvolt = <33000000>; + }; + + ldo2_reg: ldo2 { + regulator-name = "VDDAR_CORE"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <850000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo3_reg: ldo3 { + regulator-name = "VDDA_1V8"; + regulator-min-microvolt = <18000000>; + regulator-max-microvolt = <18000000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo4_reg: ldo4 { + regulator-name = "VDD_PHY_2V5"; + regulator-min-microvolt = <25000000>; + regulator-max-microvolt = <25000000>; + regulator-boot-on; + regulator-always-on; + }; + }; + }; + };
Signature · 1 line
2.17.1
Re: [PATCH v2 05/11] regulator: dt-bindings: Add TI TPS65219 PMIC bindings
Hi Jerome,
Quoted 31 lines · Jerome Neanne
Add TPS65219 PMIC bindings using json-schema.
Describe required properties and regname-supply. regname-supply is required when bypass mode is used for a regulator. Describes regulator topology.
Interrupts support.
Add a power-button property to configure the EN/PB/VSENSE pin as a powerbutton:TPS65219 has a multipurpose pin called EN/PB/VSENSE that can be either:
- EN in which case it functions as an enable pin.
- VSENSE which compares the voltages and triggers an automatic on/off request.
- PB in which case it can be configured to trigger an interrupt to the SoC.
ti,power-button reflects the last one of those options
where the board has a button wired to the pin and triggers an interrupt on pressing it.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Jerome Neanne <[email protected]>--- .../bindings/regulator/ti,tps65219.yaml | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65219.yamlDocumentation/devicetree/bindings/regulator/ti,tps65219.yaml new file +0
-0
...
Documentation/devicetree/bindings/regulator/ti,tps65219.yaml line 42
Quoted 5 lines
Documentation/devicetree/bindings/regulator/ti,tps65219.yaml new file +5
-0+ + power-button: + type: boolean + description: Optional property that sets the EN/PB/VSENSE pin to be a + power-button.
It seems something went wrong here. This should have been ti,power-button and have a similar description as the commit message, right?
Best,
Markus
Quoted 125 lines
Documentation/devicetree/bindings/regulator/ti,tps65219.yaml new file +122
-0+ +patternProperties: + "^buck[1-3]-supply$": + description: Input supply phandle of one regulator. + + "^ldo[1-4]-supply$": + description: Input supply phandle of one regulator. + + regulators: + type: object + description: | + list of regulators provided by this controller + + patternProperties: + "^ldo[1-4]$": + type: object + $ref: regulator.yaml# + description: + Properties for single LDO regulator. + + unevaluatedProperties: false + + "^buck[1-3]$": + type: object + $ref: regulator.yaml# + description: + Properties for single BUCK regulator. + + unevaluatedProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - interrupts + - regulators + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + + tps65219: pmic@30 { + compatible = "ti,tps65219"; + reg = <0x30>; + buck1-supply = <&vcc_3v3_sys>; + buck2-supply = <&vcc_3v3_sys>; + buck3-supply = <&vcc_3v3_sys>; + ldo1-supply = <&vcc_3v3_sys>; + ldo2-supply = <&buck2_reg>; + ldo3-supply = <&vcc_3v3_sys>; + ldo4-supply = <&vcc_3v3_sys>; + + pinctrl-0 = <&pmic_irq_pins_default>; + + interrupt-parent = <&gic500>; + interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + + regulators { + buck1_reg: buck1 { + regulator-name = "VDD_CORE"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <750000>; + regulator-boot-on; + regulator-always-on; + }; + + buck2_reg: buck2 { + regulator-name = "VCC1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + regulator-always-on; + }; + + buck3_reg: buck3 { + regulator-name = "VDD_LPDDR4"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo1_reg: ldo1 { + regulator-name = "VDDSHV_SD_IO_PMIC"; + regulator-min-microvolt = <33000000>; + regulator-max-microvolt = <33000000>; + }; + + ldo2_reg: ldo2 { + regulator-name = "VDDAR_CORE"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <850000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo3_reg: ldo3 { + regulator-name = "VDDA_1V8"; + regulator-min-microvolt = <18000000>; + regulator-max-microvolt = <18000000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo4_reg: ldo4 { + regulator-name = "VDD_PHY_2V5"; + regulator-min-microvolt = <25000000>; + regulator-max-microvolt = <25000000>; + regulator-boot-on; + regulator-always-on; + }; + }; + }; + };Signature · 1 line
2.17.1
PATCH v2 6/11 mfd: drivers: Add TI TPS65219 PMIC support
In reply to Jerome NeanneThe TPS65219 is a power management IC PMIC designed to supply a wide range of SoCs
in both portable and stationary applications.
Any SoC can control TPS65219 over a standard I2C interface.
It contains the following components:
- Regulators.
- Over Temperature warning and Shut down.
- GPIOs
- Multi Function Pins (MFP)
This patch adds support for tps65219 mfd device. At this time only the functionalities listed below are made available:
- Regulators probe and functionalities
- warm and cold reset support
- SW shutdown support
--- MAINTAINERS | 1 + drivers/mfd/Kconfig | 15 +++ drivers/mfd/Makefile | 1 + drivers/mfd/tps65219.c | 214 +++++++++++++++++++++++++++++ include/linux/mfd/tps65219.h | 251 +++++++++++++++++++++++++++++++++++ 5 files changed, 482 insertions(+) create mode 100644 drivers/mfd/tps65219.c create mode 100644 include/linux/mfd/tps65219.h
MAINTAINERS +1 -0
@@ -14711,6 +14711,7 @@ F: drivers/mfd/menelaus.c F: drivers/mfd/palmas.c F: drivers/mfd/tps65217.c F: drivers/mfd/tps65218.c +F: drivers/mfd/tps65219.c F: drivers/mfd/tps65910.c F: drivers/mfd/twl-core.[ch] F: drivers/mfd/twl4030*.c
drivers/mfd/Kconfig +15 -0
@@ -1574,6 +1574,21 @@ config MFD_TPS65218 This driver can also be built as a module. If so, the module will be called tps65218. +config MFD_TPS65219 + tristate "TI TPS65219 Power Management chips" + depends on I2C && OF + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + help + If you say yes here you get support for the TPS65219 series of + Power Management chips. + These include voltage regulators, gpio and other features + that are often used in portable devices. + + This driver can also be built as a module. If so, the module + will be called tps65219. + config MFD_TPS6586X bool "TI TPS6586x Power Management chips" depends on I2C=y
drivers/mfd/Makefile +1 -0
@@ -101,6 +101,7 @@ obj-$(CONFIG_TPS6507X) += tps6507x.o obj-$(CONFIG_MFD_TPS65086) += tps65086.o obj-$(CONFIG_MFD_TPS65217) += tps65217.o obj-$(CONFIG_MFD_TPS65218) += tps65218.o +obj-$(CONFIG_MFD_TPS65219) += tps65219.o obj-$(CONFIG_MFD_TPS65910) += tps65910.o obj-$(CONFIG_MFD_TPS65912) += tps65912-core.o obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.o
drivers/mfd/tps65219.c new file +214 -0
214 lines not on this page · raw message
include/linux/mfd/tps65219.h new file +251 -0
251 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v2 06/11] mfd: drivers: Add TI TPS65219 PMIC support
Quoted 4 lines · Jerome Neanne
The TPS65219 is a power management IC PMIC designed to supply a wide range of SoCs
in both portable and stationary applications.
Any SoC can control TPS65219 over a standard I2C interface.
Really odd line break choices here.
Quoted 7 lines
It contains the following components:
- Regulators.
- Over Temperature warning and Shut down.
- GPIOs
- Multi Function Pins (MFP)This patch adds support for tps65219 mfd device. At this time only
No such thing as an MFD device, what is it? PMIC, no?
Quoted 34 lines
the functionalities listed below are made available:
- Regulators probe and functionalities
- warm and cold reset support
- SW shutdown supportSigned-off-by Jerome Neanne <[email protected]>--- MAINTAINERS | 1 + drivers/mfd/Kconfig | 15 +++ drivers/mfd/Makefile | 1 + drivers/mfd/tps65219.c | 214 +++++++++++++++++++++++++++++ include/linux/mfd/tps65219.h | 251 +++++++++++++++++++++++++++++++++++ 5 files changed, 482 insertions(+) create mode 100644 drivers/mfd/tps65219.c create mode 100644 include/linux/mfd/tps65219.hMAINTAINERS +1
-0@@ -14711,6 +14711,7 @@ F: drivers/mfd/menelaus.c F: drivers/mfd/palmas.c F: drivers/mfd/tps65217.c F: drivers/mfd/tps65218.c +F: drivers/mfd/tps65219.c F: drivers/mfd/tps65910.c F: drivers/mfd/twl-core.[ch] F: drivers/mfd/twl4030*.cdrivers/mfd/Kconfig +0
-0
drivers/mfd/Kconfig config MFD_TPS65218 · line 1578
Quoted 5 lines
drivers/mfd/Kconfig +2
-0@@ -1574,6 +1574,21 @@ config MFD_TPS65218 This driver can also be built as a module. If so, the module will be called tps65218. +config MFD_TPS65219 + tristate "TI TPS65219 Power Management chips"
Abbreviation is PMIC, please reflect that here.
s/chips/ICs/
drivers/mfd/Kconfig config MFD_TPS65218 · line 1585
Quoted 7 lines
drivers/mfd/Kconfig +7
-0+ depends on I2C && OF + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + help + If you say yes here you get support for the TPS65219 series of + Power Management chips.
As above.
No need to line break here.
drivers/mfd/Kconfig config MFD_TPS65218 · line 1586
Quoted 1 line
drivers/mfd/Kconfig +1
-0+ These include voltage regulators, gpio and other features
GPIO
What "other features"?
Quoted 26 lines
drivers/mfd/Kconfig +5
-0+ that are often used in portable devices. + + This driver can also be built as a module. If so, the module + will be called tps65219. + config MFD_TPS6586X bool "TI TPS6586x Power Management chips" depends on I2C=ydrivers/mfd/Makefile +1
-0@@ -101,6 +101,7 @@ obj-$(CONFIG_TPS6507X) += tps6507x.o obj-$(CONFIG_MFD_TPS65086) += tps65086.o obj-$(CONFIG_MFD_TPS65217) += tps65217.o obj-$(CONFIG_MFD_TPS65218) += tps65218.o +obj-$(CONFIG_MFD_TPS65219) += tps65219.o obj-$(CONFIG_MFD_TPS65910) += tps65910.o obj-$(CONFIG_MFD_TPS65912) += tps65912-core.o obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.odrivers/mfd/tps65219.c new file +0
-0
drivers/mfd/tps65219.c line 3
Quoted 3 lines
drivers/mfd/tps65219.c new file +3
-0@@ -0,0 +1,214 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Driver for TPS65219 Integrated power management chipsets
"Power Management Integrated Chips (PMIC)"
drivers/mfd/tps65219.c line 8
Quoted 5 lines
drivers/mfd/tps65219.c new file +5
-0+// +// Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/ +// +// This implementation derived from tps65218 authored by +// "J Keerthy <[email protected]>"
Which he probably copied from elsewhere.
Please drop this line.
drivers/mfd/tps65219.c line 9
Quoted 1 line
drivers/mfd/tps65219.c new file +1
-0+//
Drop this empty comment
Only C++ for the SPDX line please.
'\n' here.
drivers/mfd/tps65219.c line 23
Quoted 13 lines
drivers/mfd/tps65219.c new file +13
-0+#include <linux/kernel.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/slab.h> +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/reboot.h>
Alphabetical
drivers/mfd/tps65219.c line 34
Quoted 10 lines
drivers/mfd/tps65219.c new file +10
-0+#include <linux/mfd/core.h> +#include <linux/mfd/tps65219.h> + +static struct i2c_client *tps65219_i2c_client; + +/** +* tps65219_warm_reset: issue warm reset to SOC. +* +* @tps: Device to write to. +*/
Why Kerneldoc for static functions.
See: scripts/find-unused-docs.sh
drivers/mfd/tps65219.c line 37
Quoted 3 lines
drivers/mfd/tps65219.c new file +3
-0+static int tps65219_warm_reset (struct tps65219 *tps) +{ +dev_dbg (tps->dev,"warm reset" );
No thank you.
And for all the other useless dev_dbg() prints that in this file which no one is going to use.
drivers/mfd/tps65219.c line 36
Quoted 1 line
drivers/mfd/tps65219.c new file +1
-0+pr_flush (1000 , true);
'\n'
Quoted 60 lines
drivers/mfd/tps65219.c new file +60
-0+return regmap_update_bits (tps->regmap,TPS65219_REG_MFP_CTRL , +TPS65219_MFP_WARM_RESET_I2C_CTRL_MASK , +TPS65219_MFP_WARM_RESET_I2C_CTRL_MASK ); +} + +/** +* tps65219_cold_reset: issue cold reset to SOC. +* +* @tps: Device to write to. +*/ +static int tps65219_cold_reset (struct tps65219 *tps) +{ +dev_dbg (tps->dev,"cold reset" ); +pr_flush (1000 , true); +return regmap_update_bits (tps->regmap,TPS65219_REG_MFP_CTRL , +TPS65219_MFP_COLD_RESET_I2C_CTRL_MASK , +TPS65219_MFP_COLD_RESET_I2C_CTRL_MASK ); +} + +/** +* tps65219_soft_shutdown: issue cold reset to SOC. +* +* @tps: Device to write to. +*/ +static int tps65219_soft_shutdown (struct tps65219 *tps) +{ +dev_dbg (tps->dev,"software shutdown" ); +pr_flush (1000 , true); +return regmap_update_bits (tps->regmap,TPS65219_REG_MFP_CTRL , +TPS65219_MFP_I2C_OFF_REQ_MASK , +TPS65219_MFP_I2C_OFF_REQ_MASK ); +} + +/** +* pmic_rst_restart: trig tps65219 reset to SOC. +* +* Trigged via notifier +*/ +static int pmic_rst_restart (struct notifier_block *this, +unsigned long reboot_mode,void *cmd) +{ +struct tps65219 *tps; + + tps = container_of(this, struct tps65219, nb); +if (!tps) { +pr_err ("%s: pointer to tps65219 is invalid\n" , __func__); +return -ENODEV ; + } +if (reboot_mode ==REBOOT_WARM ) +tps65219_warm_reset (tps); +else +tps65219_cold_reset (tps); +return NOTIFY_DONE ; +} + +static struct notifier_block pmic_rst_restart_nb = { + .notifier_call = pmic_rst_restart, + .priority =200 , +}; +
drivers/mfd/tps65219.c line 108
Quoted 10 lines
drivers/mfd/tps65219.c new file +10
-0+/** +* pmic_do_poweroff: trig tps65219 regulators power OFF sequence. +*/ +static void pmic_do_poweroff (void ) +{ +struct tps65219 *tps; + + tps =dev_get_drvdata (&tps65219_i2c_client->dev); +tps65219_soft_shutdown (tps); +}
Would all of the above be better off in drivers/power?
drivers/mfd/tps65219.c line 112
Quoted 3 lines
drivers/mfd/tps65219.c new file +3
-0+static const struct mfd_cell tps65219_cells[] = { + { .name ="tps65219-regulator" , }, +};
One device, which isn't even a device, is not an MFD.
Where are the other devices?
They need to be added now, rather than later please.
drivers/mfd/tps65219.c line 124
Quoted 11 lines
drivers/mfd/tps65219.c new file +11
-0+static const struct regmap_config tps65219_regmap_config = { + .reg_bits =8 , + .val_bits =8 , + .max_register =TPS65219_REG_FACTORY_CONFIG_2 , +}; + +static const struct of_device_id of_tps65219_match_table[] = { + { .compatible ="ti,tps65219" , }, + {} +}; +MODULE_DEVICE_TABLE (of, of_tps65219_match_table);
This usually goes at the bottom of the file.
drivers/mfd/tps65219.c line 130
Quoted 5 lines
drivers/mfd/tps65219.c new file +5
-0+static int tps65219_probe (struct i2c_client *client, +const struct i2c_device_id *ids) +{ +struct tps65219 *tps; +int ret;
Normally placed at the bottom of the list.
drivers/mfd/tps65219.c line 138
Quoted 8 lines
drivers/mfd/tps65219.c new file +8
-0+unsigned int chipid; +bool sys_pwr; + + tps =devm_kzalloc (&client->dev,sizeof (*tps),GFP_KERNEL ); +if (!tps) +return -ENOMEM ; + +i2c_set_clientdata (client, tps);
'\n'
drivers/mfd/tps65219.c line 139
Quoted 1 line
drivers/mfd/tps65219.c new file +1
-0+ tps->dev = &client->dev;
'\n'
drivers/mfd/tps65219.c line 144
Quoted 5 lines
drivers/mfd/tps65219.c new file +5
-0+ tps->regmap =devm_regmap_init_i2c (client, &tps65219_regmap_config); +if (IS_ERR (tps->regmap)) { + ret =PTR_ERR (tps->regmap); +dev_err (tps->dev,"Failed to allocate register map: %d\n" , + ret);
No line break here please.
drivers/mfd/tps65219.c line 156
Quoted 12 lines
drivers/mfd/tps65219.c new file +12
-0+return ret; + } + + ret =regmap_read (tps->regmap,TPS65219_REG_TI_DEV_ID , &chipid); +if (ret) { +dev_err (tps->dev,"Failed to read device ID: %d\n" , ret); +return ret; + } + + ret =devm_mfd_add_devices (tps->dev,PLATFORM_DEVID_AUTO , tps65219_cells, +ARRAY_SIZE (tps65219_cells),NULL ,0 , +NULL );
No line break on the 2nd line.
drivers/mfd/tps65219.c line 153
Quoted 2 lines
drivers/mfd/tps65219.c new file +2
-0+if (ret) { +dev_err (tps->dev,"mfd_add_devices failed: %d\n" , ret);
"Failed to add child devices"
drivers/mfd/tps65219.c line 166
Quoted 8 lines
drivers/mfd/tps65219.c new file +8
-0+return ret; + } + + tps->nb = pmic_rst_restart_nb; + ret =register_restart_handler (&tps->nb); +if (ret) { +dev_err (tps->dev,"%s: cannot register restart handler, %d\n" , + __func__, ret);
No __func__
drivers/mfd/tps65219.c line 162
Quoted 1 line
drivers/mfd/tps65219.c new file +1
-0+return -ENODEV ;
Why not propagate 'ret'?
drivers/mfd/tps65219.c line 171
Quoted 4 lines
drivers/mfd/tps65219.c new file +4
-0+ } + + sys_pwr =of_property_read_bool (tps->dev->of_node, +"system-power-controller" );
This will probably go onto one line (<100 chars)
drivers/mfd/tps65219.c line 167
Quoted 1 line
drivers/mfd/tps65219.c new file +1
-0+if (sys_pwr)
if (!sys_power_controller) return 0;
drivers/mfd/tps65219.c line 175
Quoted 2 lines
drivers/mfd/tps65219.c new file +2
-0+if (pm_power_off) +dev_warn (tps->dev,"Setup as system-power-controller but pm_power_off function already registered, overwriting\n" );
Is that really what you want?
What about the other driver that thinks it's the
system-power-controller? Seems wrong.
In any case, make this line as short / succinct as you can.
Quoted 10 lines
drivers/mfd/tps65219.c new file +10
-0+ tps65219_i2c_client = client; + pm_power_off = &pmic_do_poweroff; + } +return ret; +} + +static int tps65219_remove (struct i2c_client *client) +{ +struct tps65219 *tps =i2c_get_clientdata (client); +
drivers/mfd/tps65219.c line 195
Quoted 10 lines
drivers/mfd/tps65219.c new file +10
-0+if (tps65219_i2c_client == client) { + pm_power_off =NULL ; + tps65219_i2c_client =NULL ; + } + +return unregister_restart_handler (&tps->nb); +} + +static const struct i2c_device_id tps65219_id_table[] = { + {"tps65219" ,TPS65219 },
Do you use this param?
If not drop the whole table and use .probe_new.
Quoted 4 lines
drivers/mfd/tps65219.c new file +4
-0+ { }, +}; +MODULE_DEVICE_TABLE (i2c, tps65219_id_table); +
drivers/mfd/tps65219.c line 209
Quoted 10 lines
drivers/mfd/tps65219.c new file +10
-0+static struct i2c_driver tps65219_driver = { + .driver = { + .name ="tps65219" , + .of_match_table = of_tps65219_match_table, + }, + .probe = tps65219_probe, + .id_table = tps65219_id_table, + .remove = tps65219_remove, +}; +
Remove this line.
drivers/mfd/tps65219.c line 213
Quoted 4 lines
drivers/mfd/tps65219.c new file +4
-0+module_i2c_driver (tps65219_driver); + +MODULE_AUTHOR ("Jerome Neanne <[email protected]>" ); +MODULE_DESCRIPTION ("TPS65219 chip family multi-function driver" );
Please change this description to something suggested above.
include/linux/mfd/tps65219.h line 3
Quoted 10 lines
drivers/mfd/tps65219.c new file +1
-0+MODULE_LICENSE ("GPL" );include/linux/mfd/tps65219.h new file +3
-0@@ -0,0 +1,251 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* linux/mfd/tps65219.h
No filenames please. They tend to become unsynced.
include/linux/mfd/tps65219.h line 5
Quoted 1 line
include/linux/mfd/tps65219.h new file +1
-0+* Functions to access TPS65219 power management chip.
As above.
include/linux/mfd/tps65219.h line 11
Quoted 5 lines
include/linux/mfd/tps65219.h new file +5
-0+* Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/ +*/ + +#ifndef __LINUX_MFD_TPS65219_H +#define __LINUX_MFD_TPS65219_H
LINUX?
include/linux/mfd/tps65219.h line 17
Quoted 5 lines
include/linux/mfd/tps65219.h new file +5
-0+#include <linux/i2c.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> +#include <linux/bitops.h> +#include <linux/regmap.h>
Alphabetical.
Some of these should probably be forward declarations, not includes.
Quoted 214 lines
include/linux/mfd/tps65219.h new file +214
-0+#define TPS65219_1V35 1350000 +#define TPS65219_1V8 1800000 + +/* TPS chip id list */ +#define TPS65219 0xF0 + +/* I2C ID for TPS65219 part */ +#define TPS65219_I2C_ID 0x24 + +/* All register addresses */ +#define TPS65219_REG_TI_DEV_ID 0x00 +#define TPS65219_REG_NVM_ID 0x01 +#define TPS65219_REG_ENABLE_CTRL 0x02 +#define TPS65219_REG_BUCKS_CONFIG 0x03 +#define TPS65219_REG_LDO4_VOUT 0x04 +#define TPS65219_REG_LDO3_VOUT 0x05 +#define TPS65219_REG_LDO2_VOUT 0x06 +#define TPS65219_REG_LDO1_VOUT 0x07 +#define TPS65219_REG_BUCK3_VOUT 0x8 +#define TPS65219_REG_BUCK2_VOUT 0x9 +#define TPS65219_REG_BUCK1_VOUT 0xA +#define TPS65219_REG_LDO4_SEQUENCE_SLOT 0xB +#define TPS65219_REG_LDO3_SEQUENCE_SLOT 0xC +#define TPS65219_REG_LDO2_SEQUENCE_SLOT 0xD +#define TPS65219_REG_LDO1_SEQUENCE_SLOT 0xE +#define TPS65219_REG_BUCK3_SEQUENCE_SLOT 0xF +#define TPS65219_REG_BUCK2_SEQUENCE_SLOT 0x10 +#define TPS65219_REG_BUCK1_SEQUENCE_SLOT 0x11 +#define TPS65219_REG_nRST_SEQUENCE_SLOT 0x12 +#define TPS65219_REG_GPIO_SEQUENCE_SLOT 0x13 +#define TPS65219_REG_GPO2_SEQUENCE_SLOT 0x14 +#define TPS65219_REG_GPO1_SEQUENCE_SLOT 0x15 +#define TPS65219_REG_POWER_UP_SLOT_DURATION_1 0x16 +#define TPS65219_REG_POWER_UP_SLOT_DURATION_2 0x17 +#define TPS65219_REG_POWER_UP_SLOT_DURATION_3 0x18 +#define TPS65219_REG_POWER_UP_SLOT_DURATION_4 0x19 +#define TPS65219_REG_POWER_DOWN_SLOT_DURATION_1 0x1A +#define TPS65219_REG_POWER_DOWN_SLOT_DURATION_2 0x1B +#define TPS65219_REG_POWER_DOWN_SLOT_DURATION_3 0x1C +#define TPS65219_REG_POWER_DOWN_SLOT_DURATION_4 0x1D +#define TPS65219_REG_GENERAL_CONFIG 0x1E +#define TPS65219_REG_MFP_1_CONFIG 0x1F +#define TPS65219_REG_MFP_2_CONFIG 0x20 +#define TPS65219_REG_STBY_1_CONFIG 0x21 +#define TPS65219_REG_STBY_2_CONFIG 0x22 +#define TPS65219_REG_OC_DEGL_CONFIG 0x23 +/* 'sub irq' MASK registers */ +#define TPS65219_REG_INT_MASK_UV 0x24 +#define TPS65219_REG_MASK_CONFIG 0x25 + +#define TPS65219_REG_I2C_ADDRESS_REG 0x26 +#define TPS65219_REG_USER_GENERAL_NVM_STORAGE 0x27 +#define TPS65219_REG_MANUFACTURING_VER 0x28 +#define TPS65219_REG_MFP_CTRL 0x29 +#define TPS65219_REG_DISCHARGE_CONFIG 0x2A +/* main irq registers */ +#define TPS65219_REG_INT_SOURCE 0x2B +/* 'sub irq' registers */ +#define TPS65219_REG_INT_LDO_3_4 0x2C +#define TPS65219_REG_INT_LDO_1_2 0x2D +#define TPS65219_REG_INT_BUCK_3 0x2E +#define TPS65219_REG_INT_BUCK_1_2 0x2F +#define TPS65219_REG_INT_SYSTEM 0x30 +#define TPS65219_REG_INT_RV 0x31 +#define TPS65219_REG_INT_TIMEOUT_RV_SD 0x32 +#define TPS65219_REG_INT_PB 0x33 + +#define TPS65219_REG_USER_NVM_CMD 0x34 +#define TPS65219_REG_POWER_UP_STATUS 0x35 +#define TPS65219_REG_SPARE_2 0x36 +#define TPS65219_REG_SPARE_3 0x37 +#define TPS65219_REG_FACTORY_CONFIG_2 0x41 + +/* Register field definitions */ +#define TPS65219_DEVID_REV_MASK GENMASK(7, 0) +#define TPS65219_BUCKS_LDOS_VOUT_VSET_MASK GENMASK(5, 0) +#define TPS65219_BUCKS_UV_THR_SEL_MASK BIT(6) +#define TPS65219_BUCKS_BW_SEL_MASK BIT(7) +#define LDO_BYP_SHIFT 6 +#define TPS65219_LDOS_BYP_CONFIG_MASK BIT(LDO_BYP_SHIFT) +#define TPS65219_LDOS_LSW_CONFIG_MASK BIT(7) +/* Regulators enable control */ +#define TPS65219_ENABLE_BUCK1_EN_MASK BIT(0) +#define TPS65219_ENABLE_BUCK2_EN_MASK BIT(1) +#define TPS65219_ENABLE_BUCK3_EN_MASK BIT(2) +#define TPS65219_ENABLE_LDO1_EN_MASK BIT(3) +#define TPS65219_ENABLE_LDO2_EN_MASK BIT(4) +#define TPS65219_ENABLE_LDO3_EN_MASK BIT(5) +#define TPS65219_ENABLE_LDO4_EN_MASK BIT(6) +/* power ON-OFF sequence slot */ +#define TPS65219_BUCKS_LDOS_SEQUENCE_OFF_SLOT_MASK GENMASK(3, 0) +#define TPS65219_BUCKS_LDOS_SEQUENCE_ON_SLOT_MASK GENMASK(7, 4) +/* TODO: Not needed, same mapping as TPS65219_ENABLE_REGNAME_EN, factorize */ +#define TPS65219_STBY1_BUCK1_STBY_EN_MASK BIT(0) +#define TPS65219_STBY1_BUCK2_STBY_EN_MASK BIT(1) +#define TPS65219_STBY1_BUCK3_STBY_EN_MASK BIT(2) +#define TPS65219_STBY1_LDO1_STBY_EN_MASK BIT(3) +#define TPS65219_STBY1_LDO2_STBY_EN_MASK BIT(4) +#define TPS65219_STBY1_LDO3_STBY_EN_MASK BIT(5) +#define TPS65219_STBY1_LDO4_STBY_EN_MASK BIT(6) +/* STBY_2 config */ +#define TPS65219_STBY2_GPO1_STBY_EN_MASK BIT(0) +#define TPS65219_STBY2_GPO2_STBY_EN_MASK BIT(1) +#define TPS65219_STBY2_GPIO_STBY_EN_MASK BIT(2) +/* MFP Control */ +#define TPS65219_MFP_I2C_OFF_REQ_MASK BIT(0) +#define TPS65219_MFP_STBY_I2C_CTRL_MASK BIT(1) +#define TPS65219_MFP_COLD_RESET_I2C_CTRL_MASK BIT(2) +#define TPS65219_MFP_WARM_RESET_I2C_CTRL_MASK BIT(3) +#define TPS65219_MFP_GPIO_STATUS_MASK BIT(4) +/* MFP_1 Config */ +#define TPS65219_MFP_1_VSEL_DDR_SEL_MASK BIT(0) +#define TPS65219_MFP_1_VSEL_SD_POL_MASK BIT(1) +#define TPS65219_MFP_1_VSEL_RAIL_MASK BIT(2) +/* MFP_2 Config */ +#define TPS65219_MFP_2_MODE_STBY_MASK GENMASK(1, 0) +#define TPS65219_MFP_2_MODE_RESET_MASK BIT(2) +#define TPS65219_MFP_2_EN_PB_VSENSE_DEGL_MASK BIT(3) +#define TPS65219_MFP_2_EN_PB_VSENSE_MASK GENMASK(5, 4) +#define TPS65219_MFP_2_WARM_COLD_RESET_MASK BIT(6) +#define TPS65219_MFP_2_PU_ON_FSD_MASK BIT(7) +#define TPS65219_MFP_2_EN 0 +#define TPS65219_MFP_2_PB BIT(4) +#define TPS65219_MFP_2_VSENSE BIT(5) +/* MASK_UV Config */ +#define TPS65219_REG_MASK_UV_LDO1_UV_MASK BIT(0) +#define TPS65219_REG_MASK_UV_LDO2_UV_MASK BIT(1) +#define TPS65219_REG_MASK_UV_LDO3_UV_MASK BIT(2) +#define TPS65219_REG_MASK_UV_LDO4_UV_MASK BIT(3) +#define TPS65219_REG_MASK_UV_BUCK1_UV_MASK BIT(4) +#define TPS65219_REG_MASK_UV_BUCK2_UV_MASK BIT(5) +#define TPS65219_REG_MASK_UV_BUCK3_UV_MASK BIT(6) +#define TPS65219_REG_MASK_UV_RETRY_MASK BIT(7) +/* MASK Config */ +// SENSOR_N_WARM_MASK already defined in Thermal +#define TPS65219_REG_MASK_INT_FOR_RV_MASK BIT(4) +#define TPS65219_REG_MASK_EFFECT_MASK GENMASK(2, 1) +#define TPS65219_REG_MASK_INT_FOR_PB_MASK BIT(7) +/* UnderVoltage - Short to GND - OverCurrent*/ +/* LDO3-4 */ +#define TPS65219_INT_LDO3_SCG_MASK BIT(0) +#define TPS65219_INT_LDO3_OC_MASK BIT(1) +#define TPS65219_INT_LDO3_UV_MASK BIT(2) +#define TPS65219_INT_LDO4_SCG_MASK BIT(3) +#define TPS65219_INT_LDO4_OC_MASK BIT(4) +#define TPS65219_INT_LDO4_UV_MASK BIT(5) +/* LDO1-2 */ +#define TPS65219_INT_LDO1_SCG_MASK BIT(0) +#define TPS65219_INT_LDO1_OC_MASK BIT(1) +#define TPS65219_INT_LDO1_UV_MASK BIT(2) +#define TPS65219_INT_LDO2_SCG_MASK BIT(3) +#define TPS65219_INT_LDO2_OC_MASK BIT(4) +#define TPS65219_INT_LDO2_UV_MASK BIT(5) +/* BUCK3 */ +#define TPS65219_INT_BUCK3_SCG_MASK BIT(0) +#define TPS65219_INT_BUCK3_OC_MASK BIT(1) +#define TPS65219_INT_BUCK3_NEG_OC_MASK BIT(2) +#define TPS65219_INT_BUCK3_UV_MASK BIT(3) +/* BUCK1-2 */ +#define TPS65219_INT_BUCK1_SCG_MASK BIT(0) +#define TPS65219_INT_BUCK1_OC_MASK BIT(1) +#define TPS65219_INT_BUCK1_NEG_OC_MASK BIT(2) +#define TPS65219_INT_BUCK1_UV_MASK BIT(3) +#define TPS65219_INT_BUCK2_SCG_MASK BIT(4) +#define TPS65219_INT_BUCK2_OC_MASK BIT(5) +#define TPS65219_INT_BUCK2_NEG_OC_MASK BIT(6) +#define TPS65219_INT_BUCK2_UV_MASK BIT(7) +/* Thermal Sensor */ +#define TPS65219_INT_SENSOR_3_WARM_MASK BIT(0) +#define TPS65219_INT_SENSOR_2_WARM_MASK BIT(1) +#define TPS65219_INT_SENSOR_1_WARM_MASK BIT(2) +#define TPS65219_INT_SENSOR_0_WARM_MASK BIT(3) +#define TPS65219_INT_SENSOR_3_HOT_MASK BIT(4) +#define TPS65219_INT_SENSOR_2_HOT_MASK BIT(5) +#define TPS65219_INT_SENSOR_1_HOT_MASK BIT(6) +#define TPS65219_INT_SENSOR_0_HOT_MASK BIT(7) +/* Residual Voltage */ +#define TPS65219_INT_BUCK1_RV_MASK BIT(0) +#define TPS65219_INT_BUCK2_RV_MASK BIT(1) +#define TPS65219_INT_BUCK3_RV_MASK BIT(2) +#define TPS65219_INT_LDO1_RV_MASK BIT(3) +#define TPS65219_INT_LDO2_RV_MASK BIT(4) +#define TPS65219_INT_LDO3_RV_MASK BIT(5) +#define TPS65219_INT_LDO4_RV_MASK BIT(6) +/* Residual Voltage ShutDown */ +#define TPS65219_INT_BUCK1_RV_SD_MASK BIT(0) +#define TPS65219_INT_BUCK2_RV_SD_MASK BIT(1) +#define TPS65219_INT_BUCK3_RV_SD_MASK BIT(2) +#define TPS65219_INT_LDO1_RV_SD_MASK BIT(3) +#define TPS65219_INT_LDO2_RV_SD_MASK BIT(4) +#define TPS65219_INT_LDO3_RV_SD_MASK BIT(5) +#define TPS65219_INT_LDO4_RV_SD_MASK BIT(6) +#define TPS65219_INT_TIMEOUT_MASK BIT(7) +/* Power Button */ +#define TPS65219_INT_PB_FALLING_EDGE_DET_MASK BIT(0) +#define TPS65219_INT_PB_RISING_EDGE_DET_MASK BIT(1) +#define TPS65219_INT_PB_REAL_TIME_STATUS_MASK BIT(2) + +enum tps65219_regulator_id { +/* DCDC's */ +TPS65219_BUCK_1 , +TPS65219_BUCK_2 , +TPS65219_BUCK_3 , +/* LDOs */ +TPS65219_LDO_1 , +TPS65219_LDO_2 , +TPS65219_LDO_3 , +TPS65219_LDO_4 , +}; + +#define TPS65219_MAX_REG_ID TPS65219_LDO_4 + +/* Number of step-down converters available */ +#define TPS65219_NUM_DCDC 3
include/linux/mfd/tps65219.h line 242
Quoted 10 lines
include/linux/mfd/tps65219.h new file +10
-0+/* Number of LDO voltage regulators available */ +#define TPS65219_NUM_LDO 4 +/* Number of total regulators available */ +#define TPS65219_NUM_REGULATOR (TPS65219_NUM_DCDC + TPS65219_NUM_LDO) + +/** +* struct tps65219 - tps65219 sub-driver chip access routines +* +* Device data may be used to access the TPS65219 chip +*/
This is not a complete kerneldoc header.
Please compile test with W=1.
Quoted 9 lines
include/linux/mfd/tps65219.h new file +9
-0+struct tps65219 { +struct device *dev; +unsigned int id; +struct regulator_desc desc[TPS65219_NUM_REGULATOR ]; +struct regmap *regmap; +struct notifier_block nb; +}; + +#endif /* __LINUX_MFD_TPS65219_H */
Signature · 1 line
DEPRECATED: Please use [email protected]
Re: [PATCH v2 06/11] mfd: drivers: Add TI TPS65219 PMIC support
Hi Lee,
thanks for your comments. I am pushing the next version v4 for Jerome and fixed most of your comments. Some inline comments.
Quoted 36 lines · Lee Jones
Quoted 4 lines · Jerome Neanne
The TPS65219 is a power management IC PMIC designed to supply a wide range of SoCs
in both portable and stationary applications.
Any SoC can control TPS65219 over a standard I2C interface.Really odd line break choices here.
Quoted 7 lines
It contains the following components:
- Regulators.
- Over Temperature warning and Shut down.
- GPIOs
- Multi Function Pins (MFP)This patch adds support for tps65219 mfd device. At this time only
No such thing as an MFD device, what is it? PMIC, no?
Quoted 17 lines
the functionalities listed below are made available:
- Regulators probe and functionalities
- warm and cold reset support
- SW shutdown supportSigned-off-by Jerome Neanne <[email protected]>--- MAINTAINERS | 1 + drivers/mfd/Kconfig | 15 +++ drivers/mfd/Makefile | 1 + drivers/mfd/tps65219.c | 214 +++++++++++++++++++++++++++++ include/linux/mfd/tps65219.h | 251 +++++++++++++++++++++++++++++++++++ 5 files changed, 482 insertions(+) create mode 100644 drivers/mfd/tps65219.c create mode 100644 include/linux/mfd/tps65219.h
...
Quoted 4 lines
Quoted 4 lines
drivers/mfd/Makefile +0
-0
...
Quoted 9 lines
drivers/mfd/Makefile
Quoted 6 lines
drivers/mfd/Makefile +5
-0+// +// Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/ +// +// This implementation derived from tps65218 authored by +// "J Keerthy <[email protected]>"Which he probably copied from elsewhere.
Quoted 7 lines
Please drop this line.
Quoted 1 line
+//
Drop this empty comment
Only C++ for the SPDX line please.
Mark Brown wanted this the other way around:
"Please make the entire comment a C++ one so things look more intentional."
https://lore.kernel.org/all/[email protected]/
Let me know what I should do here.
...
Quoted 8 lines
drivers/mfd/Makefile
Quoted 3 lines
drivers/mfd/Makefile +2
-0+ if (pm_power_off) + dev_warn(tps->dev, "Setup as system-power-controller but pm_power_off function already registered, overwriting\n");Is that really what you want?
What about the other driver that thinks it's the
system-power-controller? Seems wrong.
I am now not overwriting pm_power_off but print an error and probe successfully.
...
Quoted 16 lines
include/linux/mfd/tps65219.h line 3
Quoted 9 lines
include/linux/mfd/tps65219.h new file +3
-0@@ -0,0 +1,251 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* linux/mfd/tps65219.h No filenames please. They tend to become unsynced.
include/linux/mfd/tps65219.h line 5
Quoted 1 line
include/linux/mfd/tps65219.h new file +1
-0+* Functions to access TPS65219 power management chip. As above.
Quoted 7 lines
include/linux/mfd/tps65219.h line 11
Quoted 5 lines
include/linux/mfd/tps65219.h new file +5
-0+* Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/ +*/ + +#ifndef __LINUX_MFD_TPS65219_H +#define __LINUX_MFD_TPS65219_HLINUX?
This seems to be quite common in include/linux/mfd/*.h to have __LINUX_MFD_ as prefix (probably for the directory they are in). I am assuming that's not the right style. What should be used instead? __MFD_TPS65219_H or MFD_TPS65219_H or maybe something else?
...
Quoted 10 lines
include/linux/mfd/tps65219.h line 242
Quoted 6 lines
include/linux/mfd/tps65219.h new file +6
-0+ +/** +* struct tps65219 - tps65219 sub-driver chip access routines +* +* Device data may be used to access the TPS65219 chip +*/ This is not a complete kerneldoc header.
Please compile test with W=1.
I didn't see any errors reported for this struct with W=1. I am assuming you meant missing field descriptions and added them.
Thanks,
Markus
PATCH v2 7/11 mfd: drivers: Add interrupts support to TI TPS65219 PMIC
In reply to Jerome NeanneAdd TPS65219 support for interrupts through regmap_irq_chip
--- drivers/mfd/tps65219.c | 217 ++++++++++++++++++++++++++++++++++- include/linux/mfd/tps65219.h | 113 ++++++++++++++++++ 2 files changed, 328 insertions(+), 2 deletions(-)
drivers/mfd/tps65219.c +215 -2
@@ -107,8 +107,73 @@ static void pmic_do_poweroff(void)tps65219_soft_shutdown (tps); } -static const struct mfd_cell tps65219_cells[] = { - { .name ="tps65219-regulator" , }, +static const struct resource tps65219_pwrbutton_resources[] = { +DEFINE_RES_IRQ_NAMED (TPS65219_INT_PB_FALLING_EDGE_DETECT ,"falling" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_PB_RISING_EDGE_DETECT ,"rising" ), +}; + +static const struct resource tps65219_regulator_resources[] = { +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_SCG ,"LDO3_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_OC ,"LDO3_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_UV ,"LDO3_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_SCG ,"LDO4_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_OC ,"LDO4_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_UV ,"LDO4_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_SCG ,"LDO1_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_OC ,"LDO1_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_UV ,"LDO1_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_SCG ,"LDO2_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_OC ,"LDO2_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_UV ,"LDO2_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_SCG ,"BUCK3_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_OC ,"BUCK3_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_NEG_OC ,"BUCK3_NEG_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_UV ,"BUCK3_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_SCG ,"BUCK1_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_OC ,"BUCK1_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_NEG_OC ,"BUCK1_NEG_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_UV ,"BUCK1_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_SCG ,"BUCK2_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_OC ,"BUCK2_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_NEG_OC ,"BUCK2_NEG_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_UV ,"BUCK2_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_RV ,"BUCK1_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_RV ,"BUCK2_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_RV ,"BUCK3_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_RV ,"LDO1_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_RV ,"LDO2_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_RV ,"LDO3_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_RV ,"LDO4_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_RV_SD ,"BUCK1_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_RV_SD ,"BUCK2_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_RV_SD ,"BUCK3_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_RV_SD ,"LDO1_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_RV_SD ,"LDO2_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_RV_SD ,"LDO3_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_RV_SD ,"LDO4_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_TIMEOUT ,"TIMEOUT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_3_WARM ,"SENSOR_3_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_2_WARM ,"SENSOR_2_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_1_WARM ,"SENSOR_1_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_0_WARM ,"SENSOR_0_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_3_HOT ,"SENSOR_3_HOT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_2_HOT ,"SENSOR_2_HOT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_1_HOT ,"SENSOR_1_HOT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_0_HOT ,"SENSOR_0_HOT" ), +}; + +#define TPS65219_MAX_CELLS 2 + +static const struct mfd_cell tps65219_regulator_cell = { + .name ="tps65219-regulator" , + .resources = tps65219_regulator_resources, + .num_resources =ARRAY_SIZE (tps65219_regulator_resources), +}; + +static const struct mfd_cell tps65219_pwrbutton_cell = { + .name ="tps65219-pwrbutton" , + .resources = tps65219_pwrbutton_resources, + .num_resources =ARRAY_SIZE (tps65219_pwrbutton_resources), };static const struct regmap_config tps65219_regmap_config = {
@@ -117,6 +182,147 @@ static const struct regmap_config tps65219_regmap_config = { .max_register = TPS65219_REG_FACTORY_CONFIG_2, }; +/* +* Mapping of main IRQ register bits to sub-IRQ register offsets so that we can +* access corect sub-IRQ registers based on bits that are set in main IRQ +* register. +*/ +/* Timeout Residual Voltage Shutdown */ +static unsigned int bit0_offsets[] = {TPS65219_TO_RV_POS }; +static unsigned int bit1_offsets[] = {TPS65219_RV_POS };/* Residual Voltage */ +static unsigned int bit2_offsets[] = {TPS65219_SYS_POS };/* System */ +static unsigned int bit3_offsets[] = {TPS65219_BUCK_1_2_POS };/* Buck 1-2 */ +static unsigned int bit4_offsets[] = {TPS65219_BUCK_3_POS };/* Buck 3 */ +static unsigned int bit5_offsets[] = {TPS65219_LDO_1_2_POS };/* LDO 1-2 */ +static unsigned int bit6_offsets[] = {TPS65219_LDO_3_4_POS };/* LDO 3-4 */ +static unsigned int bit7_offsets[] = {TPS65219_PB_POS };/* Power Button */ + +static struct regmap_irq_sub_irq_map tps65219_sub_irq_offsets[] = { +REGMAP_IRQ_MAIN_REG_OFFSET (bit0_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit1_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit2_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit3_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit4_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit5_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit6_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit7_offsets), +}; + +static struct regmap_irq tps65219_irqs[] = { +REGMAP_IRQ_REG (TPS65219_INT_LDO3_SCG ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO3_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_OC , +TPS65219_LDO_3_4_POS ,TPS65219_INT_LDO3_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_UV ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO3_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_SCG ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO4_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_OC ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO4_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_UV ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO4_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_SCG , +TPS65219_LDO_1_2_POS ,TPS65219_INT_LDO1_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_OC ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO1_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_UV ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO1_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_SCG ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO2_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_OC ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO2_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_UV ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO2_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_SCG ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_OC ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_NEG_OC ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_NEG_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_UV ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_SCG ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_NEG_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_NEG_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_UV ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_SCG ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_NEG_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_NEG_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_UV ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_3_WARM , +TPS65219_SYS_POS ,TPS65219_INT_SENSOR_3_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_2_WARM ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_2_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_1_WARM ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_1_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_0_WARM ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_0_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_3_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_3_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_2_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_2_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_1_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_1_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_0_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_0_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_RV ,TPS65219_RV_POS , +TPS65219_INT_BUCK1_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_RV ,TPS65219_RV_POS , +TPS65219_INT_BUCK2_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_RV ,TPS65219_RV_POS , +TPS65219_INT_BUCK3_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO1_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO2_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO3_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO4_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_RV_SD , +TPS65219_TO_RV_POS ,TPS65219_INT_BUCK1_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_RV_SD , +TPS65219_TO_RV_POS ,TPS65219_INT_BUCK2_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_BUCK3_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_LDO1_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_LDO2_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_RV_SD , +TPS65219_TO_RV_POS ,TPS65219_INT_LDO3_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_LDO4_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_TIMEOUT ,TPS65219_TO_RV_POS , +TPS65219_INT_TIMEOUT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_PB_FALLING_EDGE_DETECT , +TPS65219_PB_POS ,TPS65219_INT_PB_FALLING_EDGE_DET_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_PB_RISING_EDGE_DETECT ,TPS65219_PB_POS , +TPS65219_INT_PB_RISING_EDGE_DET_MASK ), +}; + +static struct regmap_irq_chip tps65219_irq_chip = { + .name ="tps65219_irq" , + .main_status =TPS65219_REG_INT_SOURCE , + .num_main_regs =1 , + .num_main_status_bits =8 , + .irqs = tps65219_irqs, + .num_irqs =ARRAY_SIZE (tps65219_irqs), + .status_base =TPS65219_REG_INT_LDO_3_4 , + .ack_base =TPS65219_REG_INT_LDO_3_4 , + .clear_ack =1 , + .num_regs =8 , + .sub_reg_offsets = &tps65219_sub_irq_offsets[0 ], +}; +static const struct of_device_id of_tps65219_match_table[] = { { .compatible ="ti,tps65219" , }, {}
@@ -137,6 +343,7 @@ static int tps65219_probe(struct i2c_client *client,i2c_set_clientdata (client, tps); tps->dev = &client->dev; + tps->irq = client->irq; tps->regmap =devm_regmap_init_i2c (client, &tps65219_regmap_config);if (IS_ERR (tps->regmap)) { ret =PTR_ERR (tps->regmap);
@@ -145,6 +352,12 @@ static int tps65219_probe(struct i2c_client *client,return ret; } + ret =devm_regmap_add_irq_chip (&client->dev, tps->regmap, tps->irq, +IRQF_ONESHOT ,0 , &tps65219_irq_chip, + &tps->irq_data); +if (ret) +return ret; + ret =regmap_read (tps->regmap,TPS65219_REG_TI_DEV_ID , &chipid);if (ret) {dev_err (tps->dev,"Failed to read device ID: %d\n" , ret);
include/linux/mfd/tps65219.h +113 -0
131 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v2 07/11] mfd: drivers: Add interrupts support to TI TPS65219 PMIC
Quoted 1 line · Jerome Neanne
Add TPS65219 support for interrupts through
regmap_irq_chip
Why is this separate to the original patch?
Quoted 62 lines
Signed-off-by Jerome Neanne <[email protected]>--- drivers/mfd/tps65219.c | 217 ++++++++++++++++++++++++++++++++++- include/linux/mfd/tps65219.h | 113 ++++++++++++++++++ 2 files changed, 328 insertions(+), 2 deletions(-)drivers/mfd/tps65219.c +46
-2@@ -107,8 +107,73 @@ static void pmic_do_poweroff(void)tps65219_soft_shutdown (tps); } -static const struct mfd_cell tps65219_cells[] = { - { .name ="tps65219-regulator" , }, +static const struct resource tps65219_pwrbutton_resources[] = { +DEFINE_RES_IRQ_NAMED (TPS65219_INT_PB_FALLING_EDGE_DETECT ,"falling" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_PB_RISING_EDGE_DETECT ,"rising" ), +}; + +static const struct resource tps65219_regulator_resources[] = { +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_SCG ,"LDO3_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_OC ,"LDO3_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_UV ,"LDO3_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_SCG ,"LDO4_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_OC ,"LDO4_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_UV ,"LDO4_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_SCG ,"LDO1_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_OC ,"LDO1_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_UV ,"LDO1_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_SCG ,"LDO2_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_OC ,"LDO2_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_UV ,"LDO2_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_SCG ,"BUCK3_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_OC ,"BUCK3_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_NEG_OC ,"BUCK3_NEG_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_UV ,"BUCK3_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_SCG ,"BUCK1_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_OC ,"BUCK1_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_NEG_OC ,"BUCK1_NEG_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_UV ,"BUCK1_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_SCG ,"BUCK2_SCG" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_OC ,"BUCK2_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_NEG_OC ,"BUCK2_NEG_OC" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_UV ,"BUCK2_UV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_RV ,"BUCK1_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_RV ,"BUCK2_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_RV ,"BUCK3_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_RV ,"LDO1_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_RV ,"LDO2_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_RV ,"LDO3_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_RV ,"LDO4_RV" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK1_RV_SD ,"BUCK1_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK2_RV_SD ,"BUCK2_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_BUCK3_RV_SD ,"BUCK3_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO1_RV_SD ,"LDO1_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO2_RV_SD ,"LDO2_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO3_RV_SD ,"LDO3_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_LDO4_RV_SD ,"LDO4_RV_SD" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_TIMEOUT ,"TIMEOUT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_3_WARM ,"SENSOR_3_WARM" ),
drivers/mfd/tps65219.c static void pmic_do_poweroff(void) · line 165
Quoted 10 lines
drivers/mfd/tps65219.c +10
-0+DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_2_WARM ,"SENSOR_2_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_1_WARM ,"SENSOR_1_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_0_WARM ,"SENSOR_0_WARM" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_3_HOT ,"SENSOR_3_HOT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_2_HOT ,"SENSOR_2_HOT" ), +DEFINE_RES_IRQ_NAMED (TPS65219_INT_SENSOR_1_HOT ,"SENSOR_1_HOT" ), + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_0_HOT, "SENSOR_0_HOT"), +}; + +#define TPS65219_MAX_CELLS 2
Where is this even used?
Quoted 21 lines
drivers/mfd/tps65219.c +14
-0+static const struct mfd_cell tps65219_regulator_cell = { + .name ="tps65219-regulator" , + .resources = tps65219_regulator_resources, + .num_resources =ARRAY_SIZE (tps65219_regulator_resources), +}; + +static const struct mfd_cell tps65219_pwrbutton_cell = { + .name ="tps65219-pwrbutton" , + .resources = tps65219_pwrbutton_resources, + .num_resources =ARRAY_SIZE (tps65219_pwrbutton_resources), };static const struct regmap_config tps65219_regmap_config = {@@ -117,6 +182,147 @@ static const struct regmap_config tps65219_regmap_config = { .max_register = TPS65219_REG_FACTORY_CONFIG_2, }; +/* +* Mapping of main IRQ register bits to sub-IRQ register offsets so that we can +* access corect sub-IRQ registers based on bits that are set in main IRQ +* register.
drivers/mfd/tps65219.c static const struct regmap_config tps65219_regmap_config = { · line 198
Quoted 10 lines
drivers/mfd/tps65219.c +10
-0+*/ +/* Timeout Residual Voltage Shutdown */ +static unsigned int bit0_offsets[] = {TPS65219_TO_RV_POS }; +static unsigned int bit1_offsets[] = {TPS65219_RV_POS };/* Residual Voltage */ +static unsigned int bit2_offsets[] = {TPS65219_SYS_POS };/* System */ +static unsigned int bit3_offsets[] = {TPS65219_BUCK_1_2_POS };/* Buck 1-2 */ +static unsigned int bit4_offsets[] = {TPS65219_BUCK_3_POS };/* Buck 3 */ +static unsigned int bit5_offsets[] = {TPS65219_LDO_1_2_POS };/* LDO 1-2 */ +static unsigned int bit6_offsets[] = {TPS65219_LDO_3_4_POS };/* LDO 3-4 */ +static unsigned int bit7_offsets[] = {TPS65219_PB_POS };/* Power Button */
Well this is a pretty miserable interface.
You probably need spaces after { and before }.
Quoted 4 lines
drivers/mfd/tps65219.c +4
-0+static struct regmap_irq_sub_irq_map tps65219_sub_irq_offsets[] = { +REGMAP_IRQ_MAIN_REG_OFFSET (bit0_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit1_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit2_offsets),
drivers/mfd/tps65219.c static const struct regmap_config tps65219_regmap_config = { · line 213
Quoted 10 lines
drivers/mfd/tps65219.c +10
-0+REGMAP_IRQ_MAIN_REG_OFFSET (bit3_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit4_offsets ), +REGMAP_IRQ_MAIN_REG_OFFSET (bit5_offsets ), +REGMAP_IRQ_MAIN_REG_OFFSET (bit6_offsets ), + REGMAP_IRQ_MAIN_REG_OFFSET(bit7_offsets), +}; + +static struct regmap_irq tps65219_irqs[] = { +REGMAP_IRQ_REG (TPS65219_INT_LDO3_SCG ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO3_SCG_MASK ),
One line please.
Quoted 116 lines
drivers/mfd/tps65219.c +112
-0+REGMAP_IRQ_REG (TPS65219_INT_LDO3_OC , +TPS65219_LDO_3_4_POS ,TPS65219_INT_LDO3_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_UV ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO3_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_SCG ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO4_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_OC ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO4_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_UV ,TPS65219_LDO_3_4_POS , +TPS65219_INT_LDO4_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_SCG , +TPS65219_LDO_1_2_POS ,TPS65219_INT_LDO1_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_OC ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO1_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_UV ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO1_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_SCG ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO2_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_OC ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO2_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_UV ,TPS65219_LDO_1_2_POS , +TPS65219_INT_LDO2_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_SCG ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_OC ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_NEG_OC ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_NEG_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_UV ,TPS65219_BUCK_3_POS , +TPS65219_INT_BUCK3_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_SCG ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_NEG_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_NEG_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_UV ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK2_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_SCG ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_SCG_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_NEG_OC ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_NEG_OC_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_UV ,TPS65219_BUCK_1_2_POS , +TPS65219_INT_BUCK1_UV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_3_WARM , +TPS65219_SYS_POS ,TPS65219_INT_SENSOR_3_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_2_WARM ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_2_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_1_WARM ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_1_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_0_WARM ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_0_WARM_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_3_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_3_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_2_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_2_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_1_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_1_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_SENSOR_0_HOT ,TPS65219_SYS_POS , +TPS65219_INT_SENSOR_0_HOT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_RV ,TPS65219_RV_POS , +TPS65219_INT_BUCK1_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_RV ,TPS65219_RV_POS , +TPS65219_INT_BUCK2_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_RV ,TPS65219_RV_POS , +TPS65219_INT_BUCK3_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO1_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO2_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO3_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_RV ,TPS65219_RV_POS , +TPS65219_INT_LDO4_RV_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK1_RV_SD , +TPS65219_TO_RV_POS ,TPS65219_INT_BUCK1_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK2_RV_SD , +TPS65219_TO_RV_POS ,TPS65219_INT_BUCK2_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_BUCK3_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_BUCK3_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO1_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_LDO1_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO2_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_LDO2_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO3_RV_SD , +TPS65219_TO_RV_POS ,TPS65219_INT_LDO3_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_LDO4_RV_SD ,TPS65219_TO_RV_POS , +TPS65219_INT_LDO4_RV_SD_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_TIMEOUT ,TPS65219_TO_RV_POS , +TPS65219_INT_TIMEOUT_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_PB_FALLING_EDGE_DETECT , +TPS65219_PB_POS ,TPS65219_INT_PB_FALLING_EDGE_DET_MASK ), +REGMAP_IRQ_REG (TPS65219_INT_PB_RISING_EDGE_DETECT ,TPS65219_PB_POS , + TPS65219_INT_PB_RISING_EDGE_DET_MASK), +}; + +static struct regmap_irq_chip tps65219_irq_chip = { + .name ="tps65219_irq" , + .main_status =TPS65219_REG_INT_SOURCE , + .num_main_regs =1 , + .num_main_status_bits =8 , + .irqs = tps65219_irqs, + .num_irqs =ARRAY_SIZE (tps65219_irqs), + .status_base =TPS65219_REG_INT_LDO_3_4 , + .ack_base =TPS65219_REG_INT_LDO_3_4 , + .clear_ack =1 , + .num_regs =8 , + .sub_reg_offsets = &tps65219_sub_irq_offsets[0 ], +}; +static const struct of_device_id of_tps65219_match_table[] = { { .compatible ="ti,tps65219" , }, {}
drivers/mfd/tps65219.c static int tps65219_probe(struct i2c_client *client, · line 346
Quoted 4 lines
drivers/mfd/tps65219.c +1
-0@@ -137,6 +343,7 @@ static int tps65219_probe(struct i2c_client *client,i2c_set_clientdata (client, tps); tps->dev = &client->dev; + tps->irq = client->irq;
Is this used again beyond devm_regmap_add_irq_chip()?
drivers/mfd/tps65219.c static int tps65219_probe(struct i2c_client *client, · line 357
Quoted 10 lines
drivers/mfd/tps65219.c +3
-0tps->regmap =devm_regmap_init_i2c (client, &tps65219_regmap_config);if (IS_ERR (tps->regmap)) { ret =PTR_ERR (tps->regmap);@@ -145,6 +352,12 @@ static int tps65219_probe(struct i2c_client *client,return ret; } + ret =devm_regmap_add_irq_chip (&client->dev, tps->regmap, tps->irq, +IRQF_ONESHOT ,0 , &tps65219_irq_chip, + &tps->irq_data);
2 lines.
Quoted 22 lines
drivers/mfd/tps65219.c +3
-0+if (ret) +return ret; + ret =regmap_read (tps->regmap,TPS65219_REG_TI_DEV_ID , &chipid);if (ret) {dev_err (tps->dev,"Failed to read device ID: %d\n" , ret);include/linux/mfd/tps65219.h +8
-0@@ -214,6 +214,104 @@#define TPS65219_INT_PB_RISING_EDGE_DET_MASK BIT(1)#define TPS65219_INT_PB_REAL_TIME_STATUS_MASK BIT(2) +/* Masks for main IRQ register bits */ +enum { +TPS65219_INT_TIMEOUT_RV_SD , +#define TPS65219_INT_TIMEOUT_RV_SD_MASK BIT(TPS65219_INT_TIMEOUT_RV_SD) + TPS65219_INT_RV, +#define TPS65219_INT_RV_MASK BIT(TPS65219_INT_RV) + TPS65219_INT_SYSTEM, +#define TPS65219_INT_SYSTEM_MASK BIT(TPS65219_INT_SYSTEM)
include/linux/mfd/tps65219.h line 234
Quoted 10 lines
include/linux/mfd/tps65219.h +10
-0+ TPS65219_INT_BUCK_1_2, +#define TPS65219_INT_BUCK_1_2_MASK BIT(TPS65219_INT_BUCK_1_2) + TPS65219_INT_BUCK_3, +#define TPS65219_INT_BUCK_3_MASK BIT(TPS65219_INT_BUCK_3) + TPS65219_INT_LDO_1_2, +#define TPS65219_INT_LDO_1_2_MASK BIT(TPS65219_INT_LDO_1_2) + TPS65219_INT_LDO_3_4, +#define TPS65219_INT_LDO_3_4_MASK BIT(TPS65219_LDO_3_4) + TPS65219_INT_PB, +#define TPS65219_INT_PB_MASK BIT(TPS65219_INT_PB)
Where are these horrid defines used?
Can't you just use the BIT() macros. We know what they mean.
include/linux/mfd/tps65219.h line 237
Quoted 3 lines
include/linux/mfd/tps65219.h +3
-0+}; + +/* Timeout Residual Voltage Shutdown */
If you used nice nomenclature, you wouldn't need the comments.
Quoted 109 lines
include/linux/mfd/tps65219.h +92
-0+#define TPS65219_TO_RV_POS 6 +/* Residual Voltage */ +#define TPS65219_RV_POS 5 +/* System */ +#define TPS65219_SYS_POS 4 +/* Buck 1-2 */ +#define TPS65219_BUCK_1_2_POS 3 +/* Buck 3 */ +#define TPS65219_BUCK_3_POS 2 +/* LDO 1-2 */ +#define TPS65219_LDO_1_2_POS 1 +/* LDO 3-4 */ +#define TPS65219_LDO_3_4_POS 0 +/* Power Button */ +#define TPS65219_PB_POS 7 + +/* IRQs */ +enum { +/* LDO3-4 register IRQs */ +TPS65219_INT_LDO3_SCG , +TPS65219_INT_LDO3_OC , +TPS65219_INT_LDO3_UV , +TPS65219_INT_LDO4_SCG , +TPS65219_INT_LDO4_OC , +TPS65219_INT_LDO4_UV , +/* LDO1-2 */ +TPS65219_INT_LDO1_SCG , +TPS65219_INT_LDO1_OC , +TPS65219_INT_LDO1_UV , +TPS65219_INT_LDO2_SCG , +TPS65219_INT_LDO2_OC , +TPS65219_INT_LDO2_UV , +/* BUCK3 */ +TPS65219_INT_BUCK3_SCG , +TPS65219_INT_BUCK3_OC , +TPS65219_INT_BUCK3_NEG_OC , +TPS65219_INT_BUCK3_UV , +/* BUCK1-2 */ +TPS65219_INT_BUCK1_SCG , +TPS65219_INT_BUCK1_OC , +TPS65219_INT_BUCK1_NEG_OC , +TPS65219_INT_BUCK1_UV , +TPS65219_INT_BUCK2_SCG , +TPS65219_INT_BUCK2_OC , +TPS65219_INT_BUCK2_NEG_OC , +TPS65219_INT_BUCK2_UV , +/* Thermal Sensor */ +TPS65219_INT_SENSOR_3_WARM , +TPS65219_INT_SENSOR_2_WARM , +TPS65219_INT_SENSOR_1_WARM , +TPS65219_INT_SENSOR_0_WARM , +TPS65219_INT_SENSOR_3_HOT , +TPS65219_INT_SENSOR_2_HOT , +TPS65219_INT_SENSOR_1_HOT , +TPS65219_INT_SENSOR_0_HOT , +/* Residual Voltage */ +TPS65219_INT_BUCK1_RV , +TPS65219_INT_BUCK2_RV , +TPS65219_INT_BUCK3_RV , +TPS65219_INT_LDO1_RV , +TPS65219_INT_LDO2_RV , +TPS65219_INT_LDO3_RV , +TPS65219_INT_LDO4_RV , +/* Residual Voltage ShutDown */ +TPS65219_INT_BUCK1_RV_SD , +TPS65219_INT_BUCK2_RV_SD , +TPS65219_INT_BUCK3_RV_SD , +TPS65219_INT_LDO1_RV_SD , +TPS65219_INT_LDO2_RV_SD , +TPS65219_INT_LDO3_RV_SD , +TPS65219_INT_LDO4_RV_SD , +TPS65219_INT_TIMEOUT , +/* Power Button */ +TPS65219_INT_PB_FALLING_EDGE_DETECT , +TPS65219_INT_PB_RISING_EDGE_DETECT , +}; +enum tps65219_regulator_id {/* DCDC's */ TPS65219_BUCK_1 ,@@ -235,6 +333,19 @@ enum tps65219_regulator_id {/* Number of total regulators available */ #define TPS65219_NUM_REGULATOR (TPS65219_NUM_DCDC + TPS65219_NUM_LDO) +/* Define the TPS65219 IRQ numbers */ +enum tps65219_irqs { +/* INT source registers */ +TPS65219_TO_RV_SD_SET_IRQ , +TPS65219_RV_SET_IRQ , +TPS65219_SYS_SET_IRQ , +TPS65219_BUCK_1_2_SET_IRQ , +TPS65219_BUCK_3_SET_IRQ , +TPS65219_LDO_1_2_SET_IRQ , +TPS65219_LDO_3_4_SET_IRQ , +TPS65219_PB_SET_IRQ , +}; +/** * struct tps65219 - tps65219 sub-driver chip access routines * @@ -243,6 +354,8 @@ enum tps65219_regulator_id {struct tps65219 {struct device *dev;unsigned int id; +int irq; +struct regmap_irq_chip_data *irq_data;struct regulator_desc desc[TPS65219_NUM_REGULATOR ];struct regmap *regmap;struct notifier_block nb;
Signature · 1 line
DEPRECATED: Please use [email protected]
PATCH v2 8/11 mfd: tps65219: Add power-button support
In reply to Jerome NeanneFrom: Markus Schneider-Pargmann <[email protected]>
Using a power-button on the EN/PB/VSENSE pin of TPS65219 is optional, so this driver adds the mfd cell for tps65219-pwrbutton only if needed. Two interrupts are passed to the driver.
--- drivers/mfd/tps65219.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/mfd/tps65219.c +13 -3
@@ -335,7 +335,10 @@ static int tps65219_probe(struct i2c_client *client,struct tps65219 *tps;int ret;unsigned int chipid; +bool pwr_button;bool sys_pwr; +struct mfd_cell cells[TPS65219_MAX_CELLS ]; +int nr_cells =0 ; tps =devm_kzalloc (&client->dev,sizeof (*tps),GFP_KERNEL );if (!tps)
@@ -364,9 +367,16 @@ static int tps65219_probe(struct i2c_client *client,return ret; } - ret =devm_mfd_add_devices (tps->dev,PLATFORM_DEVID_AUTO , tps65219_cells, -ARRAY_SIZE (tps65219_cells),NULL ,0 , -NULL ); +memcpy (&cells[nr_cells++], &tps65219_regulator_cell, +sizeof (tps65219_regulator_cell)); + pwr_button =of_property_read_bool (tps->dev->of_node,"power-button" ); +if (pwr_button) +memcpy (&cells[nr_cells++], &tps65219_pwrbutton_cell, +sizeof (tps65219_pwrbutton_cell)); + + ret =devm_mfd_add_devices (tps->dev,PLATFORM_DEVID_AUTO , cells, + nr_cells,NULL ,0 , +regmap_irq_get_domain (tps->irq_data));if (ret) {dev_err (tps->dev,"mfd_add_devices failed: %d\n" , ret);return ret;
Signature · 1 line
2.17.1
Re: [PATCH v2 08/11] mfd: tps65219: Add power-button support
Quoted 5 lines · Jerome Neanne
From: Markus Schneider-Pargmann <[email protected]>
Using a power-button on the EN/PB/VSENSE pin of TPS65219 is optional, so this driver adds the mfd cell for tps65219-pwrbutton only if needed. Two interrupts are passed to the driver.
Power button support was already added in the previous patch.
Quoted 24 lines
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Jerome Neanne <[email protected]>--- drivers/mfd/tps65219.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)drivers/mfd/tps65219.c +3
-0@@ -335,7 +335,10 @@ static int tps65219_probe(struct i2c_client *client,struct tps65219 *tps;int ret;unsigned int chipid; +bool pwr_button;bool sys_pwr; +struct mfd_cell cells[TPS65219_MAX_CELLS ]; +int nr_cells =0 ; tps =devm_kzalloc (&client->dev,sizeof (*tps),GFP_KERNEL );if (!tps)@@ -364,9 +367,16 @@ static int tps65219_probe(struct i2c_client *client,return ret; }
drivers/mfd/tps65219.c static int tps65219_probe(struct i2c_client *client, · line 375
Quoted 10 lines
drivers/mfd/tps65219.c +6
-3- ret =devm_mfd_add_devices (tps->dev,PLATFORM_DEVID_AUTO , tps65219_cells, -ARRAY_SIZE (tps65219_cells),NULL ,0 , -NULL ); +memcpy (&cells[nr_cells++], &tps65219_regulator_cell, +sizeof (tps65219_regulator_cell)); + pwr_button =of_property_read_bool (tps->dev->of_node,"power-button" ); +if (pwr_button) +memcpy (&cells[nr_cells++], &tps65219_pwrbutton_cell, +sizeof (tps65219_pwrbutton_cell));
Gross, no way.
Please call devm_mfd_add_devices() twice.
Quoted 6 lines
drivers/mfd/tps65219.c +3
-0+ ret =devm_mfd_add_devices (tps->dev,PLATFORM_DEVID_AUTO , cells, + nr_cells,NULL ,0 , +regmap_irq_get_domain (tps->irq_data));if (ret) {dev_err (tps->dev,"mfd_add_devices failed: %d\n" , ret);return ret;
Signature · 1 line
DEPRECATED: Please use [email protected]
PATCH v2 9/11 regulator: drivers: Add TI TPS65219 PMIC regulators support
In reply to Jerome NeanneThe regulators set consists of 3 bucks DCDCs and 4 LDOs. The output voltages are configurable and are meant to supply power to the main processor and other components.
Validation:
Visual check: cat /sys/kernel/debug/regulator/regulator_summary
Validation: userspace-consumer and virtual-regulator required to test further
Enable/Disable:
cat /sys/devices/platform/userspace-consumer-VDDSHV_SD_IO_PMIC/state echo disabled > /sys/devices/platform/ userspace-consumer-VDDSHV_SD_IO_PMIC/state
echo enabled > /sys/devices/platform/ userspace-consumer-VDDSHV_SD_IO_PMIC/state
Change voltage:
cat /sys/devices/platform/regulator-virtual-ldo1/min_microvolts echo 1000000 > /sys/devices/platform/regulator-virtual-ldo1/ min_microvolts
echo 3000000 > /sys/devices/platform/regulator-virtual-ldo1/ max_microvolts
--- MAINTAINERS | 1 + drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/tps65219-regulator.c | 416 +++++++++++++++++++++++++ 4 files changed, 427 insertions(+) create mode 100644 drivers/regulator/tps65219-regulator.c
MAINTAINERS +1 -0
@@ -14721,6 +14721,7 @@ F: drivers/regulator/palmas-regulator*.c F: drivers/regulator/pbias-regulator.c F: drivers/regulator/tps65217-regulator.c F: drivers/regulator/tps65218-regulator.c +F: drivers/regulator/tps65219-regulator.c F: drivers/regulator/tps65910-regulator.c F: drivers/regulator/twl-regulator.c F: drivers/regulator/twl6030-regulator.c
drivers/regulator/Kconfig +9 -0
@@ -1356,6 +1356,15 @@ config REGULATOR_TPS65218 voltage regulators. It supports software based voltage control for different voltage domains +config REGULATOR_TPS65219 + tristate "TI TPS65219 Power regulators" + depends on MFD_TPS65219 && OF + help + This driver supports TPS65219 voltage regulator chips. + TPS65219 series of PMICs have 3 single phase BUCKs & 4 LDOs + voltage regulators. It supports software based voltage control + for different voltage domains. + config REGULATOR_TPS6524X tristate "TI TPS6524X Power regulators" depends on SPI
drivers/regulator/Makefile +1 -0
@@ -159,6 +159,7 @@ obj-$(CONFIG_REGULATOR_TPS65086) += tps65086-regulator.o obj-$(CONFIG_REGULATOR_TPS65090) += tps65090-regulator.o obj-$(CONFIG_REGULATOR_TPS65217) += tps65217-regulator.o obj-$(CONFIG_REGULATOR_TPS65218) += tps65218-regulator.o +obj-$(CONFIG_REGULATOR_TPS65219) += tps65219-regulator.o obj-$(CONFIG_REGULATOR_TPS6524X) += tps6524x-regulator.o obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
drivers/regulator/tps65219-regulator.c new file +416 -0
416 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 10/11 Input: Add tps65219 interrupt driven powerbutton
In reply to Jerome NeanneFrom: Markus Schneider-Pargmann <[email protected]>
TPS65219 has different interrupts compared to other TPS6521* chips. TPS65219 defines two interrupts for the powerbutton one for push and one for release.
This driver is very simple in that it maps the push interrupt to a key input and the release interrupt to a key release.
--- MAINTAINERS | 1 + drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/tps65219-pwrbutton.c | 150 ++++++++++++++++++++++++ 4 files changed, 162 insertions(+) create mode 100644 drivers/input/misc/tps65219-pwrbutton.c
MAINTAINERS +1 -0
@@ -14705,6 +14705,7 @@ F: arch/arm/plat-omap/ F: drivers/bus/ti-sysc.c F: drivers/i2c/busses/i2c-omap.c F: drivers/input/misc/tps65218-pwrbutton.c +F: drivers/input/misc/tps65219-pwrbutton.c F: drivers/irqchip/irq-omap-intc.c F: drivers/mfd/*omap*.c F: drivers/mfd/menelaus.c
drivers/input/misc/Kconfig +10 -0
@@ -468,6 +468,16 @@ config INPUT_TPS65218_PWRBUTTON To compile this driver as a module, choose M here. The module will be called tps65218-pwrbutton. +config INPUT_TPS65219_PWRBUTTON + tristate "TPS65219 Power button driver" + depends on MFD_TPS65219 + help + Say Y here if you want to enable power button reporting for + TPS65219 Power Management IC devices. + + To compile this driver as a module, choose M here. The module will + be called tps65219-pwrbutton. + config INPUT_AXP20X_PEK tristate "X-Powers AXP20X power button driver" depends on MFD_AXP20X
drivers/input/misc/Makefile +1 -0
@@ -78,6 +78,7 @@ obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY) += soc_button_array.o obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o obj-$(CONFIG_INPUT_STPMIC1_ONKEY) += stpmic1_onkey.o obj-$(CONFIG_INPUT_TPS65218_PWRBUTTON) += tps65218-pwrbutton.o +obj-$(CONFIG_INPUT_TPS65219_PWRBUTTON) += tps65219-pwrbutton.o obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o obj-$(CONFIG_INPUT_TWL4030_VIBRA) += twl4030-vibra.o obj-$(CONFIG_INPUT_TWL6040_VIBRA) += twl6040-vibra.o
drivers/input/misc/tps65219-pwrbutton.c new file +150 -0
150 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 11/11 arm64: defconfig: Add tps65219 as modules
In reply to Jerome NeanneThis adds defconfig option to support TPS65219 PMIC, MFD, Regulators and power-button.
--- arch/arm64/configs/defconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/configs/defconfig +3 -0
@@ -412,6 +412,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PM8941_PWRKEY=y +CONFIG_INPUT_TPS65219_PWRBUTTON=m CONFIG_INPUT_PM8XXX_VIBRATOR=m CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_PWM_VIBRA=m
@@ -641,6 +642,7 @@ CONFIG_MFD_SPMI_PMIC=y CONFIG_MFD_RK808=y CONFIG_MFD_SEC_CORE=y CONFIG_MFD_SL28CPLD=y +CONFIG_MFD_TPS65219=m CONFIG_MFD_ROHM_BD718XX=y CONFIG_MFD_WCD934X=m CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -668,6 +670,7 @@ CONFIG_REGULATOR_QCOM_SPMI=y CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_TPS65132=m +CONFIG_REGULATOR_TPS65219=m CONFIG_REGULATOR_VCTRL=m CONFIG_RC_CORE=m CONFIG_RC_DECODERS=y
Signature · 1 line
2.17.1