From patchwork Mon Feb 18 00:45:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 221126 X-Patchwork-Delegate: sbabic@denx.de 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 EDBC12C0082 for ; Mon, 18 Feb 2013 11:41:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 04F284A85D; Mon, 18 Feb 2013 01:41:27 +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 eqz7rIZRhrc0; Mon, 18 Feb 2013 01:41:26 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1C2284A821; Mon, 18 Feb 2013 01:41:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9D4A24A7D9 for ; Mon, 18 Feb 2013 01:41:15 +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 nZ0Lye+2YDFH for ; Mon, 18 Feb 2013 01:41:14 +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-f171.google.com (mail-gg0-f171.google.com [209.85.161.171]) by theia.denx.de (Postfix) with ESMTPS id 0AA934A7D8 for ; Mon, 18 Feb 2013 01:41:12 +0100 (CET) Received: by mail-gg0-f171.google.com with SMTP id j1so476136ggn.16 for ; Sun, 17 Feb 2013 16:41:11 -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 :in-reply-to:references; bh=NxeMDiY8oxOJPBiWahl/BcHDMCWzUmXD7sYSQ9LPQWw=; b=NOVzqFLz4whOOmfLlOPR9hoIWZo1/EYvJhAupk9kfKcJ3H1CUye0TUGKrgi9R6kBwZ kz7IL5Y+XxzQvnT7lUVBqwezh26w9KhnoHOxBmHeUxWaeFsJDmpjI9uDa0sthI8jLfGq UD6wU5G8s56oyNm7pPuOyCtYSLPYyC0UXK/zUZ0Zty0jINtIM7yPNKychWcsGhVzdobD lkLwJRfqI0aLNlTes/AwzWqT3bcx66fWCXNOa3u95Hcj+v2kqGxLLEU115SK3GwjLddF y/iDhkjYeY0EAa7eN4T/Y1yqrzx9fkbMBGgesFUVDOEp1ofUfUHR5tPdvIRInIPMJm+Y +I1Q== X-Received: by 10.100.84.17 with SMTP id h17mr4976184anb.48.1361148070951; Sun, 17 Feb 2013 16:41:10 -0800 (PST) Received: from nano.lab.ossystems.com.br ([187.23.144.59]) by mx.google.com with ESMTPS id j1sm111429376yhn.3.2013.02.17.16.41.06 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Feb 2013 16:41:09 -0800 (PST) From: Otavio Salvador To: U-Boot Mailing List Date: Sun, 17 Feb 2013 21:45:26 -0300 Message-Id: <1361148335-19197-2-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1361148335-19197-1-git-send-email-otavio@ossystems.com.br> References: <1361148335-19197-1-git-send-email-otavio@ossystems.com.br> Cc: Fabio Estevam , Marek Vasut , Otavio Salvador Subject: [U-Boot] [PATCH v4 01/10] 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 Acked-by: Marek Vasut --- Changes in v4: None Changes in v3: None Changes in v2: None 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 =