You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge remote-tracking branch 'regulator/fix/s5m8767' into regulator-linus
This commit is contained in:
Mark Brown
@@ -0,0 +1,55 @@
|
||||
Maxim MAX77693 multi-function device
|
||||
|
||||
MAX77693 is a Multifunction device with the following submodules:
|
||||
- PMIC,
|
||||
- CHARGER,
|
||||
- LED,
|
||||
- MUIC,
|
||||
- HAPTIC
|
||||
|
||||
It is interfaced to host controller using i2c.
|
||||
This document describes the bindings for the mfd device.
|
||||
|
||||
Required properties:
|
||||
- compatible : Must be "maxim,max77693".
|
||||
- reg : Specifies the i2c slave address of PMIC block.
|
||||
- interrupts : This i2c device has an IRQ line connected to the main SoC.
|
||||
- interrupt-parent : The parent interrupt controller.
|
||||
|
||||
Optional properties:
|
||||
- regulators : The regulators of max77693 have to be instantiated under subnod
|
||||
named "regulators" using the following format.
|
||||
|
||||
regulators {
|
||||
regualtor-compatible = ESAFEOUT1/ESAFEOUT2/CHARGER
|
||||
standard regulator constratints[*].
|
||||
};
|
||||
|
||||
[*] refer Documentation/devicetree/bindings/regulator/regulator.txt
|
||||
|
||||
Example:
|
||||
max77693@66 {
|
||||
compatible = "maxim,max77693";
|
||||
reg = <0x66>;
|
||||
interrupt-parent = <&gpx1>;
|
||||
interrupts = <5 2>;
|
||||
|
||||
regulators {
|
||||
esafeout@1 {
|
||||
regulator-compatible = "ESAFEOUT1";
|
||||
regulator-name = "ESAFEOUT1";
|
||||
regulator-boot-on;
|
||||
};
|
||||
esafeout@2 {
|
||||
regulator-compatible = "ESAFEOUT2";
|
||||
regulator-name = "ESAFEOUT2";
|
||||
};
|
||||
charger@0 {
|
||||
regulator-compatible = "CHARGER";
|
||||
regulator-name = "CHARGER";
|
||||
regulator-min-microamp = <60000>;
|
||||
regulator-max-microamp = <2580000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -0,0 +1,160 @@
|
||||
Binding for TI/National Semiconductor LP872x Driver
|
||||
|
||||
Required properties:
|
||||
- compatible: "ti,lp8720" or "ti,lp8725"
|
||||
- reg: I2C slave address. 0x7d = LP8720, 0x7a = LP8725
|
||||
|
||||
Optional properties:
|
||||
- ti,general-config: the value of LP872X_GENERAL_CFG register (u8)
|
||||
(LP8720)
|
||||
bit[2]: BUCK output voltage control by external DVS pin or register
|
||||
1 = external pin, 0 = bit7 of register 08h
|
||||
bit[1]: sleep control by external DVS pin or register
|
||||
1 = external pin, 0 = bit6 of register 08h
|
||||
bit[0]: time step unit(usec). 1 = 25, 0 = 50
|
||||
|
||||
(LP8725)
|
||||
bit[7:6]: time step unit(usec). 00 = 32, 01 = 64, 10 = 128, 11 = 256
|
||||
bit[4]: BUCK2 enable control. 1 = enable, 0 = disable
|
||||
bit[3]: BUCK2 output voltage register address. 1 = 0Ah, 0 = 0Bh
|
||||
bit[2]: BUCK1 output voltage control by external DVS pin or register
|
||||
1 = register 08h, 0 = DVS
|
||||
bit[1]: LDO sleep control. 1 = sleep mode, 0 = normal
|
||||
bit[0]: BUCK1 enable control, 1 = enable, 0 = disable
|
||||
|
||||
For more details, please see the datasheet.
|
||||
|
||||
- ti,update-config: define it when LP872X_GENERAL_CFG register should be set
|
||||
- ti,dvs-gpio: GPIO specifier for external DVS pin control of LP872x devices.
|
||||
- ti,dvs-vsel: DVS selector. 0 = SEL_V1, 1 = SEL_V2.
|
||||
- ti,dvs-state: initial DVS pin state. 0 = DVS_LOW, 1 = DVS_HIGH.
|
||||
|
||||
Sub nodes for regulator_init_data
|
||||
LP8720 has maximum 6 nodes. (child name: ldo1 ~ 5 and buck)
|
||||
LP8725 has maximum 9 nodes. (child name: ldo1 ~ 5, lilo1,2 and buck1,2)
|
||||
For more details, please see the following binding document.
|
||||
(Documentation/devicetree/bindings/regulator/regulator.txt)
|
||||
|
||||
Datasheet
|
||||
- LP8720: http://www.ti.com/lit/ds/symlink/lp8720.pdf
|
||||
- LP8725: http://www.ti.com/lit/ds/symlink/lp8725.pdf
|
||||
|
||||
Example 1) LP8720
|
||||
|
||||
lp8720@7d {
|
||||
compatible = "ti,lp8720";
|
||||
reg = <0x7d>;
|
||||
|
||||
/* external DVS pin used, timestep is 25usec */
|
||||
ti,general-config = /bits/ 8 <0x03>;
|
||||
ti,update-config;
|
||||
|
||||
/*
|
||||
* The dvs-gpio depends on the processor environment.
|
||||
* For example, following GPIO specifier means GPIO134 in OMAP4.
|
||||
*/
|
||||
ti,dvs-gpio = <&gpio5 6 0>;
|
||||
ti,dvs-vsel = /bits/ 8 <1>; /* SEL_V2 */
|
||||
ti,dvs-state = /bits/ 8 <1>; /* DVS_HIGH */
|
||||
|
||||
vaf: ldo1 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vmmc: ldo2 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vcam_io: ldo3 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
vcam_core: ldo4 {
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <2850000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
vcam: ldo5 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vcc: buck {
|
||||
regulator-name = "VBUCK";
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <2300000>;
|
||||
};
|
||||
};
|
||||
|
||||
Example 2) LP8725
|
||||
|
||||
lp8725@7a {
|
||||
compatible = "ti,lp8725";
|
||||
reg = <0x7a>;
|
||||
|
||||
/* Enable BUCK1,2, no DVS, normal LDO mode, timestep is 256usec */
|
||||
ti,general-config = /bits/ 8 <0xdd>;
|
||||
ti,update-config;
|
||||
|
||||
vcam_io: ldo1 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vcam_core: ldo2 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vcam: ldo3 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vcmmb_io: ldo4 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
vcmmb_core: ldo5 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
vaux1: lilo1 {
|
||||
regulator-name = "VAUX1";
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vaux2: lilo2 {
|
||||
regulator-name = "VAUX2";
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
||||
vcc1: buck1 {
|
||||
regulator-name = "VBUCK1";
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-min-microamp = <460000>;
|
||||
regulator-max-microamp = <1370000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
|
||||
vcc2: buck2 {
|
||||
regulator-name = "VBUCK2";
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-min-microamp = <460000>;
|
||||
regulator-max-microamp = <1370000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
@@ -0,0 +1,21 @@
|
||||
* Maxim MAX8973 Voltage Regulator
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible: must be "maxim,max8973"
|
||||
- reg: the i2c slave address of the regulator. It should be 0x1b.
|
||||
|
||||
Any standard regulator properties can be used to configure the single max8973
|
||||
DCDC.
|
||||
|
||||
Example:
|
||||
|
||||
max8973@1b {
|
||||
compatible = "maxim,max8973";
|
||||
reg = <0x1b>;
|
||||
|
||||
regulator-min-microvolt = <935000>;
|
||||
regulator-max-microvolt = <1200000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
@@ -9,6 +9,7 @@ Optional properties:
|
||||
- regulator-max-microamp: largest current consumers may set
|
||||
- regulator-always-on: boolean, regulator should never be disabled
|
||||
- regulator-boot-on: bootloader/firmware enabled regulator
|
||||
- regulator-allow-bypass: allow the regulator to go into bypass mode
|
||||
- <name>-supply: phandle to the parent supply/regulator node
|
||||
- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
* Samsung S5M8767 Voltage and Current Regulator
|
||||
|
||||
The Samsung S5M8767 is a multi-function device which includes volatage and
|
||||
The Samsung S5M8767 is a multi-function device which includes voltage and
|
||||
current regulators, rtc, charger controller and other sub-blocks. It is
|
||||
interfaced to the host controller using a i2c interface. Each sub-block is
|
||||
addressed by the host system using different i2c slave address. This document
|
||||
@@ -103,13 +103,13 @@ Example:
|
||||
|
||||
s5m8767,pmic-buck-default-dvs-idx = <0>;
|
||||
|
||||
s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 1 0 0>, /* DVS1 */
|
||||
<&gpx0 1 1 0 0>, /* DVS2 */
|
||||
<&gpx0 2 1 0 0>; /* DVS3 */
|
||||
s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 0>, /* DVS1 */
|
||||
<&gpx0 1 0>, /* DVS2 */
|
||||
<&gpx0 2 0>; /* DVS3 */
|
||||
|
||||
s5m8767,pmic-buck-ds-gpios = <&gpx2 3 1 0 0>, /* SET1 */
|
||||
<&gpx2 4 1 0 0>, /* SET2 */
|
||||
<&gpx2 5 1 0 0>; /* SET3 */
|
||||
s5m8767,pmic-buck-ds-gpios = <&gpx2 3 0>, /* SET1 */
|
||||
<&gpx2 4 0>, /* SET2 */
|
||||
<&gpx2 5 0>; /* SET3 */
|
||||
|
||||
s5m8767,pmic-buck2-dvs-voltage = <1350000>, <1300000>,
|
||||
<1250000>, <1200000>,
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
Adaptive Body Bias(ABB) SoC internal LDO regulator for Texas Instruments SoCs
|
||||
|
||||
Required Properties:
|
||||
- compatible: Should be one of:
|
||||
- "ti,abb-v1" for older SoCs like OMAP3
|
||||
- "ti,abb-v2" for newer SoCs like OMAP4, OMAP5
|
||||
- reg: Address and length of the register set for the device. It contains
|
||||
the information of registers in the same order as described by reg-names
|
||||
- reg-names: Should contain the reg names
|
||||
- "base-address" - contains base address of ABB module
|
||||
- "int-address" - contains address of interrupt register for ABB module
|
||||
(also see Optional properties)
|
||||
- #address-cell: should be 0
|
||||
- #size-cell: should be 0
|
||||
- clocks: should point to the clock node used by ABB module
|
||||
- ti,settling-time: Settling time in uSecs from SoC documentation for ABB module
|
||||
to settle down(target time for SR2_WTCNT_VALUE).
|
||||
- ti,clock-cycles: SoC specific data about count of system ti,clock-cycles used for
|
||||
computing settling time from SoC Documentation for ABB module(clock
|
||||
cycles for SR2_WTCNT_VALUE).
|
||||
- ti,tranxdone-status-mask: Mask to the int-register to write-to-clear mask
|
||||
indicating LDO tranxdone (operation complete).
|
||||
- ti,abb_info: An array of 6-tuples u32 items providing information about ABB
|
||||
configuration needed per operational voltage of the device.
|
||||
Each item consists of the following in the same order:
|
||||
volt: voltage in uV - Only used to index ABB information.
|
||||
ABB mode: one of the following:
|
||||
0-bypass
|
||||
1-Forward Body Bias(FBB)
|
||||
3-Reverse Body Bias(RBB)
|
||||
efuse: (see Optional properties)
|
||||
RBB enable efuse Mask: (See Optional properties)
|
||||
FBB enable efuse Mask: (See Optional properties)
|
||||
Vset value efuse Mask: (See Optional properties)
|
||||
|
||||
NOTE: If more than 1 entry is present, then regulator is setup to change
|
||||
voltage, allowing for various modes to be selected indexed off
|
||||
the regulator. Further, ABB LDOs are considered always-on by
|
||||
default.
|
||||
|
||||
Optional Properties:
|
||||
- reg-names: In addition to the required properties, the following are optional
|
||||
- "efuse-address" - Contains efuse base address used to pick up ABB info.
|
||||
- "ldo-address" - Contains address of ABB LDO overide register address.
|
||||
"efuse-address" is required for this.
|
||||
- ti,ldovbb-vset-mask - Required if ldo-address is set, mask for LDO override
|
||||
register to provide override vset value.
|
||||
- ti,ldovbb-override-mask - Required if ldo-address is set, mask for LDO
|
||||
override register to enable override vset value.
|
||||
- ti,abb_opp_sel: Addendum to the description in required properties
|
||||
efuse: Mandatory if 'efuse-address' register is defined. Provides offset
|
||||
from efuse-address to pick up ABB characteristics. Set to 0 if
|
||||
'efuse-address' is not defined.
|
||||
RBB enable efuse Mask: Optional if 'efuse-address' register is defined.
|
||||
'ABB mode' is force set to RBB mode if value at "efuse-address"
|
||||
+ efuse maps to RBB mask. Set to 0 to ignore this.
|
||||
FBB enable efuse Mask: Optional if 'efuse-address' register is defined.
|
||||
'ABB mode' is force set to FBB mode if value at "efuse-address"
|
||||
+ efuse maps to FBB mask (valid only if RBB mask does not match)
|
||||
Set to 0 to ignore this.
|
||||
Vset value efuse Mask: Mandatory if ldo-address is set. Picks up from
|
||||
efuse the value to set in 'ti,ldovbb-vset-mask' at ldo-address.
|
||||
|
||||
Example #1: Simplest configuration (no efuse data, hard coded ABB table):
|
||||
abb_x: regulator-abb-x {
|
||||
compatible = "ti,abb-v1";
|
||||
regulator-name = "abb_x";
|
||||
#address-cell = <0>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x483072f0 0x8>, <0x48306818 0x4>;
|
||||
reg-names = "base-address", "int-address";
|
||||
ti,tranxdone-status-mask = <0x4000000>;
|
||||
clocks = <&sysclk>;
|
||||
ti,settling-time = <30>;
|
||||
ti,clock-cycles = <8>;
|
||||
ti,abb_info = <
|
||||
/* uV ABB efuse rbb_m fbb_m vset_m */
|
||||
1012500 0 0 0 0 0 /* Bypass */
|
||||
1200000 3 0 0 0 0 /* RBB mandatory */
|
||||
1320000 1 0 0 0 0 /* FBB mandatory */
|
||||
>;
|
||||
};
|
||||
|
||||
Example #2: Efuse bits contain ABB mode setting (no LDO override capability)
|
||||
abb_y: regulator-abb-y {
|
||||
compatible = "ti,abb-v2";
|
||||
regulator-name = "abb_y";
|
||||
#address-cell = <0>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x4a307bd0 0x8>, <0x4a306014 0x4>, <0x4A002268 0x8>;
|
||||
reg-names = "base-address", "int-address", "efuse-address";
|
||||
ti,tranxdone-status-mask = <0x4000000>;
|
||||
clocks = <&sysclk>;
|
||||
ti,settling-time = <50>;
|
||||
ti,clock-cycles = <16>;
|
||||
ti,abb_info = <
|
||||
/* uV ABB efuse rbb_m fbb_m vset_m */
|
||||
975000 0 0 0 0 0 /* Bypass */
|
||||
1012500 0 0 0x40000 0 0 /* RBB optional */
|
||||
1200000 0 0x4 0 0x40000 0 /* FBB optional */
|
||||
1320000 1 0 0 0 0 /* FBB mandatory */
|
||||
>;
|
||||
};
|
||||
|
||||
Example #3: Efuse bits contain ABB mode setting and LDO override capability
|
||||
abb_z: regulator-abb-z {
|
||||
compatible = "ti,abb-v2";
|
||||
regulator-name = "abb_z";
|
||||
#address-cell = <0>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x4ae07ce4 0x8>, <0x4ae06010 0x4>,
|
||||
<0x4a002194 0x8>, <0x4ae0C314 0x4>;
|
||||
reg-names = "base-address", "int-address",
|
||||
"efuse-address", "ldo-address";
|
||||
ti,tranxdone-status-mask = <0x8000000>;
|
||||
/* LDOVBBMM_MUX_CTRL */
|
||||
ti,ldovbb-override-mask = <0x400>;
|
||||
/* LDOVBBMM_VSET_OUT */
|
||||
ti,ldovbb-vset-mask = <0x1F>;
|
||||
clocks = <&sysclk>;
|
||||
ti,settling-time = <50>;
|
||||
ti,clock-cycles = <16>;
|
||||
ti,abb_info = <
|
||||
/* uV ABB efuse rbb_m fbb_m vset_m */
|
||||
975000 0 0 0 0 0 /* Bypass */
|
||||
1200000 0 0x4 0 0x40000 0x1f00 /* FBB optional, vset */
|
||||
>;
|
||||
};
|
||||
@@ -406,7 +406,6 @@ static int pm8607_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct pm8607_regulator_info *info = platform_get_drvdata(pdev);
|
||||
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
regulator_unregister(info->regulator);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -250,6 +250,15 @@ config REGULATOR_MAX77686
|
||||
via I2C bus. The provided regulator is suitable for
|
||||
Exynos-4 chips to control VARM and VINT voltages.
|
||||
|
||||
config REGULATOR_MAX77693
|
||||
tristate "Maxim MAX77693 regulator"
|
||||
depends on MFD_MAX77693
|
||||
help
|
||||
This driver controls a Maxim 77693 regulator via I2C bus.
|
||||
The regulators include two LDOs, 'SAFEOUT1', 'SAFEOUT2'
|
||||
and one current regulator 'CHARGER'. This is suitable for
|
||||
Exynos-4x12 chips.
|
||||
|
||||
config REGULATOR_PCAP
|
||||
tristate "Motorola PCAP2 regulator driver"
|
||||
depends on EZX_PCAP
|
||||
@@ -472,6 +481,16 @@ config REGULATOR_TWL4030
|
||||
This driver supports the voltage regulators provided by
|
||||
this family of companion chips.
|
||||
|
||||
config REGULATOR_TI_ABB
|
||||
bool "TI Adaptive Body Bias on-chip LDO"
|
||||
depends on ARCH_OMAP
|
||||
help
|
||||
Select this option to support Texas Instruments' on-chip Adaptive Body
|
||||
Bias (ABB) LDO regulators. It is recommended that this option be
|
||||
enabled on required TI SoC. Certain Operating Performance Points
|
||||
on TI SoCs may be unstable without enabling this as it provides
|
||||
device specific optimized bias to allow/optimize functionality.
|
||||
|
||||
config REGULATOR_VEXPRESS
|
||||
tristate "Versatile Express regulators"
|
||||
depends on VEXPRESS_CONFIG
|
||||
|
||||
@@ -12,7 +12,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
|
||||
obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
|
||||
obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
|
||||
obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o ab8500-ext.o
|
||||
obj-$(CONFIG_REGULATOR_AB8500) += ab8500-ext.o ab8500.o
|
||||
obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
|
||||
obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
|
||||
@@ -41,6 +41,7 @@ obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
|
||||
obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
|
||||
obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
|
||||
obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
|
||||
obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
|
||||
@@ -63,6 +64,7 @@ obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
|
||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
|
||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
|
||||
|
||||
@@ -16,9 +16,11 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regulator/driver.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/regulator/of_regulator.h>
|
||||
#include <linux/mfd/abx500.h>
|
||||
#include <linux/mfd/abx500/ab8500.h>
|
||||
#include <linux/regulator/ab8500.h>
|
||||
@@ -229,6 +231,28 @@ static unsigned int ab8500_ext_regulator_get_mode(struct regulator_dev *rdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ab8500_ext_set_voltage(struct regulator_dev *rdev, int min_uV,
|
||||
int max_uV, unsigned *selector)
|
||||
{
|
||||
struct regulation_constraints *regu_constraints = rdev->constraints;
|
||||
|
||||
if (!regu_constraints) {
|
||||
dev_err(rdev_get_dev(rdev), "No regulator constraints\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (regu_constraints->min_uV == min_uV &&
|
||||
regu_constraints->max_uV == max_uV)
|
||||
return 0;
|
||||
|
||||
dev_err(rdev_get_dev(rdev),
|
||||
"Requested min %duV max %duV != constrained min %duV max %duV\n",
|
||||
min_uV, max_uV,
|
||||
regu_constraints->min_uV, regu_constraints->max_uV);
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int ab8500_ext_list_voltage(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
@@ -252,6 +276,7 @@ static struct regulator_ops ab8500_ext_regulator_ops = {
|
||||
.is_enabled = ab8500_ext_regulator_is_enabled,
|
||||
.set_mode = ab8500_ext_regulator_set_mode,
|
||||
.get_mode = ab8500_ext_regulator_get_mode,
|
||||
.set_voltage = ab8500_ext_set_voltage,
|
||||
.list_voltage = ab8500_ext_list_voltage,
|
||||
};
|
||||
|
||||
@@ -310,18 +335,37 @@ static struct ab8500_ext_regulator_info
|
||||
},
|
||||
};
|
||||
|
||||
int ab8500_ext_regulator_init(struct platform_device *pdev)
|
||||
static struct of_regulator_match ab8500_ext_regulator_match[] = {
|
||||
{ .name = "ab8500_ext1", .driver_data = (void *) AB8500_EXT_SUPPLY1, },
|
||||
{ .name = "ab8500_ext2", .driver_data = (void *) AB8500_EXT_SUPPLY2, },
|
||||
{ .name = "ab8500_ext3", .driver_data = (void *) AB8500_EXT_SUPPLY3, },
|
||||
};
|
||||
|
||||
static int ab8500_ext_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
|
||||
struct ab8500_platform_data *ppdata;
|
||||
struct ab8500_regulator_platform_data *pdata;
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct regulator_config config = { };
|
||||
int i, err;
|
||||
|
||||
if (np) {
|
||||
err = of_regulator_match(&pdev->dev, np,
|
||||
ab8500_ext_regulator_match,
|
||||
ARRAY_SIZE(ab8500_ext_regulator_match));
|
||||
if (err < 0) {
|
||||
dev_err(&pdev->dev,
|
||||
"Error parsing regulator init data: %d\n", err);
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (!ab8500) {
|
||||
dev_err(&pdev->dev, "null mfd parent\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ppdata = dev_get_platdata(ab8500->dev);
|
||||
if (!ppdata) {
|
||||
dev_err(&pdev->dev, "null parent pdata\n");
|
||||
@@ -362,8 +406,11 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
|
||||
pdata->ext_regulator[i].driver_data;
|
||||
|
||||
config.dev = &pdev->dev;
|
||||
config.init_data = &pdata->ext_regulator[i];
|
||||
config.driver_data = info;
|
||||
config.of_node = ab8500_ext_regulator_match[i].of_node;
|
||||
config.init_data = (np) ?
|
||||
ab8500_ext_regulator_match[i].init_data :
|
||||
&pdata->ext_regulator[i];
|
||||
|
||||
/* register regulator with framework */
|
||||
info->rdev = regulator_register(&info->desc, &config);
|
||||
@@ -386,7 +433,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ab8500_ext_regulator_exit(struct platform_device *pdev)
|
||||
static int ab8500_ext_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -399,8 +446,37 @@ void ab8500_ext_regulator_exit(struct platform_device *pdev)
|
||||
|
||||
regulator_unregister(info->rdev);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver ab8500_ext_regulator_driver = {
|
||||
.probe = ab8500_ext_regulator_probe,
|
||||
.remove = ab8500_ext_regulator_remove,
|
||||
.driver = {
|
||||
.name = "ab8500-ext-regulator",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init ab8500_ext_regulator_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = platform_driver_register(&ab8500_ext_regulator_driver);
|
||||
if (ret)
|
||||
pr_err("Failed to register ab8500 ext regulator: %d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
subsys_initcall(ab8500_ext_regulator_init);
|
||||
|
||||
static void __exit ab8500_ext_regulator_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&ab8500_ext_regulator_driver);
|
||||
}
|
||||
module_exit(ab8500_ext_regulator_exit);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_AUTHOR("Bengt Jonsson <bengt.g.jonsson@stericsson.com>");
|
||||
MODULE_DESCRIPTION("AB8500 external regulator driver");
|
||||
|
||||
@@ -719,6 +719,7 @@ static struct ab8500_regulator_info
|
||||
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
|
||||
.volt_table = ldo_vauxn_voltages,
|
||||
.enable_time = 200,
|
||||
.supply_name = "vin",
|
||||
},
|
||||
.load_lp_uA = 5000,
|
||||
.update_bank = 0x04,
|
||||
@@ -741,6 +742,7 @@ static struct ab8500_regulator_info
|
||||
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
|
||||
.volt_table = ldo_vauxn_voltages,
|
||||
.enable_time = 200,
|
||||
.supply_name = "vin",
|
||||
},
|
||||
.load_lp_uA = 5000,
|
||||
.update_bank = 0x04,
|
||||
@@ -763,6 +765,7 @@ static struct ab8500_regulator_info
|
||||
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
|
||||
.volt_table = ldo_vaux3_voltages,
|
||||
.enable_time = 450,
|
||||
.supply_name = "vin",
|
||||
},
|
||||
.load_lp_uA = 5000,
|
||||
.update_bank = 0x04,
|
||||
@@ -3156,22 +3159,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (!is_ab8505(ab8500)) {
|
||||
/* register external regulators (before Vaux1, 2 and 3) */
|
||||
err = ab8500_ext_regulator_init(pdev);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
/* register all regulators */
|
||||
for (i = 0; i < abx500_regulator.info_size; i++) {
|
||||
err = ab8500_regulator_register(pdev, &pdata->regulator[i],
|
||||
i, NULL);
|
||||
if (err < 0) {
|
||||
if (!is_ab8505(ab8500))
|
||||
ab8500_ext_regulator_exit(pdev);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -3180,7 +3173,6 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
|
||||
static int ab8500_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
int i, err;
|
||||
struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
|
||||
|
||||
for (i = 0; i < abx500_regulator.info_size; i++) {
|
||||
struct ab8500_regulator_info *info = NULL;
|
||||
@@ -3192,10 +3184,6 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
|
||||
regulator_unregister(info->regulator);
|
||||
}
|
||||
|
||||
/* remove external regulators (after Vaux1, 2 and 3) */
|
||||
if (!is_ab8505(ab8500))
|
||||
ab8500_ext_regulator_exit(pdev);
|
||||
|
||||
/* remove regulator debug */
|
||||
err = ab8500_regulator_debug_exit(pdev);
|
||||
if (err)
|
||||
|
||||
@@ -2137,6 +2137,21 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(regulator_list_voltage);
|
||||
|
||||
/**
|
||||
* regulator_get_linear_step - return the voltage step size between VSEL values
|
||||
* @regulator: regulator source
|
||||
*
|
||||
* Returns the voltage step size between VSEL values for linear
|
||||
* regulators, or return 0 if the regulator isn't a linear regulator.
|
||||
*/
|
||||
unsigned int regulator_get_linear_step(struct regulator *regulator)
|
||||
{
|
||||
struct regulator_dev *rdev = regulator->rdev;
|
||||
|
||||
return rdev->desc->uV_step;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(regulator_get_linear_step);
|
||||
|
||||
/**
|
||||
* regulator_is_supported_voltage - check if a voltage range can be supported
|
||||
*
|
||||
|
||||
@@ -130,7 +130,7 @@ static int isl6271a_probe(struct i2c_client *i2c,
|
||||
if (i == 0)
|
||||
config.init_data = init_data;
|
||||
else
|
||||
config.init_data = 0;
|
||||
config.init_data = NULL;
|
||||
config.driver_data = pmic;
|
||||
|
||||
pmic->rdev[i] = regulator_register(&isl_rd[i], &config);
|
||||
|
||||
@@ -434,7 +434,7 @@ static int lp3971_i2c_probe(struct i2c_client *i2c,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
lp3971 = kzalloc(sizeof(struct lp3971), GFP_KERNEL);
|
||||
lp3971 = devm_kzalloc(&i2c->dev, sizeof(struct lp3971), GFP_KERNEL);
|
||||
if (lp3971 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -449,19 +449,15 @@ static int lp3971_i2c_probe(struct i2c_client *i2c,
|
||||
ret = -ENODEV;
|
||||
if (ret < 0) {
|
||||
dev_err(&i2c->dev, "failed to detect device\n");
|
||||
goto err_detect;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = setup_regulators(lp3971, pdata);
|
||||
if (ret < 0)
|
||||
goto err_detect;
|
||||
return ret;
|
||||
|
||||
i2c_set_clientdata(i2c, lp3971);
|
||||
return 0;
|
||||
|
||||
err_detect:
|
||||
kfree(lp3971);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int lp3971_i2c_remove(struct i2c_client *i2c)
|
||||
@@ -473,7 +469,6 @@ static int lp3971_i2c_remove(struct i2c_client *i2c)
|
||||
regulator_unregister(lp3971->rdev[i]);
|
||||
|
||||
kfree(lp3971->rdev);
|
||||
kfree(lp3971);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -528,7 +528,7 @@ static int lp3972_i2c_probe(struct i2c_client *i2c,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
lp3972 = kzalloc(sizeof(struct lp3972), GFP_KERNEL);
|
||||
lp3972 = devm_kzalloc(&i2c->dev, sizeof(struct lp3972), GFP_KERNEL);
|
||||
if (!lp3972)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -546,19 +546,15 @@ static int lp3972_i2c_probe(struct i2c_client *i2c,
|
||||
}
|
||||
if (ret < 0) {
|
||||
dev_err(&i2c->dev, "failed to detect device. ret = %d\n", ret);
|
||||
goto err_detect;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = setup_regulators(lp3972, pdata);
|
||||
if (ret < 0)
|
||||
goto err_detect;
|
||||
return ret;
|
||||
|
||||
i2c_set_clientdata(i2c, lp3972);
|
||||
return 0;
|
||||
|
||||
err_detect:
|
||||
kfree(lp3972);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int lp3972_i2c_remove(struct i2c_client *i2c)
|
||||
@@ -569,7 +565,6 @@ static int lp3972_i2c_remove(struct i2c_client *i2c)
|
||||
for (i = 0; i < lp3972->num_regulators; i++)
|
||||
regulator_unregister(lp3972->rdev[i]);
|
||||
kfree(lp3972->rdev);
|
||||
kfree(lp3972);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
+114
-2
@@ -18,6 +18,9 @@
|
||||
#include <linux/regulator/lp872x.h>
|
||||
#include <linux/regulator/driver.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/regulator/of_regulator.h>
|
||||
|
||||
/* Registers : LP8720/8725 shared */
|
||||
#define LP872X_GENERAL_CFG 0x00
|
||||
@@ -723,8 +726,8 @@ static int lp872x_init_dvs(struct lp872x *lp)
|
||||
|
||||
gpio = dvs->gpio;
|
||||
if (!gpio_is_valid(gpio)) {
|
||||
dev_err(lp->dev, "invalid gpio: %d\n", gpio);
|
||||
return -EINVAL;
|
||||
dev_warn(lp->dev, "invalid gpio: %d\n", gpio);
|
||||
goto set_default_dvs_mode;
|
||||
}
|
||||
|
||||
pinstate = dvs->init_state;
|
||||
@@ -829,6 +832,103 @@ static const struct regmap_config lp872x_regmap_config = {
|
||||
.max_register = MAX_REGISTERS,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
|
||||
#define LP872X_VALID_OPMODE (REGULATOR_MODE_FAST | REGULATOR_MODE_NORMAL)
|
||||
|
||||
static struct of_regulator_match lp8720_matches[] = {
|
||||
{ .name = "ldo1", .driver_data = (void *)LP8720_ID_LDO1, },
|
||||
{ .name = "ldo2", .driver_data = (void *)LP8720_ID_LDO2, },
|
||||
{ .name = "ldo3", .driver_data = (void *)LP8720_ID_LDO3, },
|
||||
{ .name = "ldo4", .driver_data = (void *)LP8720_ID_LDO4, },
|
||||
{ .name = "ldo5", .driver_data = (void *)LP8720_ID_LDO5, },
|
||||
{ .name = "buck", .driver_data = (void *)LP8720_ID_BUCK, },
|
||||
};
|
||||
|
||||
static struct of_regulator_match lp8725_matches[] = {
|
||||
{ .name = "ldo1", .driver_data = (void *)LP8725_ID_LDO1, },
|
||||
{ .name = "ldo2", .driver_data = (void *)LP8725_ID_LDO2, },
|
||||
{ .name = "ldo3", .driver_data = (void *)LP8725_ID_LDO3, },
|
||||
{ .name = "ldo4", .driver_data = (void *)LP8725_ID_LDO4, },
|
||||
{ .name = "ldo5", .driver_data = (void *)LP8725_ID_LDO5, },
|
||||
{ .name = "lilo1", .driver_data = (void *)LP8725_ID_LILO1, },
|
||||
{ .name = "lilo2", .driver_data = (void *)LP8725_ID_LILO2, },
|
||||
{ .name = "buck1", .driver_data = (void *)LP8725_ID_BUCK1, },
|
||||
{ .name = "buck2", .driver_data = (void *)LP8725_ID_BUCK2, },
|
||||
};
|
||||
|
||||
static struct lp872x_platform_data
|
||||
*lp872x_populate_pdata_from_dt(struct device *dev, enum lp872x_id which)
|
||||
{
|
||||
struct device_node *np = dev->of_node;
|
||||
struct lp872x_platform_data *pdata;
|
||||
struct of_regulator_match *match;
|
||||
struct regulator_init_data *d;
|
||||
int num_matches;
|
||||
int count;
|
||||
int i;
|
||||
u8 dvs_state;
|
||||
|
||||
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
|
||||
if (!pdata)
|
||||
goto out;
|
||||
|
||||
of_property_read_u8(np, "ti,general-config", &pdata->general_config);
|
||||
if (of_find_property(np, "ti,update-config", NULL))
|
||||
pdata->update_config = true;
|
||||
|
||||
pdata->dvs = devm_kzalloc(dev, sizeof(struct lp872x_dvs), GFP_KERNEL);
|
||||
if (!pdata->dvs)
|
||||
goto out;
|
||||
|
||||
pdata->dvs->gpio = of_get_named_gpio(np, "ti,dvs-gpio", 0);
|
||||
of_property_read_u8(np, "ti,dvs-vsel", (u8 *)&pdata->dvs->vsel);
|
||||
of_property_read_u8(np, "ti,dvs-state", &dvs_state);
|
||||
pdata->dvs->init_state = dvs_state ? DVS_HIGH : DVS_LOW;
|
||||
|
||||
if (of_get_child_count(np) == 0)
|
||||
goto out;
|
||||
|
||||
switch (which) {
|
||||
case LP8720:
|
||||
match = lp8720_matches;
|
||||
num_matches = ARRAY_SIZE(lp8720_matches);
|
||||
break;
|
||||
case LP8725:
|
||||
match = lp8725_matches;
|
||||
num_matches = ARRAY_SIZE(lp8725_matches);
|
||||
break;
|
||||
default:
|
||||
goto out;
|
||||
}
|
||||
|
||||
count = of_regulator_match(dev, np, match, num_matches);
|
||||
if (count <= 0)
|
||||
goto out;
|
||||
|
||||
for (i = 0; i < num_matches; i++) {
|
||||
pdata->regulator_data[i].id = (int)match[i].driver_data;
|
||||
pdata->regulator_data[i].init_data = match[i].init_data;
|
||||
|
||||
/* Operation mode configuration for buck/buck1/buck2 */
|
||||
if (strncmp(match[i].name, "buck", 4))
|
||||
continue;
|
||||
|
||||
d = pdata->regulator_data[i].init_data;
|
||||
d->constraints.valid_modes_mask |= LP872X_VALID_OPMODE;
|
||||
d->constraints.valid_ops_mask |= REGULATOR_CHANGE_MODE;
|
||||
}
|
||||
out:
|
||||
return pdata;
|
||||
}
|
||||
#else
|
||||
static struct lp872x_platform_data
|
||||
*lp872x_populate_pdata_from_dt(struct device *dev, enum lp872x_id which)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
|
||||
{
|
||||
struct lp872x *lp;
|
||||
@@ -838,6 +938,10 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
|
||||
[LP8725] = LP8725_NUM_REGULATORS,
|
||||
};
|
||||
|
||||
if (cl->dev.of_node)
|
||||
cl->dev.platform_data = lp872x_populate_pdata_from_dt(&cl->dev,
|
||||
(enum lp872x_id)id->driver_data);
|
||||
|
||||
lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);
|
||||
if (!lp)
|
||||
goto err_mem;
|
||||
@@ -882,6 +986,13 @@ static int lp872x_remove(struct i2c_client *cl)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id lp872x_dt_ids[] = {
|
||||
{ .compatible = "ti,lp8720", },
|
||||
{ .compatible = "ti,lp8725", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, lp872x_dt_ids);
|
||||
|
||||
static const struct i2c_device_id lp872x_ids[] = {
|
||||
{"lp8720", LP8720},
|
||||
{"lp8725", LP8725},
|
||||
@@ -893,6 +1004,7 @@ static struct i2c_driver lp872x_driver = {
|
||||
.driver = {
|
||||
.name = "lp872x",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = of_match_ptr(lp872x_dt_ids),
|
||||
},
|
||||
.probe = lp872x_probe,
|
||||
.remove = lp872x_remove,
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/regulator/driver.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
@@ -533,7 +533,6 @@ static int lp8788_buck_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct lp8788_buck *buck = platform_get_drvdata(pdev);
|
||||
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
regulator_unregister(buck->regulator);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -561,7 +561,6 @@ static int lp8788_dldo_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
|
||||
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
regulator_unregister(ldo->regulator);
|
||||
|
||||
return 0;
|
||||
@@ -622,7 +621,6 @@ static int lp8788_aldo_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct lp8788_ldo *ldo = platform_get_drvdata(pdev);
|
||||
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
regulator_unregister(ldo->regulator);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/bug.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user