From patchwork Wed Sep 25 10:42:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 277786 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 CD1C12C00C5 for ; Wed, 25 Sep 2013 20:44:45 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E38774A08D; Wed, 25 Sep 2013 12:44:42 +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 Wqx-aa0MGN+I; Wed, 25 Sep 2013 12:44:42 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6ECB34A07F; Wed, 25 Sep 2013 12:44:21 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0E0774A067 for ; Wed, 25 Sep 2013 12:44:15 +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 4GgdrqY9w7s8 for ; Wed, 25 Sep 2013 12:44:09 +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-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by theia.denx.de (Postfix) with ESMTPS id 189B14A06E for ; Wed, 25 Sep 2013 12:44:04 +0200 (CEST) Received: by mail-bk0-f54.google.com with SMTP id mz12so2208582bkb.13 for ; Wed, 25 Sep 2013 03:44:03 -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=UbssgrH8C7ZCzyo8FNiqCImWo8mQWesXzkkft14Gf9U=; b=BVFJxRwtjGCg7SDwLSuQR9DPI4MnIbfR3vvcdxMDKVc6Lcb2EtV6QtKyqwuhBRCYG/ 7oWQn824/mXP6Jn/aV4T82N4s+FdbqT38YDp39z6sL4BMM4uenmYG/MGqAUr3QrK0uPi jz+jHGibUpZ1pw9Vb/rWHJYaw9wr9hOf4Cmpf+y4EnYn1+xam5vksopfPB3T8Mdw/SQD Xd4VASP420S0AVobeoaJZr32C7Hisg7IBdcgnjhvi3EaYzRte8FOV3m+cpjK+NrzE4Pp dN7rdZrhkUhQ3A678VoIEdbEJtXGsYvnmmbO0A4cHINIIM/9mAENmaak2QRF2fXgsCMY 4aTg== X-Gm-Message-State: ALoCoQkVeL5o5AxdClmPG0VAOSzkUR6NfklN5SRmbRvGARQxivX91ADQQR386J+DAth+Hlaqk9CL X-Received: by 10.204.247.71 with SMTP id mb7mr27322310bkb.7.1380105843651; Wed, 25 Sep 2013 03:44:03 -0700 (PDT) Received: from slackpad.drs.calxeda.com (g224194040.adsl.alicedsl.de. [92.224.194.40]) by mx.google.com with ESMTPSA id pk7sm13866293bkb.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:03 -0700 (PDT) From: Andre Przywara To: Rajeshwari Shinde , Simon Glass , Hatim RV , Chander Kashyap Date: Wed, 25 Sep 2013 12:42:35 +0200 Message-Id: <1380105759-9687-2-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1380105759-9687-1-git-send-email-andre.przywara@linaro.org> References: <1380105759-9687-1-git-send-email-andre.przywara@linaro.org> Cc: trini@ti.com, patches@linaro.org, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/5] ARM: Exynos5250: rename obsoleted CONFIG_PMIC defines 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 Commit be3b51aa4a450f3e3fcd9c6e5074ef435812a02d renamed CONFIG_PMIC to CONFIG_POWER, but somehow the old values survived or sneaked in again. Removed the redundant and useless version in exynos5250-dt.h and rename it in arndale.h. Signed-off-by: Andre Przywara --- drivers/power/power_fsl.c | 2 +- include/configs/arndale.h | 6 +++--- include/configs/exynos5250-dt.h | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index ed778f3..7fb233d 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -52,7 +52,7 @@ int pmic_init(unsigned char bus) p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH; p->bus = bus; #else -#error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C" +#error "You must select CONFIG_POWER_SPI" #endif return 0; diff --git a/include/configs/arndale.h b/include/configs/arndale.h index ed44a04..f9eb051 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -226,9 +226,9 @@ #define CONFIG_I2C_EDID /* PMIC */ -#define CONFIG_PMIC -#define CONFIG_PMIC_I2C -#define CONFIG_PMIC_MAX77686 +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_MAX77686 #define CONFIG_DEFAULT_DEVICE_TREE exynos5250-arndale diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 8c21909..14d62e4 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -257,11 +257,6 @@ #define CONFIG_SYS_I2C_SLAVE 0x0 #define CONFIG_I2C_EDID -/* PMIC */ -#define CONFIG_PMIC -#define CONFIG_PMIC_I2C -#define CONFIG_PMIC_MAX77686 - /* SPI */ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_SPI_FLASH