mfd: rohm-bd71828: Add power off
Subsystems (3)
v3 cover mfd: rohm-bd71828: Add power off
Add power off functionality. Marked as RFC because of magic numbers without a good source and strange delays. The only information source is a vendor kernel.
Changes in v3:
- define for poweroff bit
- rmw operation to set only that bit
Changes in v2:
- style corrections
- remove unnecessary writes and delays
- correctly unregister handler
Andreas Kemnade (2):
dt-bindings: mfd: Add ROHM BD71828 system-power-controller property
mfd: rohm-bd71828: Add power off functionality
.../bindings/mfd/rohm,bd71828-pmic.yaml | 2 ++ drivers/mfd/rohm-bd71828.c | 36 ++++++++++++++++++- include/linux/mfd/rohm-bd71828.h | 3 ++ 3 files changed, 40 insertions(+), 1 deletion(-)
Signature · 1 line
2.39.2
PATCH v3 1/2 dt-bindings: mfd: Add ROHM BD71828 system-power-controller property
As the PMIC can power off the system, add the corresponding property.
--- Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml +2 -0
@@ -73,6 +73,8 @@ properties: used to mark the pins which should not be configured for GPIO. Please see the ../gpio/gpio.txt for more information. + system-power-controller: true + required: - compatible - reg
Signature · 1 line
2.39.2
Re: [PATCH v3 1/2] dt-bindings: mfd: Add ROHM BD71828 system-power-controller property
Quoted 4 lines · Andreas Kemnade
As the PMIC can power off the system, add the corresponding property.
Signed-off-by Andreas Kemnade <[email protected]>
FWIW
Quoted 17 lines
--- Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml +2
-0@@ -73,6 +73,8 @@ properties: used to mark the pins which should not be configured for GPIO. Please see the ../gpio/gpio.txt for more information. + system-power-controller: true + required: - compatible - reg
Signature · 5 lines
Matti Vaittinen Linux kernel developer at ROHM Semiconductors Oulu Finland ~~ When things go utterly wrong vim users can always type :help! ~~
PATCH v3 2/2 mfd: rohm-bd71828: Add power off functionality
In reply to Andreas KemnadeSince the chip can power off the system, add the corresponding
functionality.
Based on https://github.com/kobolabs/Kobo-Reader/raw/master/hw/imx6sll-clara2e/kernel.tar.bz2
--- drivers/mfd/rohm-bd71828.c | 36 +++++++++++++++++++++++++++++++- include/linux/mfd/rohm-bd71828.h | 3 +++ 2 files changed, 38 insertions(+), 1 deletion(-)
drivers/mfd/rohm-bd71828.c +35 -1
@@ -464,6 +464,27 @@ static int set_clk_mode(struct device *dev, struct regmap *regmap, OUT32K_MODE_CMOS); } +static struct i2c_client *bd71828_dev; +static void bd71828_power_off (void ) +{ +while (true) { +s32 val; + +/* We are not allowed to sleep, so do not use regmap involving mutexes here. */ + val =i2c_smbus_read_byte_data (bd71828_dev,BD71828_REG_PS_CTRL_1 ); +if (val >=0 ) +i2c_smbus_write_byte_data (bd71828_dev, +BD71828_REG_PS_CTRL_1 , +BD71828_MASK_STATE_HBNT | (u8 )val); +mdelay (500 ); + } +} + +static void bd71828_remove_poweroff (void *data) +{ + pm_power_off =NULL ; +} +static int bd71828_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *irq_data;
@@ -542,7 +563,20 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , mfd, cells,NULL ,0 ,regmap_irq_get_domain (irq_data));if (ret) -dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); +return dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); + +if (of_device_is_system_power_controller (i2c->dev.of_node) && + chip_type ==ROHM_CHIP_TYPE_BD71828 ) { +if (!pm_power_off) { + bd71828_dev = i2c; + pm_power_off = bd71828_power_off; + ret =devm_add_action_or_reset (&i2c->dev, + bd71828_remove_poweroff, +NULL ); + }else { +dev_warn (&i2c->dev,"Poweroff callback already assigned\n" ); + } + }return ret; }
include/linux/mfd/rohm-bd71828.h +3 -0
@@ -4,6 +4,7 @@#ifndef __LINUX_MFD_BD71828_H__#define __LINUX_MFD_BD71828_H__ +#include <linux/bits.h> #include <linux/mfd/rohm-generic.h> #include <linux/mfd/rohm-shared.h>
@@ -41,6 +42,8 @@ enum {#define BD71828_REG_PS_CTRL_2 0x05#define BD71828_REG_PS_CTRL_3 0x06 +#define BD71828_MASK_STATE_HBNT BIT(1) +//#define BD71828_REG_SWRESET 0x06 #define BD71828_MASK_RUN_LVL_CTRL 0x30
Signature · 1 line
2.39.2
Lee Jones
maintainerRe: [PATCH v3 2/2] mfd: rohm-bd71828: Add power off functionality
Quoted 78 lines · Andreas Kemnade
Since the chip can power off the system, add the corresponding
functionality.
Based on https://github.com/kobolabs/Kobo-Reader/raw/master/hw/imx6sll-clara2e/kernel.tar.bz2Signed-off-by Andreas Kemnade <[email protected]>Acked-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd71828.c | 36 +++++++++++++++++++++++++++++++- include/linux/mfd/rohm-bd71828.h | 3 +++ 2 files changed, 38 insertions(+), 1 deletion(-)drivers/mfd/rohm-bd71828.c +35
-1@@ -464,6 +464,27 @@ static int set_clk_mode(struct device *dev, struct regmap *regmap, OUT32K_MODE_CMOS); } +static struct i2c_client *bd71828_dev; +static void bd71828_power_off (void ) +{ +while (true) { +s32 val; + +/* We are not allowed to sleep, so do not use regmap involving mutexes here. */ + val =i2c_smbus_read_byte_data (bd71828_dev,BD71828_REG_PS_CTRL_1 ); +if (val >=0 ) +i2c_smbus_write_byte_data (bd71828_dev, +BD71828_REG_PS_CTRL_1 , +BD71828_MASK_STATE_HBNT | (u8 )val); +mdelay (500 ); + } +} + +static void bd71828_remove_poweroff (void *data) +{ + pm_power_off =NULL ; +} +static int bd71828_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *irq_data;@@ -542,7 +563,20 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , mfd, cells,NULL ,0 ,regmap_irq_get_domain (irq_data));if (ret) -dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); +return dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); + +if (of_device_is_system_power_controller (i2c->dev.of_node) && + chip_type ==ROHM_CHIP_TYPE_BD71828 ) { +if (!pm_power_off) { + bd71828_dev = i2c; + pm_power_off = bd71828_power_off; + ret =devm_add_action_or_reset (&i2c->dev, + bd71828_remove_poweroff, +NULL ); + }else { +dev_warn (&i2c->dev,"Poweroff callback already assigned\n" ); + } + }return ret; }include/linux/mfd/rohm-bd71828.h +1
-0@@ -4,6 +4,7 @@#ifndef __LINUX_MFD_BD71828_H__#define __LINUX_MFD_BD71828_H__ +#include <linux/bits.h> #include <linux/mfd/rohm-generic.h> #include <linux/mfd/rohm-shared.h>
include/linux/mfd/rohm-bd71828.h enum { · line 47
Quoted 6 lines
include/linux/mfd/rohm-bd71828.h +2
-0@@ -41,6 +42,8 @@ enum {#define BD71828_REG_PS_CTRL_2 0x05#define BD71828_REG_PS_CTRL_3 0x06 +#define BD71828_MASK_STATE_HBNT BIT(1) +//#define BD71828_REG_SWRESET 0x06
How did this get in here?
Quoted 5 lines
include/linux/mfd/rohm-bd71828.h +0
-0#define BD71828_MASK_RUN_LVL_CTRL 0x30Signature · 1 line
2.39.2
Signature · 1 line
Lee Jones [李琼斯]
Matti Vaittinen
maintainerRe: [PATCH v3 2/2] mfd: rohm-bd71828: Add power off functionality
Quoted 83 lines · Lee Jones
Quoted 81 lines · Andreas Kemnade
Since the chip can power off the system, add the corresponding
functionality.
Based on https://github.com/kobolabs/Kobo-Reader/raw/master/hw/imx6sll-clara2e/kernel.tar.bz2Signed-off-by Andreas Kemnade <[email protected]>Acked-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd71828.c | 36 +++++++++++++++++++++++++++++++- include/linux/mfd/rohm-bd71828.h | 3 +++ 2 files changed, 38 insertions(+), 1 deletion(-)drivers/mfd/rohm-bd71828.c +35
-1@@ -464,6 +464,27 @@ static int set_clk_mode(struct device *dev, struct regmap *regmap, OUT32K_MODE_CMOS); } +static struct i2c_client *bd71828_dev; +static void bd71828_power_off (void ) +{ +while (true) { +s32 val; + +/* We are not allowed to sleep, so do not use regmap involving mutexes here. */ + val =i2c_smbus_read_byte_data (bd71828_dev,BD71828_REG_PS_CTRL_1 ); +if (val >=0 ) +i2c_smbus_write_byte_data (bd71828_dev, +BD71828_REG_PS_CTRL_1 , +BD71828_MASK_STATE_HBNT | (u8 )val); +mdelay (500 ); + } +} + +static void bd71828_remove_poweroff (void *data) +{ + pm_power_off =NULL ; +} +static int bd71828_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *irq_data;@@ -542,7 +563,20 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , mfd, cells,NULL ,0 ,regmap_irq_get_domain (irq_data));if (ret) -dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); +return dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); + +if (of_device_is_system_power_controller (i2c->dev.of_node) && + chip_type ==ROHM_CHIP_TYPE_BD71828 ) { +if (!pm_power_off) { + bd71828_dev = i2c; + pm_power_off = bd71828_power_off; + ret =devm_add_action_or_reset (&i2c->dev, + bd71828_remove_poweroff, +NULL ); + }else { +dev_warn (&i2c->dev,"Poweroff callback already assigned\n" ); + } + }return ret; }include/linux/mfd/rohm-bd71828.h +1
-0@@ -4,6 +4,7 @@#ifndef __LINUX_MFD_BD71828_H__#define __LINUX_MFD_BD71828_H__ +#include <linux/bits.h> #include <linux/mfd/rohm-generic.h> #include <linux/mfd/rohm-shared.h> @@ -41,6 +42,8 @@ enum {#define BD71828_REG_PS_CTRL_2 0x05#define BD71828_REG_PS_CTRL_3 0x06
Quoted 5 lines
include/linux/mfd/rohm-bd71828.h enum { · line 47
Quoted 3 lines
include/linux/mfd/rohm-bd71828.h +2
-0+#define BD71828_MASK_STATE_HBNT BIT(1) +//#define BD71828_REG_SWRESET 0x06 How did this get in here?
Don't blame me, blame git... Errm... :)
[mvaittin@fedora linux]$ git blame include/linux/mfd/rohm-bd71828.h |grep \/\/1c743ad523bb2 (Matti Vaittinen 2020-01-20 15:43:28 +0200 44) //#define BD71828_REG_SWRESET 0x061c743ad523bb2 (Matti Vaittinen 2020-01-20 15:43:28 +0200 136) //#define BD71828_REG_LDO6_VOLT 0x4
I can send a clean-up patch unless you want to do it while applying other stuff...
Yours,
Matti
Signature · 5 lines
Matti Vaittinen Linux kernel developer at ROHM Semiconductors Oulu Finland ~~ When things go utterly wrong vim users can always type :help! ~~
Lee Jones
maintainerRe: [PATCH v3 2/2] mfd: rohm-bd71828: Add power off functionality
Quoted 93 lines · Matti Vaittinen
Quoted 75 lines · Lee Jones
Quoted 73 lines · Andreas Kemnade
Since the chip can power off the system, add the corresponding
functionality.
Based on https://github.com/kobolabs/Kobo-Reader/raw/master/hw/imx6sll-clara2e/kernel.tar.bz2Signed-off-by Andreas Kemnade <[email protected]>Acked-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd71828.c | 36 +++++++++++++++++++++++++++++++- include/linux/mfd/rohm-bd71828.h | 3 +++ 2 files changed, 38 insertions(+), 1 deletion(-)drivers/mfd/rohm-bd71828.c +35
-1@@ -464,6 +464,27 @@ static int set_clk_mode(struct device *dev, struct regmap *regmap, OUT32K_MODE_CMOS); } +static struct i2c_client *bd71828_dev; +static void bd71828_power_off (void ) +{ +while (true) { +s32 val; + +/* We are not allowed to sleep, so do not use regmap involving mutexes here. */ + val =i2c_smbus_read_byte_data (bd71828_dev,BD71828_REG_PS_CTRL_1 ); +if (val >=0 ) +i2c_smbus_write_byte_data (bd71828_dev, +BD71828_REG_PS_CTRL_1 , +BD71828_MASK_STATE_HBNT | (u8 )val); +mdelay (500 ); + } +} + +static void bd71828_remove_poweroff (void *data) +{ + pm_power_off =NULL ; +} +static int bd71828_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *irq_data;@@ -542,7 +563,20 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , mfd, cells,NULL ,0 ,regmap_irq_get_domain (irq_data));if (ret) -dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); +return dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" ); + +if (of_device_is_system_power_controller (i2c->dev.of_node) && + chip_type ==ROHM_CHIP_TYPE_BD71828 ) { +if (!pm_power_off) { + bd71828_dev = i2c; + pm_power_off = bd71828_power_off; + ret =devm_add_action_or_reset (&i2c->dev, + bd71828_remove_poweroff, +NULL ); + }else { +dev_warn (&i2c->dev,"Poweroff callback already assigned\n" ); + } + }return ret; }include/linux/mfd/rohm-bd71828.h +1
-0@@ -4,6 +4,7 @@#ifndef __LINUX_MFD_BD71828_H__#define __LINUX_MFD_BD71828_H__ +#include <linux/bits.h> #include <linux/mfd/rohm-generic.h> #include <linux/mfd/rohm-shared.h> Quoted 8 lines
include/linux/mfd/rohm-bd71828.h enum { · line 46
Quoted 6 lines
include/linux/mfd/rohm-bd71828.h +2
-0@@ -41,6 +42,8 @@ enum {#define BD71828_REG_PS_CTRL_2 0x05#define BD71828_REG_PS_CTRL_3 0x06 +#define BD71828_MASK_STATE_HBNT BIT(1) +//#define BD71828_REG_SWRESET 0x06 How did this get in here?
Don't blame me, blame git... Errm... :)
[mvaittin@fedora linux]$ git blameinclude/linux/mfd/rohm-bd71828.h|grep \/\/1c743ad523bb2(Matti Vaittinen 2020-01-20 15:43:28 +0200 44) //#defineBD71828_REG_SWRESET0x061c743ad523bb2(Matti Vaittinen 2020-01-20 15:43:28 +0200 136) //#defineBD71828_REG_LDO6_VOLT0x4
Quoted 2 lines
I can send a clean-up patch unless you want to do it while applying other stuff...
Please submit a patch.
Signature · 1 line
Lee Jones [李琼斯]
Quoted 9 lines · Andreas Kemnade
Add power off functionality. Marked as RFC because of magic numbers without a good source and strange delays. The only information source is a vendor kernel.
Changes in v3:
- define for poweroff bit
- rmw operation to set only that bit[...]
Applied, thanks!
[1/2] dt-bindings: mfd: Add ROHM BD71828 system-power-controller property
commit: 6ed9be0f9a1481280429d24c60b7d20f3706e4dc
[2/2] mfd: rohm-bd71828: Add power off functionality
commit: d7ff3cc4d9cdc5880541bb2e04b1fa40307029f6--
Lee Jones [李琼斯]