Patchwork [U-Boot] mx28: Rename regs-power.h to regs-power-mx28.h

login
register
mail settings
Submitter Marek Vasut
Date Nov. 25, 2012, 12:15 a.m.
Message ID <1353802551-19050-1-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/201494/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Marek Vasut - Nov. 25, 2012, 12:15 a.m.
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 <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
---
 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
Otavio Salvador - Nov. 25, 2012, 6:10 p.m.
On Sat, Nov 24, 2012 at 10:15 PM, Marek Vasut <marex@denx.de> wrote:
> 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 <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>

This is done in my tree too; please wait me to finish my port and we merge it.
Marek Vasut - Nov. 25, 2012, 6:18 p.m.
Dear Otavio Salvador,

> On Sat, Nov 24, 2012 at 10:15 PM, Marek Vasut <marex@denx.de> wrote:
> > 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 <marex@denx.de>
> > Cc: Stefano Babic <sbabic@denx.de>
> 
> This is done in my tree too; please wait me to finish my port and we merge
> it.

Again, you are trying to block upstream development because it breaks your out-
of-tree port. This can not be done, sorry.

Best regards,
Marek Vasut

Patch

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 <asm/arch/regs-apbh.h>
 #include <asm/arch/regs-base.h>
 #include <asm/arch/regs-bch.h>
-#include <asm/arch/regs-clkctrl-mx28.h>
 #include <asm/arch/regs-digctl.h>
 #include <asm/arch/regs-gpmi.h>
 #include <asm/arch/regs-i2c.h>
@@ -34,9 +33,13 @@ 
 #include <asm/arch/regs-lradc.h>
 #include <asm/arch/regs-ocotp.h>
 #include <asm/arch/regs-pinctrl.h>
-#include <asm/arch/regs-power.h>
 #include <asm/arch/regs-rtc.h>
 #include <asm/arch/regs-ssp.h>
 #include <asm/arch/regs-timrot.h>
 
+#ifdef CONFIG_MX28
+#include <asm/arch/regs-clkctrl-mx28.h>
+#include <asm/arch/regs-power-mx28.h>
+#endif
+
 #endif	/* __IMX_REGS_H__ */