From patchwork Wed May 15 10:27:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hung-ying Tyan X-Patchwork-Id: 244038 X-Patchwork-Delegate: promsoft@gmail.com 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 33D4C2C009C for ; Wed, 15 May 2013 20:37:37 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F12D04A020; Wed, 15 May 2013 12:37:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 Ab9RyNKTwMUy; Wed, 15 May 2013 12:37:35 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3C2064A026; Wed, 15 May 2013 12:37:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 356814A026 for ; Wed, 15 May 2013 12:37:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 9TZ3hCmde+v4 for ; Wed, 15 May 2013 12:37:24 +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-ve0-f202.google.com (mail-ve0-f202.google.com [209.85.128.202]) by theia.denx.de (Postfix) with ESMTPS id 6D90B4A020 for ; Wed, 15 May 2013 12:37:17 +0200 (CEST) Received: by mail-ve0-f202.google.com with SMTP id 14so165598vea.1 for ; Wed, 15 May 2013 03:37:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=9PY35KU93IOfqj4dubu0z8mGXaOn/n9GuJ9CsIB3v8Y=; b=EfV0CkHC9ANMtsodPMuGjyE3GmabXtLFvt+XyvfQBDZh8xVVPdYrh+97JB5xfCvPSZ LFFhSZk57ZanJVz6A7u4bRv70HyJM8WA6TI+pIe7Bhfk5PBiMBn5H2MNhWbMLBNqj/y8 BE3aErYRH+g1fL5fnNjtYnLGVpfYJHXB1zDnGvPJz53y61Y6TPNaUJ/E7bKRexUtIkGv HDGtuRxk6LbLfKD5YJjgtanM++MXiu/+BSGDCdMefumWS7u3WB+tu+9OBCDjIhYdxW0W NkkXEfzGTg1XXcsFoEfUN/Imtuuv5mzMbrueDVXrdLTGURwmNu4LqPahiCb2KqVceSy4 rTgw== X-Received: by 10.236.21.198 with SMTP id r46mr17577069yhr.12.1368613736019; Wed, 15 May 2013 03:28:56 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id o42si125750yhe.5.2013.05.15.03.28.56 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 15 May 2013 03:28:56 -0700 (PDT) Received: from tyanh-z620.tpe.corp.google.com (tyanh-z620.tpe.corp.google.com [172.30.210.193]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 848485A415D; Wed, 15 May 2013 03:28:55 -0700 (PDT) Received: by tyanh-z620.tpe.corp.google.com (Postfix, from userid 30259) id 5FBD1E091F; Wed, 15 May 2013 18:28:54 +0800 (CST) From: Hung-ying Tyan To: U-Boot Mailing List Date: Wed, 15 May 2013 18:27:34 +0800 Message-Id: <1368613654-15229-8-git-send-email-tyanh@chromium.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368613654-15229-1-git-send-email-tyanh@chromium.org> References: <1368613654-15229-1-git-send-email-tyanh@chromium.org> X-Gm-Message-State: ALoCoQnFJ9YbdNmVcd2zriqNV88ljJqCR/T+U2bXJHpvbKtOFg1YLuUej4r8ktD/mNaHyhWsRJDrqNQWHbEECSCqfZtFF03Wx5FMSUYTQtdJOxqgin/zvLVlJa1AatEcTvN4du4Az09Y+iYw2TIwUHxyjUpeImLmFgtlfKizbbKeNEpFnBQnX+m1I19HiZMHhfucuJe0rSsf Cc: Vincent Palatin , u-boot-review@google.com, Tom Rini Subject: [U-Boot] [PATCH v5 7/7] cros: exynos: enable cros-ec for smdk5250 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch initiates cros-ec in board_init() to enable it for smdk5250. This patch depends on the patch in the MMC series that brings in exynos5-dt.c. Refer to http://patchwork.ozlabs.org/patch/240084. Signed-off-by: Simon Glass Signed-off-by: Vincent Palatin Signed-off-by: Hung-ying Tyan Acked-by: Simon Glass --- Changes in v5: - Add exynos: tag. - Add dependency description. Changes in v4: None Changes in v3: None Changes in v2: - Moved code from smdk5250.c (non-FDT) to exynos5-dt.c (FDT). - Moved code from smdk5250.h to exynos5250-dt.h. - Added commit message. - Dropped the period from commit subject. board/samsung/smdk5250/exynos5-dt.c | 45 +++++++++++++++++++++++++++++++++++++ include/configs/exynos5250-dt.h | 10 ++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/board/samsung/smdk5250/exynos5-dt.c b/board/samsung/smdk5250/exynos5-dt.c index b01fe72..8be3192 100644 --- a/board/samsung/smdk5250/exynos5-dt.c +++ b/board/samsung/smdk5250/exynos5-dt.c @@ -21,6 +21,7 @@ */ #include +#include #include #include #include @@ -39,6 +40,13 @@ DECLARE_GLOBAL_DATA_PTR; +struct local_info { + struct cros_ec_dev *cros_ec_dev; /* Pointer to cros_ec device */ + int cros_ec_err; /* Error for cros_ec, 0 if ok */ +}; + +static struct local_info local; + #ifdef CONFIG_USB_EHCI_EXYNOS int board_usb_vbus_init(void) { @@ -55,12 +63,30 @@ int board_usb_vbus_init(void) } #endif +struct cros_ec_dev *board_get_cros_ec_dev(void) +{ + return local.cros_ec_dev; +} + +static int board_init_cros_ec_devices(const void *blob) +{ + local.cros_ec_err = cros_ec_init(blob, &local.cros_ec_dev); + if (local.cros_ec_err) + return -1; /* Will report in board_late_init() */ + + return 0; +} + int board_init(void) { gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); #ifdef CONFIG_EXYNOS_SPI spi_init(); #endif + + if (board_init_cros_ec_devices(gd->fdt_blob)) + return -1; + #ifdef CONFIG_USB_EHCI_EXYNOS board_usb_vbus_init(); #endif @@ -337,3 +363,22 @@ int board_early_init_f(void) return err; } #endif + +#ifdef CONFIG_BOARD_LATE_INIT +int board_late_init(void) +{ + stdio_print_current_devices(); + + if (local.cros_ec_err) { + /* Force console on */ + gd->flags &= ~GD_FLG_SILENT; + + printf("cros-ec communications failure %d\n", + local.cros_ec_err); + puts("\nPlease reset with Power+Refresh\n\n"); + panic("Cannot init cros-ec device"); + return -1; + } + return 0; +} +#endif diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 97c8825..289db00 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -82,11 +82,19 @@ #define CONFIG_BAUDRATE 115200 #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000 +/* Enable keyboard */ +#define CONFIG_CROS_EC /* CROS_EC protocol */ +#define CONFIG_CROS_EC_SPI /* Support CROS_EC over SPI */ +#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */ +#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ +#define CONFIG_CMD_CROS_EC +#define CONFIG_KEYBOARD + /* Console configuration */ #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define EXYNOS_DEVICE_SETTINGS \ - "stdin=serial\0" \ + "stdin=serial,cros-ec-keyb\0" \ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0"