michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sensor: hts221: Move GPIO to device tree

Browse source 
Move how we configure the DRDY gpio line to device tree from Kconfig.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-01-16 09:09:18 -06:00 • committed by Kumar Gala
commit 689ad43b62
5 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/arm/96b_argonkey/96b_argonkey.dts
View file

@ -86,6 +86,7 @@
compatible = "st,hts221";
reg = <0x5f>;
label = "HTS221";
drdy-gpios = <&gpioa 2 GPIO_INT_ACTIVE_LOW>;
};
lps22hb-press@5d {

16
drivers/sensor/hts221/Kconfig
View file

@ -36,22 +36,6 @@ endchoice # HTS221_TRIGGER_MODE
config HTS221_TRIGGER
bool
config HTS221_GPIO_DEV_NAME
string "GPIO device"
default "GPIO_0"
depends on HTS221_TRIGGER
help
The device name of the GPIO device to which the HTS221 interrupt pin
is connected.
config HTS221_GPIO_PIN_NUM
int "Interrupt GPIO pin number"
default 0
depends on HTS221_TRIGGER
help
The number of the GPIO on which the interrupt signal from the HTS221
chip will be received.
config HTS221_THREAD_PRIORITY
int "Thread priority"
depends on HTS221_TRIGGER_OWN_THREAD

21
drivers/sensor/hts221/hts221_trigger.c
View file

@ -25,7 +25,8 @@ int hts221_trigger_set(struct device *dev,
__ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY);
gpio_pin_disable_callback(drv_data->gpio, CONFIG_HTS221_GPIO_PIN_NUM);
gpio_pin_disable_callback(drv_data->gpio,
DT_ST_HTS221_0_DRDY_GPIOS_PIN);
drv_data->data_ready_handler = handler;
if (handler == NULL) {
@ -34,7 +35,8 @@ int hts221_trigger_set(struct device *dev,
drv_data->data_ready_trigger = *trig;
gpio_pin_enable_callback(drv_data->gpio, CONFIG_HTS221_GPIO_PIN_NUM);
gpio_pin_enable_callback(drv_data->gpio,
DT_ST_HTS221_0_DRDY_GPIOS_PIN);
return 0;
}
@ -47,7 +49,7 @@ static void hts221_gpio_callback(struct device *dev,
ARG_UNUSED(pins);
gpio_pin_disable_callback(dev, CONFIG_HTS221_GPIO_PIN_NUM);
gpio_pin_disable_callback(dev, DT_ST_HTS221_0_DRDY_GPIOS_PIN);
#if defined(CONFIG_HTS221_TRIGGER_OWN_THREAD)
k_sem_give(&drv_data->gpio_sem);
@ -66,7 +68,7 @@ static void hts221_thread_cb(void *arg)
&drv_data->data_ready_trigger);
}
gpio_pin_enable_callback(drv_data->gpio, CONFIG_HTS221_GPIO_PIN_NUM);
gpio_pin_enable_callback(drv_data->gpio, DT_ST_HTS221_0_DRDY_GPIOS_PIN);
}
#ifdef CONFIG_HTS221_TRIGGER_OWN_THREAD
@ -99,20 +101,21 @@ int hts221_init_interrupt(struct device *dev)
struct hts221_data *drv_data = dev->driver_data;
/* setup data ready gpio interrupt */
drv_data->gpio = device_get_binding(CONFIG_HTS221_GPIO_DEV_NAME);
drv_data->gpio =
device_get_binding(DT_ST_HTS221_0_DRDY_GPIOS_CONTROLLER);
if (drv_data->gpio == NULL) {
LOG_ERR("Cannot get pointer to %s device.",
CONFIG_HTS221_GPIO_DEV_NAME);
DT_ST_HTS221_0_DRDY_GPIOS_CONTROLLER);
return -EINVAL;
}
gpio_pin_configure(drv_data->gpio, CONFIG_HTS221_GPIO_PIN_NUM,
gpio_pin_configure(drv_data->gpio, DT_ST_HTS221_0_DRDY_GPIOS_PIN,
GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE |
GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE);
gpio_init_callback(&drv_data->gpio_cb,
hts221_gpio_callback,
BIT(CONFIG_HTS221_GPIO_PIN_NUM));
BIT(DT_ST_HTS221_0_DRDY_GPIOS_PIN));
if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) {
LOG_ERR("Could not set gpio callback.");
@ -139,7 +142,7 @@ int hts221_init_interrupt(struct device *dev)
drv_data->dev = dev;
#endif
gpio_pin_enable_callback(drv_data->gpio, CONFIG_HTS221_GPIO_PIN_NUM);
gpio_pin_enable_callback(drv_data->gpio, DT_ST_HTS221_0_DRDY_GPIOS_PIN);
return 0;
}

5
dts/bindings/sensor/st,hts221.yaml
View file

@ -18,4 +18,9 @@ properties:
compatible:
constraint: "st,hts221"
drdy-gpios:
type: compound
category: optional
generation: define, use-prop-name
...

2
tests/drivers/build_all/dts_fixup.h
View file

@ -63,6 +63,8 @@
#define DT_ST_HTS221_0_LABEL ""
#define DT_ST_HTS221_0_BUS_NAME ""
#define DT_ST_HTS221_0_BASE_ADDRESS 0
#define DT_ST_HTS221_0_DRDY_GPIOS_PIN 0
#define DT_ST_HTS221_0_DRDY_GPIOS_CONTROLLER ""
#endif
#ifndef CONFIG_LIS2MDL_GPIO_PIN_NUM