From patchwork Mon Oct 19 03:17:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 532107 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 6D8871401F0 for ; Mon, 19 Oct 2015 14:23:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=miymt/w0; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 256674B719; Mon, 19 Oct 2015 05:23:56 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q-PirlPXcuAN; Mon, 19 Oct 2015 05:23:56 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C79A04B6EF; Mon, 19 Oct 2015 05:23:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9D7044B708 for ; Mon, 19 Oct 2015 05:23:51 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0EyNbIwJCtoO for ; Mon, 19 Oct 2015 05:23:51 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f171.google.com (mail-io0-f171.google.com [209.85.223.171]) by theia.denx.de (Postfix) with ESMTPS id 1936F4B6E3 for ; Mon, 19 Oct 2015 05:23:47 +0200 (CEST) Received: by iofz202 with SMTP id z202so32504286iof.2 for ; Sun, 18 Oct 2015 20:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=z/CGfhCjx2GVQt+C0YeR69aZHyKlrd/lbOwAY5TTr1k=; b=miymt/w06Up9g/I0qOshdAt+ps0m+twlfFAL7M2lVfEBROS27CTx8BVCiz6SlUiB5y z51fqdH9mlvptIp0q37VQvuDSfNU48Ef5k/CL+O0hz8a3zpPdI9foXp4Yt1zwb9LqEt2 0k2flk+Oob+OGgqDt+LsTPgi/D2+lMgtejfmi4G8O2SM5O66tciRZS8YHrbJ3hlI02/B OpWTx+Dj9eoHBsrU+TyZUTKBpkAsyvL1W4F1Sjvchi0R4MyuYaeyprBs+ZlMNKIahEzY 2p9XGeVJlCDLdMnQeXPSr9ffHxbvvNot4Li2hcBLiNR7/DoHE4IkJKQFRcMuN2BZbPig yDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=z/CGfhCjx2GVQt+C0YeR69aZHyKlrd/lbOwAY5TTr1k=; b=DhPgQzfUhHrKHV0Vec/xqlYJhs3jK7WEDVhQ00N11YN9LJYas7lfnCJRCHxn/I7h3p BDkCfE3MeVqNYaZVZMGHG2aY8HiNyGTImjwP+8OAbAuRNPc4Csa9iEo6Af8JJ1wF4Lsp 8yk5N/v5Z3qBxa50JdHkKKxjFXbKowiaHdHZfWRV6XYddQ/Ar3+4o1RdcO7L9NTPgidm CqghweMgosqUKOHlTt3IvEqOQo5ZOAuwRKp3wNYANwwp1snrNn5unPTw1D/O78Dv14E4 p8xSjSoGpWcWJL8JZdqgHzo9UktZsMa3NdE8IgcaoysONVo54YhbInv4oBJ0zx3fMzx5 cUcg== X-Gm-Message-State: ALoCoQnL9SyT0/uabCCWEIKpBulssoiZMQuxwi1gPDWM7q6eMrHp2nKva9DFbdVD9esZtCoc+RR0 X-Received: by 10.107.151.70 with SMTP id z67mr24434728iod.73.1445225026053; Sun, 18 Oct 2015 20:23:46 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id kb4sm5725989igb.12.2015.10.18.20.23.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Oct 2015 20:23:45 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id F0575220D0D; Sun, 18 Oct 2015 21:17:45 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Oct 2015 21:17:34 -0600 Message-Id: <1445224657-20622-26-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445224657-20622-1-git-send-email-sjg@chromium.org> References: <1445224657-20622-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 25/28] input: Convert i8042 to driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Adjust this driver to support driver model. The only users are x86 boards so this should be safe. Signed-off-by: Simon Glass --- Changes in v2: None drivers/input/Makefile | 2 +- drivers/input/i8042.c | 109 ++++++++++++++++++++++++++++++++++--------------- include/i8042.h | 6 --- 3 files changed, 76 insertions(+), 41 deletions(-) diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 9388dfe..5f15265 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_DM_KEYBOARD) += keyboard-uclass.o -obj-$(CONFIG_I8042_KBD) += i8042.o +obj-$(CONFIG_I8042_KEYB) += i8042.o obj-$(CONFIG_TEGRA_KEYBOARD) += tegra-kbc.o obj-$(CONFIG_TWL4030_INPUT) += twl4030.o obj-$(CONFIG_CROS_EC_KEYB) += cros_ec_keyb.o diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 270805b..e5e2926 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -8,8 +8,11 @@ /* i8042.c - Intel 8042 keyboard driver routines */ #include +#include +#include #include #include +#include #include /* defines */ @@ -17,8 +20,9 @@ #define out8(p, v) outb(v, p) /* locals */ -static struct input_config config; -static bool extended; +struct i8042_kbd_priv { + bool extended; /* true if an extended keycode is expected next */ +}; static unsigned char ext_key_map[] = { 0x1c, /* keypad enter */ @@ -60,12 +64,20 @@ static int kbd_output_full(void) return kbd_timeout != -1; } -static void kbd_led_set(int flags) +/** + * check_leds() - Check the keyboard LEDs and update them it needed + * + * @ret: Value to return + * @return value of @ret + */ +static int i8042_kbd_update_leds(struct udevice *dev, int leds) { kbd_input_empty(); out8(I8042_DATA_REG, CMD_SET_KBD_LED); kbd_input_empty(); - out8(I8042_DATA_REG, flags & 0x7); + out8(I8042_DATA_REG, leds & 0x7); + + return 0; } static int kbd_write(int reg, int value) @@ -144,6 +156,8 @@ static int kbd_controller_present(void) /* * Implement a weak default function for boards that optionally * need to skip the i8042 initialization. + * + * TODO(sjg@chromium.org): Use device tree for this? */ int __weak board_i8042_skip(void) { @@ -190,6 +204,8 @@ int i8042_disable(void) static int i8042_kbd_check(struct input_config *input) { + struct i8042_kbd_priv *priv = dev_get_priv(input->dev); + if ((in8(I8042_STS_REG) & STATUS_OBF) == 0) { return 0; } else { @@ -201,15 +217,15 @@ static int i8042_kbd_check(struct input_config *input) if (scan_code == 0xfa) { return 0; } else if (scan_code == 0xe0) { - extended = true; + priv->extended = true; return 0; } if (scan_code & 0x80) { scan_code &= 0x7f; release = true; } - if (extended) { - extended = false; + if (priv->extended) { + priv->extended = false; for (i = 0; ext_key_map[i]; i++) { if (ext_key_map[i] == scan_code) { scan_code = 0x60 + i; @@ -221,21 +237,23 @@ static int i8042_kbd_check(struct input_config *input) return 0; } - input_add_keycode(&config, scan_code, release); + input_add_keycode(input, scan_code, release); return 1; } } /* i8042_kbd_init - reset keyboard and init state flags */ -int i8042_kbd_init(void) +static int i8042_start(struct udevice *dev) { + struct keyboard_priv *uc_priv = dev_get_uclass_priv(dev); + struct input_config *input = &uc_priv->input; int keymap, try; char *penv; int ret; if (!kbd_controller_present() || board_i8042_skip()) { debug("i8042 keyboard controller is not present\n"); - return -1; + return -ENOENT; } /* Init keyboard device (default US layout) */ @@ -251,42 +269,65 @@ int i8042_kbd_init(void) return -1; } - ret = input_init(&config, keymap == KBD_GER); + ret = input_add_tables(input, keymap == KBD_GER); if (ret) return ret; - config.read_keys = i8042_kbd_check; - input_allow_repeats(&config, true); - kbd_led_set(NORMAL); + i8042_kbd_update_leds(dev, NORMAL); + debug("%s: started\n", __func__); return 0; } /** - * check_leds() - Check the keyboard LEDs and update them it needed + * Set up the i8042 keyboard. This is called by the stdio device handler * - * @ret: Value to return - * @return value of @ret + * We want to do this init when the keyboard is actually used rather than + * at start-up, since keyboard input may not currently be selected. + * + * Once the keyboard starts there will be a period during which we must + * wait for the keyboard to init. We do this only when a key is first + * read - see kbd_wait_for_fifo_init(). + * + * @return 0 if ok, -ve on error */ -static int check_leds(int ret) +static int i8042_kbd_probe(struct udevice *dev) { - int leds; - - leds = input_leds_changed(&config); - if (leds >= 0) - kbd_led_set(leds); + struct keyboard_priv *uc_priv = dev_get_uclass_priv(dev); + struct stdio_dev *sdev = &uc_priv->sdev; + struct input_config *input = &uc_priv->input; + int ret; - return ret; -} + /* Register the device. i8042_start() will be called soon */ + input->dev = dev; + input->read_keys = i8042_kbd_check; + input_allow_repeats(input, true); + strcpy(sdev->name, "i8042-kbd"); + ret = input_stdio_register(sdev); + if (ret) { + debug("%s: input_stdio_register() failed\n", __func__); + return ret; + } + debug("%s: ready\n", __func__); -/* i8042_tstc - test if keyboard input is available */ -int i8042_tstc(struct stdio_dev *dev) -{ - return check_leds(input_tstc(&config)); + return 0; } -/* i8042_getc - wait till keyboard input is available */ -int i8042_getc(struct stdio_dev *dev) -{ - return check_leds(input_getc(&config)); -} +static const struct keyboard_ops i8042_kbd_ops = { + .start = i8042_start, + .update_leds = i8042_kbd_update_leds, +}; + +static const struct udevice_id i8042_kbd_ids[] = { + { .compatible = "intel,i8042-keyboard" }, + { } +}; + +U_BOOT_DRIVER(i8042_kbd) = { + .name = "i8042_kbd", + .id = UCLASS_KEYBOARD, + .of_match = i8042_kbd_ids, + .probe = i8042_kbd_probe, + .ops = &i8042_kbd_ops, + .priv_auto_alloc_size = sizeof(struct i8042_kbd_priv), +}; diff --git a/include/i8042.h b/include/i8042.h index e0afce1..9723b6a 100644 --- a/include/i8042.h +++ b/include/i8042.h @@ -87,10 +87,4 @@ void i8042_flush(void); */ int i8042_disable(void); -struct stdio_dev; - -int i8042_kbd_init(void); -int i8042_tstc(struct stdio_dev *dev); -int i8042_getc(struct stdio_dev *dev); - #endif /* _I8042_H_ */