From patchwork Sat Jan 26 19:15:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 215926 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 634B72C0089 for ; Sun, 27 Jan 2013 06:11:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9114A4A1AE; Sat, 26 Jan 2013 20:11:39 +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 7JibUqZTGekL; Sat, 26 Jan 2013 20:11:38 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 20AD64A195; Sat, 26 Jan 2013 20:11:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 571534A195 for ; Sat, 26 Jan 2013 20:11:36 +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 wyoNPc5Be5VO for ; Sat, 26 Jan 2013 20:11:35 +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-ye0-f170.google.com (mail-ye0-f170.google.com [209.85.213.170]) by theia.denx.de (Postfix) with ESMTPS id 68AEF4A190 for ; Sat, 26 Jan 2013 20:11:33 +0100 (CET) Received: by mail-ye0-f170.google.com with SMTP id m12so230142yen.15 for ; Sat, 26 Jan 2013 11:11:31 -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=70j5kTljQ5Im8We0VS6gLA7WUoI7IDmrCTSgo4Luj9M=; b=jdvM91SWVWgBOC7p9ACWLFmWVRcPsUqCs4/YALnRH9muL7gRXAp8dTjeyaKpzO9sJw 5WQppPU6ZuKzovEsdoYF3yljDRx3mGXGFFyfgRupdQKIVtyw3y5a0/3U6gMpsynGShIF 4wDc15604pcZ17k7SgNh5ZdozgT4dlF/ZYATvhqcqJTutQjnxpu8cyqqu1PRvuP95wNb RMy6EDZIEsuY/lvbZ5gh9kU0QWMrQZU4kQ0drft5ZyhtV6BfyvtlxBtSVB8uNppHOrg7 fXmrkYZSDbiIo5woYUVeWlHcjOv5SIuYJJp+ofPduKck4DEx+ftAzbxbSpnv7b6mgqVW CtEw== X-Received: by 10.236.123.208 with SMTP id v56mr10778197yhh.52.1359227490255; Sat, 26 Jan 2013 11:11:30 -0800 (PST) Received: from nano.lab.ossystems.com.br ([177.35.66.48]) by mx.google.com with ESMTPS id c44sm4868780yhl.15.2013.01.26.11.11.27 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Jan 2013 11:11:29 -0800 (PST) From: Otavio Salvador To: u-boot@lists.denx.de Date: Sat, 26 Jan 2013 17:15:40 -0200 Message-Id: <1359227742-10984-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 1/3] mxs: Use SoC agnostic configuration option for power switch setting 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 --- 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 =