From patchwork Thu Oct 2 03:43:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 395747 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 173A6140078 for ; Thu, 2 Oct 2014 13:46:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8701DA7410; Thu, 2 Oct 2014 05:45:41 +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 7FCTfxqD+x8s; Thu, 2 Oct 2014 05:45:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E9AAFA7413; Thu, 2 Oct 2014 05:45:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CB9F8A73EB for ; Thu, 2 Oct 2014 05:44:48 +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 EEpixkq2Wipb for ; Thu, 2 Oct 2014 05:44:48 +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-ie0-f202.google.com (mail-ie0-f202.google.com [209.85.223.202]) by theia.denx.de (Postfix) with ESMTPS id 4C01E4B5F1 for ; Thu, 2 Oct 2014 05:44:43 +0200 (CEST) Received: by mail-ie0-f202.google.com with SMTP id rd18so262007iec.3 for ; Wed, 01 Oct 2014 20:44:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9YpHzhN8Zbz5QSOrynn3IgedRIfPhujXY9pZqWA0Iaw=; b=QYnu+0FX2SjjDzFLZDSXCGH4LI1Mw9YJflmPvNxjLhaQFRmhdWGNNYhqpQ2zhdTFDt AR7nEW3sFT4NTXJLTxU20ASwv+qcv5wYh3IoILaEsBTOI66amycXMUj4t6OBU/WctNV2 zMJqSql6Jp0QTdIx/5Jd6c8CZ5BuodIQs2vujfaugdt0i+C3U5vNe5vDADwlmRleZuHT 6IKxzJjv6V07wHGDrEOBSxG7xn+BhvCD2AQBOhrLfapA0dSIrKhFgSEx9GLAefStpgjP dPMKYFT5YuTYHLl377ln9z4gQF8AgdyMxA30RgcLyXVI9Cm6HtlWFRfXyyDw81lbpC3A p4Iw== X-Gm-Message-State: ALoCoQkK2UrNP5fBKo2hPcYF5N/aylcvfEM3U7Vl47HwRGBFymCeASeyJKMIQlb9uXpegf5s2AEd X-Received: by 10.182.230.133 with SMTP id sy5mr51437377obc.22.1412221482556; Wed, 01 Oct 2014 20:44:42 -0700 (PDT) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id l45si118268yha.2.2014.10.01.20.44.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Oct 2014 20:44:42 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id s7xzNWR4.1; Wed, 01 Oct 2014 20:44:42 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 6C63C220B3D; Wed, 1 Oct 2014 21:44:41 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 1 Oct 2014 21:43:38 -0600 Message-Id: <1412221423-10752-11-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1412221423-10752-1-git-send-email-sjg@chromium.org> References: <1412221423-10752-1-git-send-email-sjg@chromium.org> Cc: Chander Kashyap , Przemyslaw Marczak , Ajay Kumar Subject: [U-Boot] [PATCH v5 10/15] exynos: config: Move cros_ec and tps65090 out of smdk boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 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 These boards do not in fact have a Chrome OS EC, nor a TPS565090 PMIC, so move the settings into a separate common file to be used by those that need it. Signed-off-by: Simon Glass --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None include/configs/exynos5-common.h | 18 +++--------------- include/configs/exynos5-dt-common.h | 35 +++++++++++++++++++++++++++++++++++ include/configs/exynos5250-common.h | 3 --- include/configs/peach-pit.h | 1 + include/configs/snow.h | 4 ++++ 5 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 include/configs/exynos5-dt-common.h diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index b7d6f9c..3f93549 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -52,17 +52,10 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_CONSOLE_MUX -/* Enable keyboard */ -#define CONFIG_CROS_EC /* CROS_EC protocol */ -#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ -#define CONFIG_CMD_CROS_EC -#define CONFIG_KEYBOARD - -/* Console configuration */ #define EXYNOS_DEVICE_SETTINGS \ - "stdin=serial,cros-ec-keyb\0" \ - "stdout=serial,lcd\0" \ - "stderr=serial,lcd\0" + "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" #define CONFIG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS @@ -189,11 +182,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 50000000 #endif -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_TPS65090 - /* Ethernet Controllor Driver */ #ifdef CONFIG_CMD_NET #define CONFIG_SMC911X diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h new file mode 100644 index 0000000..66547fa --- /dev/null +++ b/include/configs/exynos5-dt-common.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2014 Google, Inc + * + * Configuration settings for generic Exynos 5 board + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_EXYNOS5_DT_COMMON_H +#define __CONFIG_EXYNOS5_DT_COMMON_H + +#include "exynos5-common.h" + +/* PMIC */ +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_TPS65090 + +/* Enable keyboard */ +#define CONFIG_CROS_EC /* CROS_EC protocol */ +#define CONFIG_CROS_EC_KEYB /* CROS_EC keyboard input */ +#define CONFIG_CMD_CROS_EC +#define CONFIG_KEYBOARD + +/* Console configuration */ +#undef EXYNOS_DEVICE_SETTINGS +#define EXYNOS_DEVICE_SETTINGS \ + "stdin=serial,cros-ec-keyb\0" \ + "stdout=serial,lcd\0" \ + "stderr=serial,lcd\0" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + EXYNOS_DEVICE_SETTINGS + +#endif diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index b4c1ccf..987eb15 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -22,8 +22,6 @@ #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) -#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */ - /* USB */ #define CONFIG_CMD_USB #define CONFIG_USB_XHCI @@ -44,7 +42,6 @@ /* PMIC */ #define CONFIG_POWER_MAX77686 -#define CONFIG_POWER_TPS65090_I2C /* Sound */ #define CONFIG_CMD_SOUND diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 455c03a..6cf8c74 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -10,6 +10,7 @@ #define __CONFIG_PEACH_PIT_H #include +#include #undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit diff --git a/include/configs/snow.h b/include/configs/snow.h index 58b011d..93a03b1 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -10,8 +10,12 @@ #define __CONFIG_SNOW_H #include +#include #undef CONFIG_DEFAULT_DEVICE_TREE #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow +#define CONFIG_CROS_EC_I2C /* Support CROS_EC over I2C */ +#define CONFIG_POWER_TPS65090_I2C + #endif /* __CONFIG_SNOW_H */