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: 20562 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D8B5223A4E for ; Wed, 25 Sep 2013 10:44:05 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 6sf5280220qea.11 for ; Wed, 25 Sep 2013 03:44:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=UbssgrH8C7ZCzyo8FNiqCImWo8mQWesXzkkft14Gf9U=; b=lkiKI92qUyZn/6TK5+/nDBmkyLEQYN2xh5+aGkJ+DRj+OKf+Gapn8eYBXPQ2h/9qCU 16e3odA10d2Bm2oPdhuNhZMAsM8Im7a8H1oMzqjzlshi0ftFcIRzfJv6O7yc8kT4+Pd2 MaFHr+Si+GmV2k0s/qK5Qa/sqY2AmqHJvUMdy3wG4cUzaTegTEJ1MZZO1q6mszxxOgJ5 KsJghZS0hfGKJAum4P8Hdwmah3yuONwQzMbA0S77VELl8kSnXtWxetzJSutTTPk7Wis7 j1OCLxW8l/S0OFhz1jUu4hckWivHyu7xwJHbwretlQF8O/g9OE/fnr7ruEfP+geELJNR EUlQ== X-Gm-Message-State: ALoCoQl/zJ+25Thsll0aqWOQAMhnOZzTytP4i4nKuX2fF6JrUZWUyu/F+OcBLDvHCoK/2jHueYxn X-Received: by 10.224.97.1 with SMTP id j1mr1049596qan.6.1380105845758; Wed, 25 Sep 2013 03:44:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.116.228 with SMTP id jz4ls315103qeb.51.gmail; Wed, 25 Sep 2013 03:44:05 -0700 (PDT) X-Received: by 10.52.228.137 with SMTP id si9mr9121594vdc.29.1380105845674; Wed, 25 Sep 2013 03:44:05 -0700 (PDT) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id bp7si9637080vcb.7.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:05 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id e15so4233134vbg.18 for ; Wed, 25 Sep 2013 03:44:05 -0700 (PDT) X-Received: by 10.52.103.101 with SMTP id fv5mr1823591vdb.31.1380105845534; Wed, 25 Sep 2013 03:44:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp297633vcz; Wed, 25 Sep 2013 03:44:04 -0700 (PDT) X-Received: by 10.204.228.198 with SMTP id jf6mr41732bkb.41.1380105844370; Wed, 25 Sep 2013 03:44:04 -0700 (PDT) Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by mx.google.com with ESMTPS id uk3si11373734bkb.289.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 03:44:04 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.54 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.214.54; Received: by mail-bk0-f54.google.com with SMTP id mz12so2208580bkb.13 for ; Wed, 25 Sep 2013 03:44:03 -0700 (PDT) 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 Cc: albert.u.boot@aribaud.net, trini@ti.com, u-boot@lists.denx.de, patches@linaro.org, Andre Przywara Subject: [PATCH 1/5] ARM: Exynos5250: rename obsoleted CONFIG_PMIC defines 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> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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