Add system-power-controller property in the bindings and
the corresponding implementation and use it where
appropriate.
Not all cases are hit yet, there has probably to be a
separate series after going through with a brush.
Andreas Kemnade (6):
dt-bindings: mfd: ti,twl: Document system-power-controller
twl-core: add power off implementation for twl603x
ARM: dts: omap-embt2ws: system-power-controller for bt200
ARM: dts: omap4-panda-common: Enable powering off the device
mfd: twl4030-power: accept standard property for power controller
ARM: dts: omap: gta04: standardize system-power-controller
.../devicetree/bindings/mfd/ti,twl.yaml | 2 ++
arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi | 2 +-
.../boot/dts/ti/omap/omap4-epson-embt2ws.dts | 1 +
.../boot/dts/ti/omap/omap4-panda-common.dtsi | 1 +
drivers/mfd/twl-core.c | 34 +++++++++++++++++++
drivers/mfd/twl4030-power.c | 3 ++
include/linux/mfd/twl.h | 1 +
7 files changed, 43 insertions(+), 1 deletion(-)
--
2.39.2
If the system-power-controller property is there, enable power off.
Implementation is based on a Linux v3.0 vendor kernel.
Signed-off-by: Andreas Kemnade <[email protected]>
---
drivers/mfd/twl-core.c | 34 ++++++++++++++++++++++++++++++++++
include/linux/mfd/twl.h | 1 +
2 files changed, 35 insertions(+)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 6e384a79e3418..3eef285eac535 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -687,6 +687,31 @@ static void twl_remove(struct i2c_client *client)
twl_priv->ready = false;
}
+void twl6030_power_off(void)
+{
+#define APP_DEVOFF (1<<0)
+#define CON_DEVOFF (1<<1)
+#define MOD_DEVOFF (1<<2)
+
+ int err;
+ u8 val;
+
+ err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
+ TWL6030_PHOENIX_DEV_ON);
+ if (err) {
+ pr_err("I2C error %d reading PHOENIX_DEV_ON\n", err);
+ return;
+ }
+
+ val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
+
+ err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
+ TWL6030_PHOENIX_DEV_ON);
+ if (err)
+ pr_err("TWL6030 Unable to power off\n");
+}
+
+
static struct of_dev_auxdata twl_auxdata_lookup[] = {
OF_DEV_AUXDATA("ti,twl4030-gpio", 0, "twl4030-gpio", NULL),
{ /* sentinel */ },
@@ -852,6 +877,15 @@ twl_probe(struct i2c_client *client)
goto free;
}
+ if (twl_class_is_6030()) {
+ if (of_device_is_system_power_controller(client->dev.of_node)) {
+ if (!pm_power_off)
+ pm_power_off = twl6030_power_off;
+ else
+ dev_warn(&client->dev, "Poweroff callback already assigned\n");
+ }
+ }
+
status = of_platform_populate(node, NULL, twl_auxdata_lookup,
&client->dev);
diff --git a/include/linux/mfd/twl.h b/include/linux/mfd/twl.h
index c062d91a67d92..85dc406173dba 100644
--- a/include/linux/mfd/twl.h
+++ b/include/linux/mfd/twl.h
@@ -461,6 +461,7 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
#define TWL4030_PM_MASTER_GLOBAL_TST 0xb6
+#define TWL6030_PHOENIX_DEV_ON 0x06
/*----------------------------------------------------------------------*/
/* Power bus message definitions */
--
2.39.2
As the TWL6030 chip is the main power controller here, declare
it as system-power-controller
Signed-off-by: Andreas Kemnade <[email protected]>
---
arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi b/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
index f528511c2537b..97706d6296a68 100644
--- a/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap4-panda-common.dtsi
@@ -408,6 +408,7 @@ twl: twl@48 {
reg = <0x48>;
/* IRQ# = 7 */
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
+ system-power-controller;
};
twl6040: twl@4b {
--
2.39.2
Configure the TWL6032 as system power controller to let the device
power off.
Signed-off-by: Andreas Kemnade <[email protected]>
---
arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts b/arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
index 4e267b259ebf0..bb2e9544723c3 100644
--- a/arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
+++ b/arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
@@ -215,6 +215,7 @@ twl: pmic@48 {
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
interrupt-controller;
#interrupt-cells = <1>;
+ system-power-controller;
rtc {
compatible = "ti,twl4030-rtc";
--
2.39.2
Hi Andreas,
kernel test robot noticed the following build warnings:
[auto build test WARNING on robh/for-next]
[also build test WARNING on lee-mfd/for-mfd-next linus/master v6.7-rc2 next-20231124]
[cannot apply to tmlind-omap/for-next lee-mfd/for-mfd-fixes]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andreas-Kemnade/dt-bindings-mfd-ti-twl-Document-system-power-controller/20231125-173426
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20231125092938.16535-3-andreas%40kemnade.info
patch subject: [PATCH 2/6] twl-core: add power off implementation for twl603x
config: xtensa-randconfig-r081-20231125 (https://download.01.org/0day-ci/archive/20231125/[email protected]/config)
compiler: xtensa-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231125/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/mfd/twl-core.c:690:6: warning: no previous prototype for 'twl6030_power_off' [-Wmissing-prototypes]
690 | void twl6030_power_off(void)
| ^~~~~~~~~~~~~~~~~
vim +/twl6030_power_off +690 drivers/mfd/twl-core.c
689
> 690 void twl6030_power_off(void)
691 {
692 #define APP_DEVOFF (1<<0)
693 #define CON_DEVOFF (1<<1)
694 #define MOD_DEVOFF (1<<2)
695
696 int err;
697 u8 val;
698
699 err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
700 TWL6030_PHOENIX_DEV_ON);
701 if (err) {
702 pr_err("I2C error %d reading PHOENIX_DEV_ON\n", err);
703 return;
704 }
705
706 val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
707
708 err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
709 TWL6030_PHOENIX_DEV_ON);
710 if (err)
711 pr_err("TWL6030 Unable to power off\n");
712 }
713
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Andreas,
kernel test robot noticed the following build warnings:
[auto build test WARNING on robh/for-next]
[also build test WARNING on lee-mfd/for-mfd-next linus/master v6.7-rc2 next-20231124]
[cannot apply to tmlind-omap/for-next lee-mfd/for-mfd-fixes]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andreas-Kemnade/dt-bindings-mfd-ti-twl-Document-system-power-controller/20231125-173426
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20231125092938.16535-3-andreas%40kemnade.info
patch subject: [PATCH 2/6] twl-core: add power off implementation for twl603x
config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20231126/[email protected]/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231126/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/mfd/twl-core.c:690:6: warning: no previous prototype for function 'twl6030_power_off' [-Wmissing-prototypes]
void twl6030_power_off(void)
^
drivers/mfd/twl-core.c:690:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
void twl6030_power_off(void)
^
static
1 warning generated.
vim +/twl6030_power_off +690 drivers/mfd/twl-core.c
689
> 690 void twl6030_power_off(void)
691 {
692 #define APP_DEVOFF (1<<0)
693 #define CON_DEVOFF (1<<1)
694 #define MOD_DEVOFF (1<<2)
695
696 int err;
697 u8 val;
698
699 err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
700 TWL6030_PHOENIX_DEV_ON);
701 if (err) {
702 pr_err("I2C error %d reading PHOENIX_DEV_ON\n", err);
703 return;
704 }
705
706 val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
707
708 err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
709 TWL6030_PHOENIX_DEV_ON);
710 if (err)
711 pr_err("TWL6030 Unable to power off\n");
712 }
713
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Andreas,
kernel test robot noticed the following build warnings:
[auto build test WARNING on robh/for-next]
[also build test WARNING on lee-mfd/for-mfd-next linus/master v6.7-rc2 next-20231124]
[cannot apply to tmlind-omap/for-next lee-mfd/for-mfd-fixes]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andreas-Kemnade/dt-bindings-mfd-ti-twl-Document-system-power-controller/20231125-173426
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20231125092938.16535-3-andreas%40kemnade.info
patch subject: [PATCH 2/6] twl-core: add power off implementation for twl603x
config: x86_64-randconfig-122-20231126 (https://download.01.org/0day-ci/archive/20231127/[email protected]/config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231127/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
sparse warnings: (new ones prefixed by >>)
>> drivers/mfd/twl-core.c:690:6: sparse: sparse: symbol 'twl6030_power_off' was not declared. Should it be static?
vim +/twl6030_power_off +690 drivers/mfd/twl-core.c
689
> 690 void twl6030_power_off(void)
691 {
692 #define APP_DEVOFF (1<<0)
693 #define CON_DEVOFF (1<<1)
694 #define MOD_DEVOFF (1<<2)
695
696 int err;
697 u8 val;
698
699 err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
700 TWL6030_PHOENIX_DEV_ON);
701 if (err) {
702 pr_err("I2C error %d reading PHOENIX_DEV_ON\n", err);
703 return;
704 }
705
706 val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
707
708 err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
709 TWL6030_PHOENIX_DEV_ON);
710 if (err)
711 pr_err("TWL6030 Unable to power off\n");
712 }
713
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki