From patchwork Sun Jan 27 16:42:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 216019 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 87F172C0092 for ; Mon, 28 Jan 2013 03:38:31 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F62A4A04F; Sun, 27 Jan 2013 17:38:28 +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 eMztE-s3deM9; Sun, 27 Jan 2013 17:38:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2532C4A052; Sun, 27 Jan 2013 17:38:27 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 066204A052 for ; Sun, 27 Jan 2013 17:38:26 +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 B7+ylFyYEZis for ; Sun, 27 Jan 2013 17:38:24 +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-gg0-f170.google.com (mail-gg0-f170.google.com [209.85.161.170]) by theia.denx.de (Postfix) with ESMTPS id 15C7C4A049 for ; Sun, 27 Jan 2013 17:38:21 +0100 (CET) Received: by mail-gg0-f170.google.com with SMTP id k4so290788ggn.29 for ; Sun, 27 Jan 2013 08:38:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=FTwRwhCdhDTSwAlO4v884WTL9RSjAtMDsOVLftf+0NE=; b=u6OH/4+eCqVf38j8CHBKqdtlzu57s3LoYbSCc/YtORmqrMHTFNPnPD+jKC9QUBN427 UQG9yXAzWPnR5aL3X44eqgxJ6eaWz8pAJg0i9y1nbadazLVVJ5iqh1chJ+WJIcOFJZoc tA9HaNstKWcpjpa0Ft4AN9Eoqjh2mIKCp6kmDRS9YcNS0lOlOleEZip1YwM7UoGg1gOe osS5XD17MiA7K9lhxyvLFlt2VxQGIV0y/mu03KHtfLPCpire+5niyK7OPSsLbgObxpaO rz7PgyKybxWOa4uIHg+gSvId2AtUlJYZXiU/HXS/V5KeOgpL5RqIcnBw3Dkr1N1EaRG/ QUww== X-Received: by 10.236.147.174 with SMTP id t34mr12960526yhj.70.1359304700165; Sun, 27 Jan 2013 08:38:20 -0800 (PST) Received: from nano.lab.ossystems.com.br ([177.35.66.48]) by mx.google.com with ESMTPS id w12sm310136anl.14.2013.01.27.08.38.17 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 27 Jan 2013 08:38:19 -0800 (PST) From: Otavio Salvador To: u-boot@lists.denx.de Date: Sun, 27 Jan 2013 14:42:34 -0200 Message-Id: <1359304956-6540-1-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.1 Cc: Fabio Estevam , Marek Vasut , Otavio Salvador Subject: [U-Boot] [PATCH v2 1/3] mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT 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 The power switch option is compatible with i.MX23 and i.MX28 so the configration option needs to reflect it. We choose 'CONFIG_SPL_MXS_PSWITCH_WAIT' for the option name. Signed-off-by: Otavio Salvador --- Changes in v2: - Rewrite short description as per Marek's request arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h index 2ddc5bc..084def5 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h +++ b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h @@ -30,7 +30,7 @@ void early_delay(int delay); void mxs_power_init(void); -#ifdef CONFIG_SPL_MX28_PSWITCH_WAIT +#ifdef CONFIG_SPL_MXS_PSWITCH_WAIT void mxs_power_wait_pswitch(void); #else static inline void mxs_power_wait_pswitch(void) { } diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index e9d6302..287c698 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -921,7 +921,7 @@ void mxs_power_init(void) early_delay(1000); } -#ifdef CONFIG_SPL_MX28_PSWITCH_WAIT +#ifdef CONFIG_SPL_MXS_PSWITCH_WAIT void mxs_power_wait_pswitch(void) { struct mxs_power_regs *power_regs =