michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ITE drivers/kscan: clean up it8xxx2 kscan driver

Browse source 
1.Declare the member type to match the kscan_it8xxx2_regs, so
we needn't to transform the local structure in the function.
2.Stop using DRV_CONFIG, DRV_DATA, DRV_REG macros.
3.Delete unused register defines.

Signed-off-by: Ruibin Chang <Ruibin.Chang@ite.com.tw>
This commit is contained in:
Ruibin Chang 2021-12-17 16:50:27 +08:00 • committed by Marti Bolivar
commit 4aa6e98292
2 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

39
drivers/kscan/kscan_ite_it8xxx2.c
View file

@ -59,7 +59,7 @@ struct kscan_alt_cfg {
struct kscan_it8xxx2_config { struct kscan_it8xxx2_config {
/* Keyboard scan controller base address */ /* Keyboard scan controller base address */
uintptr_t base; struct kscan_it8xxx2_regs *base;
/* Keyboard scan input (KSI) wake-up irq */ /* Keyboard scan input (KSI) wake-up irq */
int irq; int irq;
/* KSI[7:0] wake-up input source configuration list */ /* KSI[7:0] wake-up input source configuration list */
@ -99,14 +99,10 @@ struct kscan_it8xxx2_data {
K_KERNEL_STACK_MEMBER(thread_stack, TASK_STACK_SIZE); K_KERNEL_STACK_MEMBER(thread_stack, TASK_STACK_SIZE);
}; };
/* Driver convenience defines */
#define DRV_CONFIG(dev) ((const struct kscan_it8xxx2_config *)(dev)->config)
#define DRV_DATA(dev) ((struct kscan_it8xxx2_data *)(dev)->data)
#define DRV_REG(dev) (struct kscan_it8xxx2_regs *)(DRV_CONFIG(dev)->base)
static void drive_keyboard_column(const struct device *dev, int col) static void drive_keyboard_column(const struct device *dev, int col)
{ {
struct kscan_it8xxx2_regs *const inst = DRV_REG(dev); const struct kscan_it8xxx2_config *const config = dev->config;
struct kscan_it8xxx2_regs *const inst = config->base;
int mask; int mask;
/* Tri-state all outputs */ /* Tri-state all outputs */
@ -129,7 +125,8 @@ static void drive_keyboard_column(const struct device *dev, int col)
static uint8_t read_keyboard_row(const struct device *dev) static uint8_t read_keyboard_row(const struct device *dev)
{ {
struct kscan_it8xxx2_regs *const inst = DRV_REG(dev); const struct kscan_it8xxx2_config *const config = dev->config;
struct kscan_it8xxx2_regs *const inst = config->base;
/* Bits are active-low, so toggle it (return 1 means key pressed) */ /* Bits are active-low, so toggle it (return 1 means key pressed) */
return (inst->KBS_KSI ^ 0xff); return (inst->KBS_KSI ^ 0xff);
@ -199,8 +196,8 @@ static bool read_keyboard_matrix(const struct device *dev, uint8_t *new_state)
static void keyboard_raw_interrupt(const struct device *dev) static void keyboard_raw_interrupt(const struct device *dev)
{ {
const struct kscan_it8xxx2_config *const config = DRV_CONFIG(dev); const struct kscan_it8xxx2_config *const config = dev->config;
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
/* /*
* W/C wakeup interrupt status of KSI[7:0] pins * W/C wakeup interrupt status of KSI[7:0] pins
@ -220,8 +217,8 @@ static void keyboard_raw_interrupt(const struct device *dev)
void keyboard_raw_enable_interrupt(const struct device *dev, int enable) void keyboard_raw_enable_interrupt(const struct device *dev, int enable)
{ {
const struct kscan_it8xxx2_config *const config = DRV_CONFIG(dev); const struct kscan_it8xxx2_config *const config = dev->config;
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
if (enable) { if (enable) {
/* /*
@ -244,7 +241,7 @@ void keyboard_raw_enable_interrupt(const struct device *dev, int enable)
static bool check_key_events(const struct device *dev) static bool check_key_events(const struct device *dev)
{ {
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
uint8_t matrix_new_state[CONFIG_KSCAN_ITE_IT8XXX2_COLUMN_SIZE] = {0U}; uint8_t matrix_new_state[CONFIG_KSCAN_ITE_IT8XXX2_COLUMN_SIZE] = {0U};
bool key_pressed = false; bool key_pressed = false;
uint32_t cycles_now = k_cycle_get_32(); uint32_t cycles_now = k_cycle_get_32();
@ -366,7 +363,7 @@ static bool poll_expired(uint32_t start_cycles, int32_t *timeout)
void polling_task(const struct device *dev, void *dummy2, void *dummy3) void polling_task(const struct device *dev, void *dummy2, void *dummy3)
{ {
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
int32_t local_poll_timeout = data->poll_timeout; int32_t local_poll_timeout = data->poll_timeout;
uint32_t current_cycles; uint32_t current_cycles;
uint32_t cycles_delta; uint32_t cycles_delta;
@ -429,9 +426,9 @@ void polling_task(const struct device *dev, void *dummy2, void *dummy3)
static int kscan_it8xxx2_init(const struct device *dev) static int kscan_it8xxx2_init(const struct device *dev)
{ {
const struct kscan_it8xxx2_config *const config = DRV_CONFIG(dev); const struct kscan_it8xxx2_config *const config = dev->config;
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
struct kscan_it8xxx2_regs *const inst = DRV_REG(dev); struct kscan_it8xxx2_regs *const inst = config->base;
/* Disable wakeup and interrupt of KSI pins before configuring */ /* Disable wakeup and interrupt of KSI pins before configuring */
keyboard_raw_enable_interrupt(dev, 0); keyboard_raw_enable_interrupt(dev, 0);
@ -540,7 +537,7 @@ static int kscan_it8xxx2_init(const struct device *dev)
static int kscan_it8xxx2_configure(const struct device *dev, static int kscan_it8xxx2_configure(const struct device *dev,
kscan_callback_t callback) kscan_callback_t callback)
{ {
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
if (!callback) { if (!callback) {
return -EINVAL; return -EINVAL;
@ -554,7 +551,7 @@ static int kscan_it8xxx2_configure(const struct device *dev,
static int kscan_it8xxx2_disable_callback(const struct device *dev) static int kscan_it8xxx2_disable_callback(const struct device *dev)
{ {
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
/* Disable keyboard scan loop */ /* Disable keyboard scan loop */
atomic_set(&data->enable_scan, 0); atomic_set(&data->enable_scan, 0);
@ -564,7 +561,7 @@ static int kscan_it8xxx2_disable_callback(const struct device *dev)
static int kscan_it8xxx2_enable_callback(const struct device *dev) static int kscan_it8xxx2_enable_callback(const struct device *dev)
{ {
struct kscan_it8xxx2_data *data = DRV_DATA(dev); struct kscan_it8xxx2_data *data = dev->data;
/* Enable keyboard scan loop */ /* Enable keyboard scan loop */
atomic_set(&data->enable_scan, 1); atomic_set(&data->enable_scan, 1);
@ -585,7 +582,7 @@ static const struct kscan_alt_cfg kscan_alt_0[DT_INST_NUM_PINCTRLS_BY_IDX(0, 0)]
IT8XXX2_DT_ALT_ITEMS_LIST(0); IT8XXX2_DT_ALT_ITEMS_LIST(0);
static const struct kscan_it8xxx2_config kscan_it8xxx2_cfg_0 = { static const struct kscan_it8xxx2_config kscan_it8xxx2_cfg_0 = {
.base = DT_INST_REG_ADDR_BY_IDX(0, 0), .base = (struct kscan_it8xxx2_regs *)DT_INST_REG_ADDR_BY_IDX(0, 0),
.irq = DT_INST_IRQN(0), .irq = DT_INST_IRQN(0),
.wuc_map_list = kscan_wuc_0, .wuc_map_list = kscan_wuc_0,
.gpio_dev = DEVICE_DT_GET(DT_INST_PHANDLE_BY_IDX(0, gpio_dev, 0)), .gpio_dev = DEVICE_DT_GET(DT_INST_PHANDLE_BY_IDX(0, gpio_dev, 0)),

3
soc/riscv/riscv-ite/common/chip_chipregs.h
View file

@ -694,12 +694,9 @@ struct pwm_it8xxx2_regs {
/* TODO: should a defined interface for configuring wake-up interrupts */ /* TODO: should a defined interface for configuring wake-up interrupts */
#define IT8XXX2_WUC_WUEMR1 (IT8XXX2_WUC_BASE + 0x00) #define IT8XXX2_WUC_WUEMR1 (IT8XXX2_WUC_BASE + 0x00)
#define IT8XXX2_WUC_WUEMR3 (IT8XXX2_WUC_BASE + 0x02)
#define IT8XXX2_WUC_WUEMR5 (IT8XXX2_WUC_BASE + 0x0c) #define IT8XXX2_WUC_WUEMR5 (IT8XXX2_WUC_BASE + 0x0c)
#define IT8XXX2_WUC_WUESR1 (IT8XXX2_WUC_BASE + 0x04) #define IT8XXX2_WUC_WUESR1 (IT8XXX2_WUC_BASE + 0x04)
#define IT8XXX2_WUC_WUESR3 (IT8XXX2_WUC_BASE + 0x06)
#define IT8XXX2_WUC_WUESR5 (IT8XXX2_WUC_BASE + 0x0d) #define IT8XXX2_WUC_WUESR5 (IT8XXX2_WUC_BASE + 0x0d)
#define IT8XXX2_WUC_WUENR3 (IT8XXX2_WUC_BASE + 0x0a)
#define IT8XXX2_WUC_WUBEMR1 (IT8XXX2_WUC_BASE + 0x3c) #define IT8XXX2_WUC_WUBEMR1 (IT8XXX2_WUC_BASE + 0x3c)
#define IT8XXX2_WUC_WUBEMR5 (IT8XXX2_WUC_BASE + 0x0f) #define IT8XXX2_WUC_WUBEMR5 (IT8XXX2_WUC_BASE + 0x0f)