From patchwork Thu Mar 28 07:46:00 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: 231960 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 794832C00B1 for ; Thu, 28 Mar 2013 20:09:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E71214A048; Thu, 28 Mar 2013 10:09:41 +0100 (CET) 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 D7admexsvUCg; Thu, 28 Mar 2013 10:09:41 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C7E334A039; Thu, 28 Mar 2013 10:09:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D8B344A036 for ; Thu, 28 Mar 2013 10:09:29 +0100 (CET) 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 UNCEFQMS9sxN for ; Thu, 28 Mar 2013 10:09:25 +0100 (CET) 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-wg0-f74.google.com (mail-wg0-f74.google.com [74.125.82.74]) by theia.denx.de (Postfix) with ESMTPS id 8AFBD4A026 for ; Thu, 28 Mar 2013 10:09:23 +0100 (CET) Received: by mail-wg0-f74.google.com with SMTP id x12so101756wgg.3 for ; Thu, 28 Mar 2013 02:09:22 -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=eLTxD3UGnAELaUW7ZM24RkKep9Osxxhj+sqFIm5jPN0=; b=DF1YgfURRpWKNgAFfIlERibIcerYpxrzxpD4a2FC+etUVCqUyo8I2vf5FC82NODZ7n 7Vkm5qEGz9PNHLdBFYmCDqB0F68h0JRnjZ4BPwnzR9M4W7KV6xBew4wYyjHn8oZ+TTgF uD8cXNUp4qh3tqAluif32jg1OjcG6i30kGoXMdFwhlCB3cVEKIjU3P3Mt5jwPetAqhQR A4QOPz+hLU8p8mKmyNUZf8Ben4BVMNsU75B9KaYmWDJEbaNcrFUFJae53TzkfZbku92j bpj9pb0qLGJKT1OIZL8ZCCiEPSUSmJRWf2Hs3dkztFAgNgj4TXxGKOVTSslptu/FO6Cr lROg== X-Received: by 10.14.0.196 with SMTP id 44mr26524006eeb.4.1364461448824; Thu, 28 Mar 2013 02:04:08 -0700 (PDT) Received: from corp2gmr1-1.eem.corp.google.com (corp2gmr1-1.eem.corp.google.com [172.25.138.99]) by gmr-mx.google.com with ESMTPS id 6si5292920eej.0.2013.03.28.02.04.08 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Thu, 28 Mar 2013 02:04:08 -0700 (PDT) Received: from tyanh-z620.tpe.corp.google.com (tyanh-z620.tpe.corp.google.com [172.30.210.193]) by corp2gmr1-1.eem.corp.google.com (Postfix) with ESMTP id 6D0811CA306; Thu, 28 Mar 2013 02:04:08 -0700 (PDT) Received: by tyanh-z620.tpe.corp.google.com (Postfix, from userid 30259) id D18E7E1EB5; Thu, 28 Mar 2013 15:46:22 +0800 (CST) From: Hung-ying Tyan To: U-Boot Mailing List Date: Thu, 28 Mar 2013 15:46:00 +0800 Message-Id: <1364456760-31500-8-git-send-email-tyanh@chromium.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1364456760-31500-1-git-send-email-tyanh@chromium.org> References: <1364456760-31500-1-git-send-email-tyanh@chromium.org> X-Gm-Message-State: ALoCoQnNRhg+T0fqFnzJCB2cpiqlbZiTNfwyWiWMeIilDrxvQWVnrcd2UIZXOwoLWdlPm8fpXkfcyY+MkiMqyalEQjmpHtYpVe11PddVBR5HwQpDpxzE9EvQk+dZcjDUgRqqxLblRGyginkVqzLszUL2yr0KbER4ic9h1wLqWDTBLXHxFKq+PqWXI6CmPS4zQgnF5qehmAun Cc: Tom Rini , Vincent Palatin Subject: [U-Boot] [PATCH v3 7/7] cros: 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. Signed-off-by: Simon Glass Signed-off-by: Vincent Palatin Signed-off-by: Hung-ying Tyan Acked-by: Simon Glass --- 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 0721c17..80dfce7 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -77,11 +77,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"