summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-10-18 21:17:14 -0600
committerSimon Glass <sjg@chromium.org>2015-11-19 20:13:40 -0700
commit745009c4d081a9fb5504ce3e97b39e92cbe77ef4 (patch)
tree695ac969565a22a06a78303185a117f4cc345507 /drivers/input
parent66877b0f5fc96906d70f1264b3b8102d2156360f (diff)
downloadblackbird-obmc-uboot-745009c4d081a9fb5504ce3e97b39e92cbe77ef4.tar.gz
blackbird-obmc-uboot-745009c4d081a9fb5504ce3e97b39e92cbe77ef4.zip
cros_ec: Use udevice instead of cros_ec_dev for keyboard functions
In preparation for converting the cros_ec keyboard driver to driver model, adjust the cros_ec functions it will use to use a normal struct udevice. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/cros_ec_keyb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index 41d8a6f422..09e7cbdd36 100644
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -54,7 +54,7 @@ static int check_for_keys(struct keyb *config,
unsigned int row, col, bit, data;
int num_keys;
- if (cros_ec_scan_keyboard(config->dev, &scan)) {
+ if (cros_ec_scan_keyboard(config->dev->dev, &scan)) {
debug("%s: keyboard scan failed\n", __func__);
return -EIO;
}
@@ -139,7 +139,7 @@ int cros_ec_kbc_check(struct input_config *input)
* may return 0 before all keys have been read from the EC.
*/
do {
- irq_pending = cros_ec_interrupt_pending(config.dev);
+ irq_pending = cros_ec_interrupt_pending(config.dev->dev);
if (irq_pending) {
num_keys = check_for_keys(&config, keys, KBC_MAX_KEYS,
&same);
OpenPOWER on IntegriCloud