kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Proper device PM support for composite kscan.

Browse source 
* Clean up composite kscan to allow multiple instances properly.
* Implement PM hook and properly suspend/resume the child devices.

Fixes: #2388
This commit is contained in:
Peter Johanson 2024-08-03 14:00:31 -06:00
parent 78ed721c36
commit 019f77da03
1 changed files with 82 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
app/module/drivers/kscan/kscan_composite.c
View file

@ -7,6 +7,7 @@
#define DT_DRV_COMPAT zmk_kscan_composite #define DT_DRV_COMPAT zmk_kscan_composite
#include <zephyr/device.h> #include <zephyr/device.h>
#include <zephyr/pm/device.h>
#include <zephyr/drivers/kscan.h> #include <zephyr/drivers/kscan.h>
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@ -26,10 +27,10 @@ struct kscan_composite_child_config {
.row_offset = DT_PROP(inst, row_offset), \ .row_offset = DT_PROP(inst, row_offset), \
.column_offset = DT_PROP(inst, column_offset)}, .column_offset = DT_PROP(inst, column_offset)},
const struct kscan_composite_child_config kscan_composite_children[] = { struct kscan_composite_config {
DT_FOREACH_CHILD(MATRIX_NODE_ID, CHILD_CONFIG)}; const struct kscan_composite_child_config *children;
size_t children_len;
struct kscan_composite_config {}; };
struct kscan_composite_data { struct kscan_composite_data {
kscan_callback_t callback; kscan_callback_t callback;
@ -38,51 +39,80 @@ struct kscan_composite_data {
}; };
static int kscan_composite_enable_callback(const struct device *dev) { static int kscan_composite_enable_callback(const struct device *dev) {
for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) { const struct kscan_composite_config *cfg = dev->config;
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i];
kscan_enable_callback(cfg->child); for (int i = 0; i < cfg->children_len; i++) {
const struct kscan_composite_child_config *child_cfg = &cfg->children[i];
#if IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)
if (!pm_device_runtime_is_enabled(dev) && pm_device_runtime_is_enabled(child_cfg->child)) {
pm_device_runtime_get(child_cfg->child);
}
#elif IS_ENABLED(CONFIG_PM_DEVICE)
pm_device_action_run(child_cfg->child, PM_DEVICE_ACTION_RESUME);
#endif // IS_ENABLED(CONFIG_PM_DEVICE)
kscan_enable_callback(child_cfg->child);
} }
return 0; return 0;
} }
static int kscan_composite_disable_callback(const struct device *dev) { static int kscan_composite_disable_callback(const struct device *dev) {
for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) { const struct kscan_composite_config *cfg = dev->config;
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; for (int i = 0; i < cfg->children_len; i++) {
const struct kscan_composite_child_config *child_cfg = &cfg->children[i];
kscan_disable_callback(cfg->child); kscan_disable_callback(child_cfg->child);
#if IS_ENABLED(CONFIG_PM_DEVICE_RUNTIME)
if (!pm_device_runtime_is_enabled(dev) && pm_device_runtime_is_enabled(child_cfg->child)) {
pm_device_runtime_put(child_cfg->child);
}
#elif IS_ENABLED(CONFIG_PM_DEVICE)
pm_device_action_run(child_cfg->child, PM_DEVICE_ACTION_SUSPEND);
#endif // IS_ENABLED(CONFIG_PM_DEVICE)
} }
return 0; return 0;
} }
#define KSCAN_COMP_INST_DEV(n) DEVICE_DT_GET(DT_DRV_INST(n)),
static const struct device *all_instances[] = {DT_INST_FOREACH_STATUS_OKAY(KSCAN_COMP_INST_DEV)};
static void kscan_composite_child_callback(const struct device *child_dev, uint32_t row, static void kscan_composite_child_callback(const struct device *child_dev, uint32_t row,
uint32_t column, bool pressed) { uint32_t column, bool pressed) {
// TODO: Ideally we can get this passed into our callback! // TODO: Ideally we can get this passed into our callback!
const struct device *dev = DEVICE_DT_GET(DT_DRV_INST(0)); for (int i = 0; i < ARRAY_SIZE(all_instances); i++) {
struct kscan_composite_data *data = dev->data;
for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) { const struct device *dev = all_instances[i];
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; const struct kscan_composite_config *cfg = dev->config;
struct kscan_composite_data *data = dev->data;
if (cfg->child != child_dev) { for (int c = 0; c < cfg->children_len; c++) {
continue; const struct kscan_composite_child_config *child_cfg = &cfg->children[c];
if (child_cfg->child != child_dev) {
continue;
}
data->callback(dev, row + child_cfg->row_offset, column + child_cfg->column_offset,
pressed);
} }
data->callback(dev, row + cfg->row_offset, column + cfg->column_offset, pressed);
} }
} }
static int kscan_composite_configure(const struct device *dev, kscan_callback_t callback) { static int kscan_composite_configure(const struct device *dev, kscan_callback_t callback) {
const struct kscan_composite_config *cfg = dev->config;
struct kscan_composite_data *data = dev->data; struct kscan_composite_data *data = dev->data;
if (!callback) { if (!callback) {
return -EINVAL; return -EINVAL;
} }
for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) { for (int i = 0; i < cfg->children_len; i++) {
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; const struct kscan_composite_child_config *child_cfg = &cfg->children[i];
kscan_config(cfg->child, &kscan_composite_child_callback); kscan_config(child_cfg->child, &kscan_composite_child_callback);
} }
data->callback = callback; data->callback = callback;
@ -95,6 +125,10 @@ static int kscan_composite_init(const struct device *dev) {
data->dev = dev; data->dev = dev;
#if IS_ENABLED(CONFIG_PM_DEVICE)
pm_device_init_suspended(dev);
#endif
return 0; return 0;
} }
@ -104,9 +138,32 @@ static const struct kscan_driver_api mock_driver_api = {
.disable_callback = kscan_composite_disable_callback, .disable_callback = kscan_composite_disable_callback,
}; };
static const struct kscan_composite_config kscan_composite_config = {}; #if IS_ENABLED(CONFIG_PM_DEVICE)
static struct kscan_composite_data kscan_composite_data; static int kscan_composite_pm_action(const struct device *dev, enum pm_device_action action) {
switch (action) {
case PM_DEVICE_ACTION_SUSPEND:
return kscan_composite_disable_callback(dev);
case PM_DEVICE_ACTION_RESUME:
return kscan_composite_enable_callback(dev);
default:
return -ENOTSUP;
}
}
DEVICE_DT_INST_DEFINE(0, kscan_composite_init, NULL, &kscan_composite_data, &kscan_composite_config, #endif // IS_ENABLED(CONFIG_PM_DEVICE)
POST_KERNEL, CONFIG_ZMK_KSCAN_COMPOSITE_INIT_PRIORITY, &mock_driver_api);
#define KSCAN_COMP_DEV(n) \
static const struct kscan_composite_child_config kscan_composite_children_##n[] = { \
DT_INST_FOREACH_CHILD(n, CHILD_CONFIG)}; \
static const struct kscan_composite_config kscan_composite_config_##n = { \
.children = kscan_composite_children_##n, \
.children_len = ARRAY_SIZE(kscan_composite_children_##n), \
}; \
static struct kscan_composite_data kscan_composite_data_##n; \
PM_DEVICE_DT_INST_DEFINE(n, kscan_composite_pm_action); \
DEVICE_DT_INST_DEFINE(n, kscan_composite_init, PM_DEVICE_DT_INST_GET(n), \
&kscan_composite_data_##n, &kscan_composite_config_##n, POST_KERNEL, \
CONFIG_ZMK_KSCAN_COMPOSITE_INIT_PRIORITY, &mock_driver_api);
DT_INST_FOREACH_STATUS_OKAY(KSCAN_COMP_DEV)