From patchwork Sun Nov 25 00:15:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 201494 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 F1FFC2C008A for ; Sun, 25 Nov 2012 11:16:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C85FD4A020; Sun, 25 Nov 2012 01:16:12 +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 YDQt8phjcUse; Sun, 25 Nov 2012 01:16:12 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 06E434A023; Sun, 25 Nov 2012 01:16:11 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 02B714A023 for ; Sun, 25 Nov 2012 01:16:05 +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 CWq5zrNlzpOo for ; Sun, 25 Nov 2012 01:16:02 +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-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by theia.denx.de (Postfix) with ESMTPS id AEDEA4A020 for ; Sun, 25 Nov 2012 01:16:00 +0100 (CET) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3Y8Bcb4h4mz4KK3d; Sun, 25 Nov 2012 01:15:59 +0100 (CET) X-Auth-Info: dYM+Z1dw611r2WtP+NRHdc8qynFyCS/7mUDKQ3PdvOU= Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3Y8Bcb3l09zbbh4; Sun, 25 Nov 2012 01:15:59 +0100 (CET) From: Marek Vasut To: u-boot@lists.denx.de Date: Sun, 25 Nov 2012 01:15:51 +0100 Message-Id: <1353802551-19050-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10.4 Cc: Marek Vasut Subject: [U-Boot] [PATCH] mx28: Rename regs-power.h to regs-power-mx28.h 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 i.MX23 has different register layout and bit placement in the power supply. Thus, in order to be able to add support for MX23, rename the MX28's regs-power.h to regs-power-mx28.h . Moreover, add ifdef around inclusion of regs-*-mx28.h in imx-regs.h so the MX23 boards will include proper set of registers. Signed-off-by: Marek Vasut Cc: Stefano Babic --- arch/arm/include/asm/arch-mxs/imx-regs.h | 7 +++++-- .../include/asm/arch-mxs/{regs-power.h => regs-power-mx28.h} | 0 2 files changed, 5 insertions(+), 2 deletions(-) rename arch/arm/include/asm/arch-mxs/{regs-power.h => regs-power-mx28.h} (100%) diff --git a/arch/arm/include/asm/arch-mxs/regs-power.h b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h similarity index 100% rename from arch/arm/include/asm/arch-mxs/regs-power.h rename to arch/arm/include/asm/arch-mxs/regs-power-mx28.h diff --git a/arch/arm/include/asm/arch-mxs/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h index 5e1901e..9764041 100644 --- a/arch/arm/include/asm/arch-mxs/imx-regs.h +++ b/arch/arm/include/asm/arch-mxs/imx-regs.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -34,9 +33,13 @@ #include #include #include -#include #include #include #include +#ifdef CONFIG_MX28 +#include +#include +#endif + #endif /* __IMX_REGS_H__ */