* [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2
@ 2015-01-15 8:41 Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 1/3] ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node Krzysztof Kozlowski
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2015-01-15 8:41 UTC (permalink / raw)
To: Kukjin Kim, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel
Cc: Krzysztof Kozlowski
Hi Kukjin,
I grouped into one patchset already posted patches for Trats2 board:
1. Fuel gauge:
https://lkml.org/lkml/2015/1/7/167
2. Suspend configuration for max77686 regulators:
https://lkml.org/lkml/2014/10/29/262
3. GPIO control for max77686 regulators:
https://lkml.org/lkml/2015/1/5/230
The necessary changes in max77686 regulator driver were already
applied by Mark Brown.
Best regards,
Krzysztof
Krzysztof Kozlowski (3):
ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node
ARM: dts: exynos4412-trats2: Add suspend configuration for max77686
regulators
ARM: dts: exynos4412-trats: Switch max77686 regulators to GPIO control
arch/arm/boot/dts/exynos4412-trats2.dts | 115 ++++++++++++++++++--------------
1 file changed, 65 insertions(+), 50 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node
2015-01-15 8:41 [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Krzysztof Kozlowski
@ 2015-01-15 8:41 ` Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 2/3] ARM: dts: exynos4412-trats2: Add suspend configuration for max77686 regulators Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2015-01-15 8:41 UTC (permalink / raw)
To: Kukjin Kim, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel
Cc: Krzysztof Kozlowski
Add node for fuel gauge present in Maxim 77693 PMIC. This allows control
over battery charging state on Trats2 board.
The fuel gauge is compatible with max17042 battery driver (Maxim
17042/17047/17050). Although datasheet rev 2.2 for MAX77693 describes
fuel gauge as Maxim 17042-like, the chip on Trats2 board identifies
itself as Maxim 17047-like.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
arch/arm/boot/dts/exynos4412-trats2.dts | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 29231b452643..595ad4ba6977 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -15,6 +15,7 @@
/dts-v1/;
#include "exynos4412.dtsi"
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
/ {
model = "Samsung Trats 2 based on Exynos4412";
@@ -24,6 +25,7 @@
i2c9 = &i2c_ak8975;
i2c10 = &i2c_cm36651;
i2c11 = &i2c_max77693;
+ i2c12 = &i2c_max77693_fuel;
};
memory {
@@ -552,6 +554,22 @@
};
};
+ i2c_max77693_fuel: i2c-gpio-3 {
+ compatible = "i2c-gpio";
+ gpios = <&gpf1 5 GPIO_ACTIVE_HIGH>, <&gpf1 4 GPIO_ACTIVE_HIGH>;
+ i2c-gpio,delay-us = <2>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+
+ max77693-fuel-gauge@36 {
+ compatible = "maxim,max17047";
+ interrupt-parent = <&gpx2>;
+ interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+ reg = <0x36>;
+ };
+ };
+
mmc@12550000 {
num-slots = <1>;
broken-cd;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: dts: exynos4412-trats2: Add suspend configuration for max77686 regulators
2015-01-15 8:41 [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 1/3] ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node Krzysztof Kozlowski
@ 2015-01-15 8:41 ` Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 3/3] ARM: dts: exynos4412-trats2: Switch max77686 regulators to GPIO control Krzysztof Kozlowski
2015-02-03 3:26 ` [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Kukjin Kim
3 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2015-01-15 8:41 UTC (permalink / raw)
To: Kukjin Kim, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel
Cc: Krzysztof Kozlowski
Add suspend to RAM configuration for max77686 regulators. Some LDOs and
bucks are disabled. This reduces energy consumption during S2R,
approximately from 17 mA to 9 mA.
Additionally remove old and not supported bindings:
- regulator-mem-off
- regulator-mem-idle
- regulator-mem-on
The max77686 driver does not parse them and they are not documented
anywere.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
---
Previously this was part of [1] patchset. There were no changes in this
patch since last version (v6) of that patchset.
[1] https://lkml.org/lkml/2014/10/29/261
---
arch/arm/boot/dts/exynos4412-trats2.dts | 72 +++++++++++++++++++--------------
1 file changed, 42 insertions(+), 30 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 595ad4ba6977..ef05139506e6 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -227,7 +227,6 @@
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
- regulator-mem-on;
};
ldo2_reg: ldo2 {
@@ -236,7 +235,9 @@
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
- regulator-mem-on;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
};
ldo3_reg: ldo3 {
@@ -245,7 +246,6 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
- regulator-mem-on;
};
ldo4_reg: ldo4 {
@@ -254,7 +254,6 @@
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
regulator-always-on;
- regulator-mem-on;
};
ldo5_reg: ldo5 {
@@ -263,7 +262,6 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
- regulator-mem-on;
};
ldo6_reg: ldo6 {
@@ -272,7 +270,9 @@
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
- regulator-mem-on;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
};
ldo7_reg: ldo7 {
@@ -281,7 +281,9 @@
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
- regulator-mem-on;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
};
ldo8_reg: ldo8 {
@@ -289,7 +291,9 @@
regulator-name = "VMIPI_1.0V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
ldo9_reg: ldo9 {
@@ -297,7 +301,6 @@
regulator-name = "CAM_ISP_MIPI_1.2V";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
- regulator-mem-idle;
};
ldo10_reg: ldo10 {
@@ -305,7 +308,9 @@
regulator-name = "VMIPI_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
ldo11_reg: ldo11 {
@@ -314,7 +319,9 @@
regulator-min-microvolt = <1950000>;
regulator-max-microvolt = <1950000>;
regulator-always-on;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
ldo12_reg: ldo12 {
@@ -322,7 +329,9 @@
regulator-name = "VUOTG_3.0V";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
ldo13_reg: ldo13 {
@@ -330,7 +339,6 @@
regulator-name = "NFC_AVDD_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-idle;
};
ldo14_reg: ldo14 {
@@ -339,7 +347,9 @@
regulator-min-microvolt = <1950000>;
regulator-max-microvolt = <1950000>;
regulator-always-on;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
ldo15_reg: ldo15 {
@@ -347,7 +357,9 @@
regulator-name = "VHSIC_1.0V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
};
ldo16_reg: ldo16 {
@@ -355,7 +367,9 @@
regulator-name = "VHSIC_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
};
ldo17_reg: ldo17 {
@@ -363,7 +377,6 @@
regulator-name = "CAM_SENSOR_CORE_1.2V";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
- regulator-mem-idle;
};
ldo18_reg: ldo18 {
@@ -371,7 +384,6 @@
regulator-name = "CAM_ISP_SEN_IO_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-idle;
};
ldo19_reg: ldo19 {
@@ -379,7 +391,6 @@
regulator-name = "VT_CAM_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-idle;
};
ldo20_reg: ldo20 {
@@ -387,7 +398,6 @@
regulator-name = "VDDQ_PRE_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-idle;
};
ldo21_reg: ldo21 {
@@ -395,7 +405,6 @@
regulator-name = "VTF_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
- regulator-mem-idle;
};
ldo22_reg: ldo22 {
@@ -410,7 +419,6 @@
regulator-name = "TSP_AVDD_3.3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- regulator-mem-idle;
};
ldo24_reg: ldo24 {
@@ -418,7 +426,6 @@
regulator-name = "TSP_VDD_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- regulator-mem-idle;
};
ldo25_reg: ldo25 {
@@ -426,7 +433,6 @@
regulator-name = "LCD_VCC_3.3V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
- regulator-mem-idle;
};
ldo26_reg: ldo26 {
@@ -434,7 +440,6 @@
regulator-name = "MOTOR_VCC_3.0V";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
- regulator-mem-idle;
};
buck1_reg: buck1 {
@@ -444,7 +449,9 @@
regulator-max-microvolt = <1100000>;
regulator-always-on;
regulator-boot-on;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
buck2_reg: buck2 {
@@ -454,7 +461,9 @@
regulator-max-microvolt = <1500000>;
regulator-always-on;
regulator-boot-on;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
};
buck3_reg: buck3 {
@@ -464,7 +473,9 @@
regulator-max-microvolt = <1150000>;
regulator-always-on;
regulator-boot-on;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
buck4_reg: buck4 {
@@ -473,7 +484,9 @@
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1150000>;
regulator-boot-on;
- regulator-mem-off;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
buck5_reg: buck5 {
@@ -512,7 +525,6 @@
regulator-name = "CAM_ISP_CORE_1.2V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1200000>;
- regulator-mem-off;
};
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: dts: exynos4412-trats2: Switch max77686 regulators to GPIO control
2015-01-15 8:41 [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 1/3] ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 2/3] ARM: dts: exynos4412-trats2: Add suspend configuration for max77686 regulators Krzysztof Kozlowski
@ 2015-01-15 8:41 ` Krzysztof Kozlowski
2015-02-03 3:26 ` [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Kukjin Kim
3 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Kozlowski @ 2015-01-15 8:41 UTC (permalink / raw)
To: Kukjin Kim, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel
Cc: Krzysztof Kozlowski
Remove fixed regulators (duplicating what max77686 provides) and
add GPIO enable control to max77686 regulators.
This gives the system full control over those regulators. Previously
the state of such regulators was a mixture of what max77686 driver set
over I2C and what regulator-fixed set through GPIO.
Removal of 'regulator-always-on' from CAM_ISP_CORE_1.2V (buck9) allows
disabling it when it is not used. Previously this regulator was always
enabled because its enable state is a OR of:
- ENB9 GPIO (turned always on by regulator-fixed),
- BUCK9EN field in BUCK9CTRL register (off by max77686 through I2C).
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
arch/arm/boot/dts/exynos4412-trats2.dts | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index ef05139506e6..8611c07c2e41 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -58,15 +58,6 @@
#address-cells = <1>;
#size-cells = <0>;
- vemmc_reg: regulator-0 {
- compatible = "regulator-fixed";
- regulator-name = "VMEM_VDD_2.8V";
- regulator-min-microvolt = <2800000>;
- regulator-max-microvolt = <2800000>;
- gpio = <&gpk0 2 0>;
- enable-active-high;
- };
-
cam_io_reg: voltage-regulator-1 {
compatible = "regulator-fixed";
regulator-name = "CAM_SENSOR_A";
@@ -94,16 +85,6 @@
enable-active-high;
};
- cam_isp_core_reg: voltage-regulator-4 {
- compatible = "regulator-fixed";
- regulator-name = "CAM_ISP_CORE_1.2V_EN";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- gpio = <&gpm0 3 0>;
- enable-active-high;
- regulator-always-on;
- };
-
ps_als_reg: voltage-regulator-5 {
compatible = "regulator-fixed";
regulator-name = "LED_A_3.0V";
@@ -405,6 +386,7 @@
regulator-name = "VTF_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
+ maxim,ena-gpios = <&gpy2 0 GPIO_ACTIVE_HIGH>;
};
ldo22_reg: ldo22 {
@@ -412,6 +394,7 @@
regulator-name = "VMEM_VDD_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
+ maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
};
ldo23_reg: ldo23 {
@@ -518,6 +501,7 @@
regulator-name = "VMEM_VDDF_3.0V";
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
+ maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
};
buck9_reg: buck9 {
@@ -525,6 +509,7 @@
regulator-name = "CAM_ISP_CORE_1.2V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1200000>;
+ maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>;
};
};
};
@@ -587,7 +572,7 @@
broken-cd;
non-removable;
card-detect-delay = <200>;
- vmmc-supply = <&vemmc_reg>;
+ vmmc-supply = <&ldo22_reg>;
clock-frequency = <400000000>;
samsung,dw-mshc-ciu-div = <0>;
samsung,dw-mshc-sdr-timing = <2 3>;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2
2015-01-15 8:41 [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Krzysztof Kozlowski
` (2 preceding siblings ...)
2015-01-15 8:41 ` [PATCH 3/3] ARM: dts: exynos4412-trats2: Switch max77686 regulators to GPIO control Krzysztof Kozlowski
@ 2015-02-03 3:26 ` Kukjin Kim
3 siblings, 0 replies; 5+ messages in thread
From: Kukjin Kim @ 2015-02-03 3:26 UTC (permalink / raw)
To: 'Krzysztof Kozlowski', 'Kukjin Kim', devicetree,
linux-arm-kernel, linux-samsung-soc, linux-kernel
Krzysztof Kozlowski wrote:
>
> Hi Kukjin,
>
Hi,
>
> I grouped into one patchset already posted patches for Trats2 board:
> 1. Fuel gauge:
> https://lkml.org/lkml/2015/1/7/167
> 2. Suspend configuration for max77686 regulators:
> https://lkml.org/lkml/2014/10/29/262
> 3. GPIO control for max77686 regulators:
> https://lkml.org/lkml/2015/1/5/230
>
>
> The necessary changes in max77686 regulator driver were already
> applied by Mark Brown.
>
Sounds good.
> Best regards,
> Krzysztof
>
>
> Krzysztof Kozlowski (3):
> ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node
> ARM: dts: exynos4412-trats2: Add suspend configuration for max77686
> regulators
> ARM: dts: exynos4412-trats: Switch max77686 regulators to GPIO control
>
> arch/arm/boot/dts/exynos4412-trats2.dts | 115 ++++++++++++++++++--------------
> 1 file changed, 65 insertions(+), 50 deletions(-)
>
> --
OK, looks good to me, applied this series.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-03 3:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-15 8:41 [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 1/3] ARM: dts: exynos4412-trats2: Add Maxim 77693 fuel gauge node Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 2/3] ARM: dts: exynos4412-trats2: Add suspend configuration for max77686 regulators Krzysztof Kozlowski
2015-01-15 8:41 ` [PATCH 3/3] ARM: dts: exynos4412-trats2: Switch max77686 regulators to GPIO control Krzysztof Kozlowski
2015-02-03 3:26 ` [PATCH 0/3] ARM: dts: Regulator changes and fuel gauge for exynos4412-trats2 Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).